Merge branch 'master' of https://github.com/BabylonJS/Babylon.js

Exporters/3ds Max/BabylonExport.Entities/BabylonAnimation.cs

@@ -47,8 +47,8 @@ namespace BabylonExport.Entities
 
         public BabylonAnimation()
         {
-            this.enableBlending = false;
-            this.blendingSpeed = 0.01f;
+            enableBlending = false;
+            blendingSpeed = 0.01f;
         }
     }
 }

Exporters/3ds Max/BabylonExport.Entities/BabylonExport.Entities.csproj

@@ -59,13 +59,16 @@
     <Compile Include="BabylonAnimationKey.cs" />
     <Compile Include="BabylonBone.cs" />
     <Compile Include="BabylonCamera.cs" />
+    <Compile Include="BabylonDirectionalLight.cs" />
     <Compile Include="BabylonFresnelParameters.cs" />
+    <Compile Include="BabylonHDRCubeTexture.cs" />
     <Compile Include="BabylonIAnimatable.cs" />
     <Compile Include="BabylonLensFlare.cs" />
     <Compile Include="BabylonLensFlareSystem.cs" />
     <Compile Include="BabylonLight.cs" />
     <Compile Include="BabylonMaterial.cs" />
     <Compile Include="BabylonPBRMaterial.cs" />
+    <Compile Include="BabylonShaderMaterial.cs" />
     <Compile Include="BabylonStandardMaterial.cs" />
     <Compile Include="BabylonAbstractMesh.cs" />
     <Compile Include="BabylonMesh.cs" />
@@ -78,6 +81,7 @@
     <Compile Include="BabylonSound.cs" />
     <Compile Include="BabylonSubMesh.cs" />
     <Compile Include="BabylonTexture.cs" />
+    <Compile Include="BabylonUniversalCamera.cs" />
     <Compile Include="BabylonVector3.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
@@ -85,12 +89,12 @@
     <None Include="packages.config" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="..\packages\SharpDX.2.6.3\build\SharpDX.targets" Condition="Exists('..\packages\SharpDX.2.6.3\build\SharpDX.targets')" />
+  <Import Project=".\packages\SharpDX.2.6.3\build\SharpDX.targets" Condition="Exists('.\packages\SharpDX.2.6.3\build\SharpDX.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\packages\SharpDX.2.6.3\build\SharpDX.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\SharpDX.2.6.3\build\SharpDX.targets'))" />
+    <Error Condition="!Exists('.\packages\SharpDX.2.6.3\build\SharpDX.targets')" Text="$([System.String]::Format('$(ErrorText)', '.\packages\SharpDX.2.6.3\build\SharpDX.targets'))" />
   </Target>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

Exporters/3ds Max/BabylonExport.Entities/BabylonHDRCubeTexture.cs

@@ -25,13 +25,18 @@ namespace BabylonExport.Entities
 
         public BabylonHDRCubeTexture()
         {
-            this.customType = "BABYLON.HDRCubeTexture";
-            this.size = 0;
-            this.isCube = true;
-            this.useInGammaSpace = false;
-            this.generateHarmonics = true;
-            this.usePMREMGenerator = false;
-            this.isBABYLONPreprocessed = false;
+            SetCustomType("BABYLON.HDRCubeTexture");
+            size = 0;
+            isCube = true;
+            useInGammaSpace = false;
+            generateHarmonics = true;
+            usePMREMGenerator = false;
+            isBABYLONPreprocessed = false;
+        }
+
+        public void SetCustomType(string type)
+        {
+            customType = type;
         }
     }
 }

Exporters/3ds Max/BabylonExport.Entities/BabylonPBRMaterial.cs

@@ -130,10 +130,12 @@ namespace BabylonExport.Entities
         [DataMember]
         public bool twoSidedLighting { get; set; }
 
+        [DataMember]
+        public int maxSimultaneousLights { get; set; }
+
         public BabylonPBRMaterial() : base()
         {
-            customType = "BABYLON.PBRMaterial";
-
+            SetCustomType("BABYLON.PBRMaterial");
             directIntensity = 1.0f;
             emissiveIntensity = 1.0f;
             environmentIntensity = 1.0f;
@@ -142,6 +144,7 @@ namespace BabylonExport.Entities
             cameraContrast = 1.0f;
             indexOfRefraction = 0.66f;
             twoSidedLighting = false;
+            maxSimultaneousLights = 4;
             useRadianceOverAlpha = true;
             useSpecularOverAlpha = true;
             usePhysicalLightFalloff = true;
@@ -165,7 +168,7 @@ namespace BabylonExport.Entities
 
         public void SetCustomType(string type)
         {
-            this.customType = type;
+            customType = type;
         }
     }
 }

Exporters/3ds Max/BabylonExport.Entities/BabylonParticleSystem.cs

@@ -97,10 +97,10 @@ namespace BabylonExport.Entities
 
         public BabylonParticleSystem()
         {
-            this.preventAutoStart = true;
-            this.autoAnimate = false;
-            this.animations = null;
-            this.customShader = null;
+            preventAutoStart = true;
+            autoAnimate = false;
+            animations = null;
+            customShader = null;
         }
     }
 }

Exporters/3ds Max/BabylonExport.Entities/BabylonShaderMaterial.cs

@@ -56,22 +56,27 @@ namespace BabylonExport.Entities
 
         public BabylonShaderMaterial()
         {
-            this.customType = "BABYLON.ShaderMaterial";
-            this.shaderPath = null;
-            this.options = new BabylonShaderOptions();
-            this.textures = new Dictionary<string, object>();
-            this.textureArrays = new Dictionary<string, object[]>();
-            this.floats = new Dictionary<string, object>();
-            this.floatArrays = new Dictionary<string, object[]>();
-            this.colors3 = new Dictionary<string, object>();
-            this.colors4 = new Dictionary<string, object>();
-            this.vectors2 = new Dictionary<string, object>();
-            this.vectors3 = new Dictionary<string, object>();
-            this.vectors4 = new Dictionary<string, object>();
-            this.matrices = new Dictionary<string, object>();
-            this.matrices2x2 = new Dictionary<string, object>();
-            this.matrices3x3 = new Dictionary<string, object>();
-            this.vectors3Arrays = new Dictionary<string, object[]>();
+            SetCustomType("BABYLON.ShaderMaterial");
+            shaderPath = null;
+            options = new BabylonShaderOptions();
+            textures = new Dictionary<string, object>();
+            textureArrays = new Dictionary<string, object[]>();
+            floats = new Dictionary<string, object>();
+            floatArrays = new Dictionary<string, object[]>();
+            colors3 = new Dictionary<string, object>();
+            colors4 = new Dictionary<string, object>();
+            vectors2 = new Dictionary<string, object>();
+            vectors3 = new Dictionary<string, object>();
+            vectors4 = new Dictionary<string, object>();
+            matrices = new Dictionary<string, object>();
+            matrices2x2 = new Dictionary<string, object>();
+            matrices3x3 = new Dictionary<string, object>();
+            vectors3Arrays = new Dictionary<string, object[]>();
+        }
+
+        public void SetCustomType(string type)
+        {
+            customType = type;
         }
     }
 

Exporters/3ds Max/BabylonExport.Entities/BabylonStandardMaterial.cs

@@ -5,6 +5,9 @@ namespace BabylonExport.Entities
     public class BabylonStandardMaterial: BabylonMaterial
     {
         [DataMember]
+        public string customType { get; private set; }
+
+        [DataMember]
         public float[] ambient { get; set; }
 
         [DataMember]
@@ -71,16 +74,26 @@ namespace BabylonExport.Entities
         [DataMember]
         public bool twoSidedLighting { get; set; }
 
+        [DataMember]
+        public int maxSimultaneousLights { get; set; }
+
         public BabylonStandardMaterial() : base()
         {
+            SetCustomType("BABYLON.StandardMaterial");
             ambient = new[] {1.0f, 1.0f, 1.0f};
             diffuse = new[] { 1.0f, 1.0f, 1.0f };
             specular = new[] { 1.0f, 1.0f, 1.0f };
             emissive = new[] { 0f, 0f, 0f };
             specularPower = 64;
+            maxSimultaneousLights = 4;
             useSpecularOverAlpha = true;
             useEmissiveAsIllumination = false;
             linkEmissiveWithDiffuse = false;
         }
+
+        public void SetCustomType(string type)
+        {
+            customType = type;
+        }
     }
 }

Exporters/3ds Max/BabylonExport.Entities/BabylonUniversalCamera.cs

@@ -6,7 +6,7 @@ namespace BabylonExport.Entities
     {
         public BabylonUniversalCamera()
         {
-            this.type = "UniversalCamera";
+            type = "UniversalCamera";
         }
     }
 }