瀏覽代碼

Merge pull request #1683 from MackeyK24/master

Babylon Entity Fixes
David Catuhe 8 年之前
父節點
當前提交
2515828984

+ 4 - 0
Exporters/3ds Max/BabylonExport.Entities/BabylonCamera.cs

@@ -45,6 +45,9 @@ namespace BabylonExport.Entities
         public float inertia { get; set; }
         public float inertia { get; set; }
 
 
         [DataMember]
         [DataMember]
+        public float interaxialDistance { get; set; }
+
+        [DataMember]
         public bool checkCollisions { get; set; }
         public bool checkCollisions { get; set; }
 
 
         [DataMember]
         [DataMember]
@@ -103,6 +106,7 @@ namespace BabylonExport.Entities
             maxZ = 5000.0f;
             maxZ = 5000.0f;
             speed = 1.0f;
             speed = 1.0f;
             inertia = 0.9f;
             inertia = 0.9f;
+            interaxialDistance = 0.0637f;
 
 
             mode = 0;
             mode = 0;
             orthoLeft = null;
             orthoLeft = null;

+ 8 - 1
Exporters/3ds Max/BabylonExport.Entities/BabylonPBRMaterial.cs

@@ -95,6 +95,9 @@ namespace BabylonExport.Entities
         public BabylonTexture lightmapTexture { get; set; }
         public BabylonTexture lightmapTexture { get; set; }
 
 
         [DataMember]
         [DataMember]
+        public BabylonTexture metallicTexture { get; set; }
+
+        [DataMember]
         public bool useLightmapAsShadowmap { get; set; }
         public bool useLightmapAsShadowmap { get; set; }
 
 
         [DataMember]
         [DataMember]
@@ -119,6 +122,9 @@ namespace BabylonExport.Entities
         public float roughness { get; set; }
         public float roughness { get; set; }
 
 
         [DataMember]
         [DataMember]
+        public float metallic { get; set; }
+
+        [DataMember]
         public bool useRoughnessFromMetallicTextureAlpha { get; set; }
         public bool useRoughnessFromMetallicTextureAlpha { get; set; }
 
 
         [DataMember]
         [DataMember]
@@ -166,7 +172,8 @@ namespace BabylonExport.Entities
             cameraContrast = 1.0f;
             cameraContrast = 1.0f;
             useEmissiveAsIllumination = false;
             useEmissiveAsIllumination = false;
 
 
-            roughness = 1.0f;
+            metallic = 0.0f;
+            roughness = 0.0f;
             useRoughnessFromMetallicTextureAlpha = false;
             useRoughnessFromMetallicTextureAlpha = false;
             useRoughnessFromMetallicTextureGreen = false;
             useRoughnessFromMetallicTextureGreen = false;