Pārlūkot izejas kodu

Moved everything except BabylonJS.csproj under Tools/BuildOurOwnBabylonJS
Renamed myBabylonJS by BuildOurOwnBabylonJS
Renamed BabylonJSServer by BuildOurOwnBabylonJSServer

Gwenaël Hagenmuller 11 gadi atpakaļ
vecāks
revīzija
0b68bf6f68
100 mainītis faili ar 37 papildinājumiem un 40 dzēšanām
  1. 0 3
      .gitignore
  2. 0 1
      BabylonJSServer/Global.asax
  3. 3 3
      BabylonJS.sln
  4. 6 0
      Tools/BuildOurOwnBabylonJS/BuildOurOwnBabylonJS/.gitignore
  5. 6 8
      myBabylonJS/myBabylonJS.csproj
  6. 7 8
      myBabylonJS/Program.cs
  7. 2 2
      myBabylonJS/Properties/AssemblyInfo.cs
  8. 0 0
      Tools/BuildOurOwnBabylonJS/BuildOurOwnBabylonJS/Refs/Mvp.Xml-bin-2.0/Mvp.Xml.dll
  9. 0 0
      Tools/BuildOurOwnBabylonJS/BuildOurOwnBabylonJS/Refs/Mvp.Xml-bin-2.0/license.txt
  10. 0 0
      Tools/BuildOurOwnBabylonJS/BuildOurOwnBabylonJS/Refs/Mvp.Xml-bin-2.0/readme.txt
  11. 1 1
      myBabylonJS/Script.cs
  12. 0 0
      Tools/BuildOurOwnBabylonJS/BuildOurOwnBabylonJS/app.config
  13. 1 1
      myBabylonJS/babylon.xml
  14. 0 0
      Tools/BuildOurOwnBabylonJS/BuildOurOwnBabylonJS/babylonJS.xsd
  15. 2 0
      Tools/BuildOurOwnBabylonJS/BuildOurOwnBabylonJS/executables/BuildOurOwnBabylonJS.bat
  16. BIN
      Tools/BuildOurOwnBabylonJS/BuildOurOwnBabylonJS/executables/BuildOurOwnBabylonJS.exe
  17. 0 0
      Tools/BuildOurOwnBabylonJS/BuildOurOwnBabylonJS/executables/JSKompactor.exe
  18. 0 0
      Tools/BuildOurOwnBabylonJS/BuildOurOwnBabylonJS/executables/Mvp.Xml.dll
  19. 0 0
      Tools/BuildOurOwnBabylonJS/BuildOurOwnBabylonJS/ourOwnBabylon.js
  20. 2 2
      myBabylonJS/myBabylon.xml
  21. 6 10
      BabylonJSServer/BabylonJSServer.csproj
  22. 1 1
      BabylonJSServer/Content/Site.css
  23. 0 0
      Tools/BuildOurOwnBabylonJS/BuildOurOwnBabylonJSServer/Content/Train/Train.babylon
  24. 0 0
      Tools/BuildOurOwnBabylonJS/BuildOurOwnBabylonJSServer/Content/Train/Train.babylon.manifest
  25. 0 0
      Tools/BuildOurOwnBabylonJS/BuildOurOwnBabylonJSServer/Content/Train/barrieres_bois.jpg
  26. 0 0
      Tools/BuildOurOwnBabylonJS/BuildOurOwnBabylonJSServer/Content/Train/barrieres_bois_n.jpg
  27. 0 0
      Tools/BuildOurOwnBabylonJS/BuildOurOwnBabylonJSServer/Content/Train/bat_console_murs_ext_lm.jpg
  28. 0 0
      Tools/BuildOurOwnBabylonJS/BuildOurOwnBabylonJSServer/Content/Train/bat_console_murs_lm.jpg
  29. 0 0
      Tools/BuildOurOwnBabylonJS/BuildOurOwnBabylonJSServer/Content/Train/bat_lm.jpg
  30. 0 0
      Tools/BuildOurOwnBabylonJS/BuildOurOwnBabylonJSServer/Content/Train/bosquet_grass.jpg
  31. 0 0
      Tools/BuildOurOwnBabylonJS/BuildOurOwnBabylonJSServer/Content/Train/bosquet_grass.png
  32. 0 0
      Tools/BuildOurOwnBabylonJS/BuildOurOwnBabylonJSServer/Content/Train/bottes_paille.jpg
  33. 0 0
      Tools/BuildOurOwnBabylonJS/BuildOurOwnBabylonJSServer/Content/Train/bottes_paille_face.jpg
  34. 0 0
      Tools/BuildOurOwnBabylonJS/BuildOurOwnBabylonJSServer/Content/Train/champ_ble.jpg
  35. 0 0
      Tools/BuildOurOwnBabylonJS/BuildOurOwnBabylonJSServer/Content/Train/champ_ble.png
  36. 0 0
      Tools/BuildOurOwnBabylonJS/BuildOurOwnBabylonJSServer/Content/Train/chariot_planche.jpg
  37. 0 0
      Tools/BuildOurOwnBabylonJS/BuildOurOwnBabylonJSServer/Content/Train/chariot_planche_n.jpg
  38. 0 0
      Tools/BuildOurOwnBabylonJS/BuildOurOwnBabylonJSServer/Content/Train/chariot_roue.jpg
  39. 0 0
      Tools/BuildOurOwnBabylonJS/BuildOurOwnBabylonJSServer/Content/Train/chariot_roue_n.jpg
  40. 0 0
      Tools/BuildOurOwnBabylonJS/BuildOurOwnBabylonJSServer/Content/Train/console.jpg
  41. 0 0
      Tools/BuildOurOwnBabylonJS/BuildOurOwnBabylonJSServer/Content/Train/console_n.jpg
  42. 0 0
      Tools/BuildOurOwnBabylonJS/BuildOurOwnBabylonJSServer/Content/Train/cubemap5_nx.jpg
  43. 0 0
      Tools/BuildOurOwnBabylonJS/BuildOurOwnBabylonJSServer/Content/Train/cubemap5_ny.jpg
  44. 0 0
      Tools/BuildOurOwnBabylonJS/BuildOurOwnBabylonJSServer/Content/Train/cubemap5_nz.jpg
  45. 0 0
      Tools/BuildOurOwnBabylonJS/BuildOurOwnBabylonJSServer/Content/Train/cubemap5_px.jpg
  46. 0 0
      Tools/BuildOurOwnBabylonJS/BuildOurOwnBabylonJSServer/Content/Train/cubemap5_py.jpg
  47. 0 0
      Tools/BuildOurOwnBabylonJS/BuildOurOwnBabylonJSServer/Content/Train/cubemap5_pz.jpg
  48. 0 0
      Tools/BuildOurOwnBabylonJS/BuildOurOwnBabylonJSServer/Content/Train/cubemap_nx.jpg
  49. 0 0
      Tools/BuildOurOwnBabylonJS/BuildOurOwnBabylonJSServer/Content/Train/cubemap_ny.jpg
  50. 0 0
      Tools/BuildOurOwnBabylonJS/BuildOurOwnBabylonJSServer/Content/Train/cubemap_nz.jpg
  51. 0 0
      Tools/BuildOurOwnBabylonJS/BuildOurOwnBabylonJSServer/Content/Train/cubemap_px.jpg
  52. 0 0
      Tools/BuildOurOwnBabylonJS/BuildOurOwnBabylonJSServer/Content/Train/cubemap_py.jpg
  53. 0 0
      Tools/BuildOurOwnBabylonJS/BuildOurOwnBabylonJSServer/Content/Train/cubemap_pz.jpg
  54. 0 0
      Tools/BuildOurOwnBabylonJS/BuildOurOwnBabylonJSServer/Content/Train/cubemap_vitres_nx.jpg
  55. 0 0
      Tools/BuildOurOwnBabylonJS/BuildOurOwnBabylonJSServer/Content/Train/cubemap_vitres_ny.jpg
  56. 0 0
      Tools/BuildOurOwnBabylonJS/BuildOurOwnBabylonJSServer/Content/Train/cubemap_vitres_nz.jpg
  57. 0 0
      Tools/BuildOurOwnBabylonJS/BuildOurOwnBabylonJSServer/Content/Train/cubemap_vitres_px.jpg
  58. 0 0
      Tools/BuildOurOwnBabylonJS/BuildOurOwnBabylonJSServer/Content/Train/cubemap_vitres_py.jpg
  59. 0 0
      Tools/BuildOurOwnBabylonJS/BuildOurOwnBabylonJSServer/Content/Train/cubemap_vitres_pz.jpg
  60. 0 0
      Tools/BuildOurOwnBabylonJS/BuildOurOwnBabylonJSServer/Content/Train/cuir.jpg
  61. 0 0
      Tools/BuildOurOwnBabylonJS/BuildOurOwnBabylonJSServer/Content/Train/cuir_n.jpg
  62. 0 0
      Tools/BuildOurOwnBabylonJS/BuildOurOwnBabylonJSServer/Content/Train/debug.txt
  63. 0 0
      Tools/BuildOurOwnBabylonJS/BuildOurOwnBabylonJSServer/Content/Train/disneyland_paris.jpg
  64. 0 0
      Tools/BuildOurOwnBabylonJS/BuildOurOwnBabylonJSServer/Content/Train/flechage.jpg
  65. 0 0
      Tools/BuildOurOwnBabylonJS/BuildOurOwnBabylonJSServer/Content/Train/flechage.png
  66. 0 0
      Tools/BuildOurOwnBabylonJS/BuildOurOwnBabylonJSServer/Content/Train/flechage2.jpg
  67. 0 0
      Tools/BuildOurOwnBabylonJS/BuildOurOwnBabylonJSServer/Content/Train/flechage2.png
  68. 0 0
      Tools/BuildOurOwnBabylonJS/BuildOurOwnBabylonJSServer/Content/Train/grass.jpg
  69. 0 0
      Tools/BuildOurOwnBabylonJS/BuildOurOwnBabylonJSServer/Content/Train/grass.png
  70. 0 0
      Tools/BuildOurOwnBabylonJS/BuildOurOwnBabylonJSServer/Content/Train/grillage.jpg
  71. 0 0
      Tools/BuildOurOwnBabylonJS/BuildOurOwnBabylonJSServer/Content/Train/grillage.png
  72. 0 0
      Tools/BuildOurOwnBabylonJS/BuildOurOwnBabylonJSServer/Content/Train/lens2.png
  73. 0 0
      Tools/BuildOurOwnBabylonJS/BuildOurOwnBabylonJSServer/Content/Train/lens3.png
  74. 0 0
      Tools/BuildOurOwnBabylonJS/BuildOurOwnBabylonJSServer/Content/Train/lens4.png
  75. 0 0
      Tools/BuildOurOwnBabylonJS/BuildOurOwnBabylonJSServer/Content/Train/lens5.png
  76. 0 0
      Tools/BuildOurOwnBabylonJS/BuildOurOwnBabylonJSServer/Content/Train/lens6.png
  77. 0 0
      Tools/BuildOurOwnBabylonJS/BuildOurOwnBabylonJSServer/Content/Train/metal_rouille.jpg
  78. 0 0
      Tools/BuildOurOwnBabylonJS/BuildOurOwnBabylonJSServer/Content/Train/metal_rouille_n.jpg
  79. 0 0
      Tools/BuildOurOwnBabylonJS/BuildOurOwnBabylonJSServer/Content/Train/metal_tache.jpg
  80. 0 0
      Tools/BuildOurOwnBabylonJS/BuildOurOwnBabylonJSServer/Content/Train/metal_tache_n.jpg
  81. 0 0
      Tools/BuildOurOwnBabylonJS/BuildOurOwnBabylonJSServer/Content/Train/murs_wood.jpg
  82. 0 0
      Tools/BuildOurOwnBabylonJS/BuildOurOwnBabylonJSServer/Content/Train/murs_wood_n.jpg
  83. 0 0
      Tools/BuildOurOwnBabylonJS/BuildOurOwnBabylonJSServer/Content/Train/no_signal.jpg
  84. 0 0
      Tools/BuildOurOwnBabylonJS/BuildOurOwnBabylonJSServer/Content/Train/paille_alpha.jpg
  85. 0 0
      Tools/BuildOurOwnBabylonJS/BuildOurOwnBabylonJSServer/Content/Train/paille_alpha.png
  86. 0 0
      Tools/BuildOurOwnBabylonJS/BuildOurOwnBabylonJSServer/Content/Train/pile_bois.jpg
  87. 0 0
      Tools/BuildOurOwnBabylonJS/BuildOurOwnBabylonJSServer/Content/Train/pile_bois_n.jpg
  88. 0 0
      Tools/BuildOurOwnBabylonJS/BuildOurOwnBabylonJSServer/Content/Train/planches.jpg
  89. 0 0
      Tools/BuildOurOwnBabylonJS/BuildOurOwnBabylonJSServer/Content/Train/planches_n.jpg
  90. 0 0
      Tools/BuildOurOwnBabylonJS/BuildOurOwnBabylonJSServer/Content/Train/poteaux.jpg
  91. 0 0
      Tools/BuildOurOwnBabylonJS/BuildOurOwnBabylonJSServer/Content/Train/poteaux_n.jpg
  92. 0 0
      Tools/BuildOurOwnBabylonJS/BuildOurOwnBabylonJSServer/Content/Train/poubelle.jpg
  93. 0 0
      Tools/BuildOurOwnBabylonJS/BuildOurOwnBabylonJSServer/Content/Train/poubelle_n.jpg
  94. 0 0
      Tools/BuildOurOwnBabylonJS/BuildOurOwnBabylonJSServer/Content/Train/rochers_big.jpg
  95. 0 0
      Tools/BuildOurOwnBabylonJS/BuildOurOwnBabylonJSServer/Content/Train/rochers_big_n.jpg
  96. 0 0
      Tools/BuildOurOwnBabylonJS/BuildOurOwnBabylonJSServer/Content/Train/rock_tunnel.jpg
  97. 0 0
      Tools/BuildOurOwnBabylonJS/BuildOurOwnBabylonJSServer/Content/Train/rock_tunnel_n.jpg
  98. 0 0
      Tools/BuildOurOwnBabylonJS/BuildOurOwnBabylonJSServer/Content/Train/sacs_sable.jpg
  99. 0 0
      Tools/BuildOurOwnBabylonJS/BuildOurOwnBabylonJSServer/Content/Train/sacs_sable_n.jpg
  100. 0 0
      BabylonJSServer/Content/Train/sapin_leaves.jpg

+ 0 - 3
.gitignore

@@ -1,6 +1,3 @@
-# User-specific files
-myBabylon.js
-
 # Build Folders (you can keep bin if you'd like, to store dlls and pdbs)
 [Bb]in/
 [Oo]bj/

+ 0 - 1
BabylonJSServer/Global.asax

@@ -1 +0,0 @@
-<%@ Application Codebehind="Global.asax.cs" Inherits="BabylonJSServer.MvcApplication" Language="C#" %>

+ 3 - 3
BabylonJS.sln

@@ -1,11 +1,11 @@
 
 Microsoft Visual Studio Solution File, Format Version 11.00
 # Visual Studio 2010
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BabylonJS", "BabylonJS.csproj", "{0263AD0D-56E6-4439-BC05-6EC957200F52}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BabylonJS", "..\..\BabylonJS.csproj", "{0263AD0D-56E6-4439-BC05-6EC957200F52}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BabylonJSServer", "BabylonJSServer\BabylonJSServer.csproj", "{93EF5B02-72EB-4B55-831E-E5051269EDA6}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BuildOurOwnBabylonJSServer", "BuildOurOwnBabylonJSServer\BuildOurOwnBabylonJSServer.csproj", "{93EF5B02-72EB-4B55-831E-E5051269EDA6}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "myBabylonJS", "myBabylonJS\myBabylonJS.csproj", "{CFBE5149-1605-4824-8BD2-55C9B3C1DA60}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BuildOurOwnBabylonJS", "BuildOurOwnBabylonJS\BuildOurOwnBabylonJS.csproj", "{CFBE5149-1605-4824-8BD2-55C9B3C1DA60}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

+ 6 - 0
Tools/BuildOurOwnBabylonJS/BuildOurOwnBabylonJS/.gitignore

@@ -0,0 +1,6 @@
+# User-specific files
+executables/jskompactor.exe
+ourOwnBabylonJS.xml
+ourOwnBabylon.js
+#is in repo do have an example of command line
+BuildOurOwnBabylonJS.csproj.user 

+ 6 - 8
myBabylonJS/myBabylonJS.csproj

@@ -8,8 +8,8 @@
     <ProjectGuid>{CFBE5149-1605-4824-8BD2-55C9B3C1DA60}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>myBabylonJS</RootNamespace>
-    <AssemblyName>myBabylonJS</AssemblyName>
+    <RootNamespace>BuildOurOwnBabylonJS</RootNamespace>
+    <AssemblyName>BuildOurOwnBabylonJS</AssemblyName>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <TargetFrameworkProfile>
     </TargetFrameworkProfile>
@@ -56,22 +56,20 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="..\myBabylon.js">
-      <Link>%(RecursiveDir)%(Filename)%(Extension)</Link>
-    </Content>
-    <None Include="babylon.xsd">
+    <Content Include="ourOwnBabylon.js"></Content>
+    <None Include="babylonJS.xsd">
       <SubType>Designer</SubType>
     </None>
     <Content Include="Refs\Mvp.Xml-bin-2.0\license.txt" />
     <Content Include="Refs\Mvp.Xml-bin-2.0\Mvp.Xml.dll" />
     <Content Include="Refs\Mvp.Xml-bin-2.0\readme.txt" />
-    <Resource Include="babylon.xml">
+    <Resource Include="babylonJS.xml">
       <SubType>Designer</SubType>
     </Resource>
     <Content Include="executables\JSKompactor.exe">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Resource Include="myBabylon.xml">
+    <Resource Include="ourOwnBabylonJS.xml">
       <SubType>Designer</SubType>
     </Resource>
   </ItemGroup>

+ 7 - 8
myBabylonJS/Program.cs

@@ -9,7 +9,7 @@ using System.Diagnostics;
 using Mvp.Xml.XInclude;
 using System.Xml;
 
-namespace myBabylonJS
+namespace BuildOurOwnBabylonJS
 {
     class Program
     {
@@ -23,7 +23,7 @@ namespace myBabylonJS
             }
 
             // Parsing arguments
-            var myBabylonXmlFilePath = "";
+            var ourOwnBabylonJSXmlFilePath = "";
             var scriptsFolderPath = "";
             var shadersFolderPath = "";
             var outputFolderPath = "";
@@ -36,7 +36,7 @@ namespace myBabylonJS
                 switch (order)
                 {
                     case "/i:":
-                        myBabylonXmlFilePath = arg.Substring(3);
+                        ourOwnBabylonJSXmlFilePath = arg.Substring(3);
                         break;
                     case "/w:":
                         scriptsFolderPath = arg.Substring(3);
@@ -57,7 +57,7 @@ namespace myBabylonJS
                 }
             }
 
-            if (String.IsNullOrEmpty(myBabylonXmlFilePath)
+            if (String.IsNullOrEmpty(ourOwnBabylonJSXmlFilePath)
                 || String.IsNullOrEmpty(scriptsFolderPath)
                 || String.IsNullOrEmpty(shadersFolderPath)
                 || String.IsNullOrEmpty(outputFolderPath))
@@ -69,7 +69,7 @@ namespace myBabylonJS
 
             try
             {
-                ParseListOfFiles(myBabylonXmlFilePath);
+                ParseListOfFiles(ourOwnBabylonJSXmlFilePath);
 
                 if (String.IsNullOrEmpty(JSKompactorFolderPath))
                     JSKompactorFolderPath = "executables";
@@ -144,7 +144,7 @@ namespace myBabylonJS
             using (var batchFile = new StreamWriter(batchFilePath, false))
             {
                 batchFile.Write("\"" + jskompactorPath + "\\JSKompactor.exe\" /i:\"" + output
-                    + "\" /o:\"" + outputFolderPath + "\\myBabylon.js\" /w:\"" + scriptsFolderPath + "\\\\\" /s:\"" + shadersFolderPath + "\""); // \r\npause");
+                    + "\" /o:\"" + outputFolderPath + "\\ourOwnBabylon.js\" /w:\"" + scriptsFolderPath + "\" /s:\"" + shadersFolderPath + "\"");
             }
 
             return batchFilePath;
@@ -160,8 +160,7 @@ namespace myBabylonJS
 
         private static void DisplayUsage()
         {
-            //Console.WriteLine("myBabylon usage: myBabylon.exe /xml:\"path of the xml file containing list of files to include\" /myb:\"path of root folder containing your separate js files to extend Babylon.js\" /bjs:\"path of root folder containing separate js files for Babylon.js\"");
-            Console.WriteLine("myBabylon usage: myBabylon.exe /w:\"Working folder\" /i:\"Path of the xml file containing list of files to merge\" /s:\"Shaders folder\" /o:\"Output folder\" [/k:\"Path to JSKompactor.exe\"]");
+            Console.WriteLine("BuildOurOwnBabylonJS usage: BuildOurOwnBabylonJS.exe /w:\"Working folder\" /i:\"Path of the xml file containing list of files to merge\" /s:\"Shaders folder\" /o:\"Output folder\" [/k:\"Path to JSKompactor.exe\"]");
         }
 
         private static void Error(Exception ex)

+ 2 - 2
myBabylonJS/Properties/AssemblyInfo.cs

@@ -5,11 +5,11 @@ using System.Runtime.InteropServices;
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
-[assembly: AssemblyTitle("myBabylonJS")]
+[assembly: AssemblyTitle("BuildOurOwnBabylonJS")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("myBabylonJS")]
+[assembly: AssemblyProduct("BuildOurOwnBabylonJS")]
 [assembly: AssemblyCopyright("Copyright ©  2014")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]

myBabylonJS/executables/Mvp.Xml.dll → Tools/BuildOurOwnBabylonJS/BuildOurOwnBabylonJS/Refs/Mvp.Xml-bin-2.0/Mvp.Xml.dll


myBabylonJS/Refs/Mvp.Xml-bin-2.0/license.txt → Tools/BuildOurOwnBabylonJS/BuildOurOwnBabylonJS/Refs/Mvp.Xml-bin-2.0/license.txt


myBabylonJS/Refs/Mvp.Xml-bin-2.0/readme.txt → Tools/BuildOurOwnBabylonJS/BuildOurOwnBabylonJS/Refs/Mvp.Xml-bin-2.0/readme.txt


+ 1 - 1
myBabylonJS/Script.cs

@@ -6,7 +6,7 @@ using System.IO;
 using System.Reflection;
 using System.Xml.Linq;
 
-namespace myBabylonJS
+namespace BuildOurOwnBabylonJS
 {
     public class Script
     {

myBabylonJS/app.config → Tools/BuildOurOwnBabylonJS/BuildOurOwnBabylonJS/app.config


+ 1 - 1
myBabylonJS/babylon.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" ?>
-<files xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="babylon.xsd">
+<files xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="babylonJS.xsd">
   <script src="Babylon/Physics/babylon.physicsEngine.js"></script>
   <script src="Babylon/Tools/babylon.filesInput.js"></script>
   <script src="Babylon/Collisions/babylon.pickingInfo.js"></script>

myBabylonJS/babylon.xsd → Tools/BuildOurOwnBabylonJS/BuildOurOwnBabylonJS/babylonJS.xsd


+ 2 - 0
Tools/BuildOurOwnBabylonJS/BuildOurOwnBabylonJS/executables/BuildOurOwnBabylonJS.bat

@@ -0,0 +1,2 @@
+BuildOurOwnBabylonJS.exe /w:"..\..\..\.." /i:"..\ourOwnBabylonJS.xml" /s:"Babylon\Shaders" /o:".." /k:"."
+pause

BIN
Tools/BuildOurOwnBabylonJS/BuildOurOwnBabylonJS/executables/BuildOurOwnBabylonJS.exe


myBabylonJS/executables/JSKompactor.exe → Tools/BuildOurOwnBabylonJS/BuildOurOwnBabylonJS/executables/JSKompactor.exe


myBabylonJS/Refs/Mvp.Xml-bin-2.0/Mvp.Xml.dll → Tools/BuildOurOwnBabylonJS/BuildOurOwnBabylonJS/executables/Mvp.Xml.dll


myBabylon.js → Tools/BuildOurOwnBabylonJS/BuildOurOwnBabylonJS/ourOwnBabylon.js


+ 2 - 2
myBabylonJS/myBabylon.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" ?>
-<files xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="babylon.xsd">
-  <xi:include href="babylon.xml" xpointer="xpointer(//files//script)" />
+<files xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="babylonJS.xsd">
+  <xi:include href="babylonJS.xml" xpointer="xpointer(//files//script)" />
   <!-- you cannot override a <script> already defined in babylon.xml. You must modify it in babylon.js
   to be sure that everyone will have it -->
   <!--<script id="myFile" src="myFile.js">

+ 6 - 10
BabylonJSServer/BabylonJSServer.csproj

@@ -10,8 +10,8 @@
     <ProjectTypeGuids>{E53F8FEA-EAE0-44A6-8774-FFD645390401};{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>BabylonJSServer</RootNamespace>
-    <AssemblyName>BabylonJSServer</AssemblyName>
+    <RootNamespace>BuildOurOwnBabylonJSServer</RootNamespace>
+    <AssemblyName>BuildOurOwnBabylonJSServer</AssemblyName>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <MvcBuildViews>false</MvcBuildViews>
     <UseIISExpress>false</UseIISExpress>
@@ -64,7 +64,7 @@
   <ItemGroup>
     <Compile Include="WebViewPageExtensions.cs" />
     <Compile Include="Controllers\HomeController.cs" />
-    <Compile Include="Controllers\BabylonJSController.cs" />
+    <Compile Include="Controllers\BuildOurOwnBabylonJSController.cs" />
     <Compile Include="Global.asax.cs">
       <DependentUpon>Global.asax</DependentUpon>
     </Compile>
@@ -252,10 +252,6 @@
     <Content Include="Views\Web.config" />
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="App_Data\" />
-    <Folder Include="Models\" />
-  </ItemGroup>
-  <ItemGroup>
     <Content Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
@@ -263,9 +259,9 @@
     <None Include="Content\Train\Train.babylon.manifest" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\myBabylonJS\myBabylonJS.csproj">
+    <ProjectReference Include="..\BuildOurOwnBabylonJS\BuildOurOwnBabylonJS.csproj">
       <Project>{CFBE5149-1605-4824-8BD2-55C9B3C1DA60}</Project>
-      <Name>myBabylonJS</Name>
+      <Name>BuildOurOwnBabylonJS</Name>
       <Private>True</Private>
     </ProjectReference>
   </ItemGroup>
@@ -304,6 +300,6 @@
     </PreBuildEvent>
   </PropertyGroup>
   <PropertyGroup>
-    <PostBuildEvent>"$(SolutionDir)myBabylonJS\$(OutDir)$(ConfigurationName)\myBabylonJS.exe" /w:"$(SolutionDir)\" /i:"$(SolutionDir)\myBabylonJS\myBabylon.xml" /s:"Babylon\Shaders" /o:"$(SolutionDir)\"</PostBuildEvent>
+    <PostBuildEvent>"$(SolutionDir)BuildOurOwnBabylonJS\$(OutDir)$(ConfigurationName)\BuildOurOwnBabylonJS.exe" /w:"$(SolutionDir)..\.." /i:"$(SolutionDir)BuildOurOwnBabylonJS\ourOwnBabylonJS.xml" /s:"Babylon\Shaders" /o:"$(SolutionDir)BuildOurOwnBabylonJS"</PostBuildEvent>
   </PropertyGroup>
 </Project>

+ 1 - 1
BabylonJSServer/Content/Site.css

@@ -103,7 +103,7 @@ page width. Or, you can specify an exact pixel width. */
     text-shadow: 1px 1px 2px #111;
 }
 
-#babylonJSCanvas {
+#ourOwnBabylonJSCanvas {
     width: 100%;
     height: 100%;
 }

BabylonJSServer/Content/Train/Train.babylon → Tools/BuildOurOwnBabylonJS/BuildOurOwnBabylonJSServer/Content/Train/Train.babylon


BabylonJSServer/Content/Train/Train.babylon.manifest → Tools/BuildOurOwnBabylonJS/BuildOurOwnBabylonJSServer/Content/Train/Train.babylon.manifest


BabylonJSServer/Content/Train/barrieres_bois.jpg → Tools/BuildOurOwnBabylonJS/BuildOurOwnBabylonJSServer/Content/Train/barrieres_bois.jpg


BabylonJSServer/Content/Train/barrieres_bois_n.jpg → Tools/BuildOurOwnBabylonJS/BuildOurOwnBabylonJSServer/Content/Train/barrieres_bois_n.jpg


BabylonJSServer/Content/Train/bat_console_murs_ext_lm.jpg → Tools/BuildOurOwnBabylonJS/BuildOurOwnBabylonJSServer/Content/Train/bat_console_murs_ext_lm.jpg


BabylonJSServer/Content/Train/bat_console_murs_lm.jpg → Tools/BuildOurOwnBabylonJS/BuildOurOwnBabylonJSServer/Content/Train/bat_console_murs_lm.jpg


BabylonJSServer/Content/Train/bat_lm.jpg → Tools/BuildOurOwnBabylonJS/BuildOurOwnBabylonJSServer/Content/Train/bat_lm.jpg


BabylonJSServer/Content/Train/bosquet_grass.jpg → Tools/BuildOurOwnBabylonJS/BuildOurOwnBabylonJSServer/Content/Train/bosquet_grass.jpg


BabylonJSServer/Content/Train/bosquet_grass.png → Tools/BuildOurOwnBabylonJS/BuildOurOwnBabylonJSServer/Content/Train/bosquet_grass.png


BabylonJSServer/Content/Train/bottes_paille.jpg → Tools/BuildOurOwnBabylonJS/BuildOurOwnBabylonJSServer/Content/Train/bottes_paille.jpg


BabylonJSServer/Content/Train/bottes_paille_face.jpg → Tools/BuildOurOwnBabylonJS/BuildOurOwnBabylonJSServer/Content/Train/bottes_paille_face.jpg


BabylonJSServer/Content/Train/champ_ble.jpg → Tools/BuildOurOwnBabylonJS/BuildOurOwnBabylonJSServer/Content/Train/champ_ble.jpg


BabylonJSServer/Content/Train/champ_ble.png → Tools/BuildOurOwnBabylonJS/BuildOurOwnBabylonJSServer/Content/Train/champ_ble.png


BabylonJSServer/Content/Train/chariot_planche.jpg → Tools/BuildOurOwnBabylonJS/BuildOurOwnBabylonJSServer/Content/Train/chariot_planche.jpg


BabylonJSServer/Content/Train/chariot_planche_n.jpg → Tools/BuildOurOwnBabylonJS/BuildOurOwnBabylonJSServer/Content/Train/chariot_planche_n.jpg


BabylonJSServer/Content/Train/chariot_roue.jpg → Tools/BuildOurOwnBabylonJS/BuildOurOwnBabylonJSServer/Content/Train/chariot_roue.jpg


BabylonJSServer/Content/Train/chariot_roue_n.jpg → Tools/BuildOurOwnBabylonJS/BuildOurOwnBabylonJSServer/Content/Train/chariot_roue_n.jpg


BabylonJSServer/Content/Train/console.jpg → Tools/BuildOurOwnBabylonJS/BuildOurOwnBabylonJSServer/Content/Train/console.jpg


BabylonJSServer/Content/Train/console_n.jpg → Tools/BuildOurOwnBabylonJS/BuildOurOwnBabylonJSServer/Content/Train/console_n.jpg


BabylonJSServer/Content/Train/cubemap5_nx.jpg → Tools/BuildOurOwnBabylonJS/BuildOurOwnBabylonJSServer/Content/Train/cubemap5_nx.jpg


BabylonJSServer/Content/Train/cubemap5_ny.jpg → Tools/BuildOurOwnBabylonJS/BuildOurOwnBabylonJSServer/Content/Train/cubemap5_ny.jpg


BabylonJSServer/Content/Train/cubemap5_nz.jpg → Tools/BuildOurOwnBabylonJS/BuildOurOwnBabylonJSServer/Content/Train/cubemap5_nz.jpg


BabylonJSServer/Content/Train/cubemap5_px.jpg → Tools/BuildOurOwnBabylonJS/BuildOurOwnBabylonJSServer/Content/Train/cubemap5_px.jpg


BabylonJSServer/Content/Train/cubemap5_py.jpg → Tools/BuildOurOwnBabylonJS/BuildOurOwnBabylonJSServer/Content/Train/cubemap5_py.jpg


BabylonJSServer/Content/Train/cubemap5_pz.jpg → Tools/BuildOurOwnBabylonJS/BuildOurOwnBabylonJSServer/Content/Train/cubemap5_pz.jpg


BabylonJSServer/Content/Train/cubemap_nx.jpg → Tools/BuildOurOwnBabylonJS/BuildOurOwnBabylonJSServer/Content/Train/cubemap_nx.jpg


BabylonJSServer/Content/Train/cubemap_ny.jpg → Tools/BuildOurOwnBabylonJS/BuildOurOwnBabylonJSServer/Content/Train/cubemap_ny.jpg


BabylonJSServer/Content/Train/cubemap_nz.jpg → Tools/BuildOurOwnBabylonJS/BuildOurOwnBabylonJSServer/Content/Train/cubemap_nz.jpg


BabylonJSServer/Content/Train/cubemap_px.jpg → Tools/BuildOurOwnBabylonJS/BuildOurOwnBabylonJSServer/Content/Train/cubemap_px.jpg


BabylonJSServer/Content/Train/cubemap_py.jpg → Tools/BuildOurOwnBabylonJS/BuildOurOwnBabylonJSServer/Content/Train/cubemap_py.jpg


BabylonJSServer/Content/Train/cubemap_pz.jpg → Tools/BuildOurOwnBabylonJS/BuildOurOwnBabylonJSServer/Content/Train/cubemap_pz.jpg


BabylonJSServer/Content/Train/cubemap_vitres_nx.jpg → Tools/BuildOurOwnBabylonJS/BuildOurOwnBabylonJSServer/Content/Train/cubemap_vitres_nx.jpg


BabylonJSServer/Content/Train/cubemap_vitres_ny.jpg → Tools/BuildOurOwnBabylonJS/BuildOurOwnBabylonJSServer/Content/Train/cubemap_vitres_ny.jpg


BabylonJSServer/Content/Train/cubemap_vitres_nz.jpg → Tools/BuildOurOwnBabylonJS/BuildOurOwnBabylonJSServer/Content/Train/cubemap_vitres_nz.jpg


BabylonJSServer/Content/Train/cubemap_vitres_px.jpg → Tools/BuildOurOwnBabylonJS/BuildOurOwnBabylonJSServer/Content/Train/cubemap_vitres_px.jpg


BabylonJSServer/Content/Train/cubemap_vitres_py.jpg → Tools/BuildOurOwnBabylonJS/BuildOurOwnBabylonJSServer/Content/Train/cubemap_vitres_py.jpg


BabylonJSServer/Content/Train/cubemap_vitres_pz.jpg → Tools/BuildOurOwnBabylonJS/BuildOurOwnBabylonJSServer/Content/Train/cubemap_vitres_pz.jpg


BabylonJSServer/Content/Train/cuir.jpg → Tools/BuildOurOwnBabylonJS/BuildOurOwnBabylonJSServer/Content/Train/cuir.jpg


BabylonJSServer/Content/Train/cuir_n.jpg → Tools/BuildOurOwnBabylonJS/BuildOurOwnBabylonJSServer/Content/Train/cuir_n.jpg


BabylonJSServer/Content/Train/debug.txt → Tools/BuildOurOwnBabylonJS/BuildOurOwnBabylonJSServer/Content/Train/debug.txt


BabylonJSServer/Content/Train/disneyland_paris.jpg → Tools/BuildOurOwnBabylonJS/BuildOurOwnBabylonJSServer/Content/Train/disneyland_paris.jpg


BabylonJSServer/Content/Train/flechage.jpg → Tools/BuildOurOwnBabylonJS/BuildOurOwnBabylonJSServer/Content/Train/flechage.jpg


BabylonJSServer/Content/Train/flechage.png → Tools/BuildOurOwnBabylonJS/BuildOurOwnBabylonJSServer/Content/Train/flechage.png


BabylonJSServer/Content/Train/flechage2.jpg → Tools/BuildOurOwnBabylonJS/BuildOurOwnBabylonJSServer/Content/Train/flechage2.jpg


BabylonJSServer/Content/Train/flechage2.png → Tools/BuildOurOwnBabylonJS/BuildOurOwnBabylonJSServer/Content/Train/flechage2.png


BabylonJSServer/Content/Train/grass.jpg → Tools/BuildOurOwnBabylonJS/BuildOurOwnBabylonJSServer/Content/Train/grass.jpg


BabylonJSServer/Content/Train/grass.png → Tools/BuildOurOwnBabylonJS/BuildOurOwnBabylonJSServer/Content/Train/grass.png


BabylonJSServer/Content/Train/grillage.jpg → Tools/BuildOurOwnBabylonJS/BuildOurOwnBabylonJSServer/Content/Train/grillage.jpg


BabylonJSServer/Content/Train/grillage.png → Tools/BuildOurOwnBabylonJS/BuildOurOwnBabylonJSServer/Content/Train/grillage.png


BabylonJSServer/Content/Train/lens2.png → Tools/BuildOurOwnBabylonJS/BuildOurOwnBabylonJSServer/Content/Train/lens2.png


BabylonJSServer/Content/Train/lens3.png → Tools/BuildOurOwnBabylonJS/BuildOurOwnBabylonJSServer/Content/Train/lens3.png


BabylonJSServer/Content/Train/lens4.png → Tools/BuildOurOwnBabylonJS/BuildOurOwnBabylonJSServer/Content/Train/lens4.png


BabylonJSServer/Content/Train/lens5.png → Tools/BuildOurOwnBabylonJS/BuildOurOwnBabylonJSServer/Content/Train/lens5.png


BabylonJSServer/Content/Train/lens6.png → Tools/BuildOurOwnBabylonJS/BuildOurOwnBabylonJSServer/Content/Train/lens6.png


BabylonJSServer/Content/Train/metal_rouille.jpg → Tools/BuildOurOwnBabylonJS/BuildOurOwnBabylonJSServer/Content/Train/metal_rouille.jpg


BabylonJSServer/Content/Train/metal_rouille_n.jpg → Tools/BuildOurOwnBabylonJS/BuildOurOwnBabylonJSServer/Content/Train/metal_rouille_n.jpg


BabylonJSServer/Content/Train/metal_tache.jpg → Tools/BuildOurOwnBabylonJS/BuildOurOwnBabylonJSServer/Content/Train/metal_tache.jpg


BabylonJSServer/Content/Train/metal_tache_n.jpg → Tools/BuildOurOwnBabylonJS/BuildOurOwnBabylonJSServer/Content/Train/metal_tache_n.jpg


BabylonJSServer/Content/Train/murs_wood.jpg → Tools/BuildOurOwnBabylonJS/BuildOurOwnBabylonJSServer/Content/Train/murs_wood.jpg


BabylonJSServer/Content/Train/murs_wood_n.jpg → Tools/BuildOurOwnBabylonJS/BuildOurOwnBabylonJSServer/Content/Train/murs_wood_n.jpg


BabylonJSServer/Content/Train/no_signal.jpg → Tools/BuildOurOwnBabylonJS/BuildOurOwnBabylonJSServer/Content/Train/no_signal.jpg


BabylonJSServer/Content/Train/paille_alpha.jpg → Tools/BuildOurOwnBabylonJS/BuildOurOwnBabylonJSServer/Content/Train/paille_alpha.jpg


BabylonJSServer/Content/Train/paille_alpha.png → Tools/BuildOurOwnBabylonJS/BuildOurOwnBabylonJSServer/Content/Train/paille_alpha.png


BabylonJSServer/Content/Train/pile_bois.jpg → Tools/BuildOurOwnBabylonJS/BuildOurOwnBabylonJSServer/Content/Train/pile_bois.jpg


BabylonJSServer/Content/Train/pile_bois_n.jpg → Tools/BuildOurOwnBabylonJS/BuildOurOwnBabylonJSServer/Content/Train/pile_bois_n.jpg


BabylonJSServer/Content/Train/planches.jpg → Tools/BuildOurOwnBabylonJS/BuildOurOwnBabylonJSServer/Content/Train/planches.jpg


BabylonJSServer/Content/Train/planches_n.jpg → Tools/BuildOurOwnBabylonJS/BuildOurOwnBabylonJSServer/Content/Train/planches_n.jpg


BabylonJSServer/Content/Train/poteaux.jpg → Tools/BuildOurOwnBabylonJS/BuildOurOwnBabylonJSServer/Content/Train/poteaux.jpg


BabylonJSServer/Content/Train/poteaux_n.jpg → Tools/BuildOurOwnBabylonJS/BuildOurOwnBabylonJSServer/Content/Train/poteaux_n.jpg


BabylonJSServer/Content/Train/poubelle.jpg → Tools/BuildOurOwnBabylonJS/BuildOurOwnBabylonJSServer/Content/Train/poubelle.jpg


BabylonJSServer/Content/Train/poubelle_n.jpg → Tools/BuildOurOwnBabylonJS/BuildOurOwnBabylonJSServer/Content/Train/poubelle_n.jpg


BabylonJSServer/Content/Train/rochers_big.jpg → Tools/BuildOurOwnBabylonJS/BuildOurOwnBabylonJSServer/Content/Train/rochers_big.jpg


BabylonJSServer/Content/Train/rochers_big_n.jpg → Tools/BuildOurOwnBabylonJS/BuildOurOwnBabylonJSServer/Content/Train/rochers_big_n.jpg


BabylonJSServer/Content/Train/rock_tunnel.jpg → Tools/BuildOurOwnBabylonJS/BuildOurOwnBabylonJSServer/Content/Train/rock_tunnel.jpg


BabylonJSServer/Content/Train/rock_tunnel_n.jpg → Tools/BuildOurOwnBabylonJS/BuildOurOwnBabylonJSServer/Content/Train/rock_tunnel_n.jpg


BabylonJSServer/Content/Train/sacs_sable.jpg → Tools/BuildOurOwnBabylonJS/BuildOurOwnBabylonJSServer/Content/Train/sacs_sable.jpg


BabylonJSServer/Content/Train/sacs_sable_n.jpg → Tools/BuildOurOwnBabylonJS/BuildOurOwnBabylonJSServer/Content/Train/sacs_sable_n.jpg


+ 0 - 0
BabylonJSServer/Content/Train/sapin_leaves.jpg


Daži faili netika attēloti, jo izmaiņu fails ir pārāk liels