浏览代码

Remove double sky box rotation

David Catuhe 5 年之前
父节点
当前提交
6ba7a07b6d

+ 1 - 1
dist/preview release/packagesSizeBaseLine.json

@@ -1 +1 @@
-{"thinEngineOnly":112467,"engineOnly":148577,"sceneOnly":503616,"minGridMaterial":634243,"minStandardMaterial":774375}
+{"thinEngineOnly":112467,"engineOnly":148577,"sceneOnly":504040,"minGridMaterial":634667,"minStandardMaterial":774799}

+ 0 - 3
src/Materials/Background/backgroundMaterial.ts

@@ -129,7 +129,6 @@ class BackgroundMaterialDefines extends MaterialDefines implements IImageProcess
     public REFLECTIONMAP_CUBIC = false;
     public REFLECTIONMAP_PROJECTION = false;
     public REFLECTIONMAP_SKYBOX = false;
-    public REFLECTIONMAP_SKYBOX_TRANSFORMED = false;
     public REFLECTIONMAP_EXPLICIT = false;
     public REFLECTIONMAP_EQUIRECTANGULAR = false;
     public REFLECTIONMAP_EQUIRECTANGULAR_FIXED = false;
@@ -738,7 +737,6 @@ export class BackgroundMaterial extends PushMaterial {
                             break;
                         case Texture.SKYBOX_MODE:
                             defines.REFLECTIONMAP_SKYBOX = true;
-                            defines.REFLECTIONMAP_SKYBOX_TRANSFORMED = !reflectionTexture.getReflectionTextureMatrix().isIdentity();
                             break;
                         case Texture.SPHERICAL_MODE:
                             defines.REFLECTIONMAP_SPHERICAL = true;
@@ -783,7 +781,6 @@ export class BackgroundMaterial extends PushMaterial {
                     defines.REFLECTIONMAP_CUBIC = false;
                     defines.REFLECTIONMAP_PROJECTION = false;
                     defines.REFLECTIONMAP_SKYBOX = false;
-                    defines.REFLECTIONMAP_SKYBOX_TRANSFORMED = false;
                     defines.REFLECTIONMAP_EXPLICIT = false;
                     defines.REFLECTIONMAP_EQUIRECTANGULAR = false;
                     defines.REFLECTIONMAP_EQUIRECTANGULAR_FIXED = false;

+ 0 - 6
src/Materials/PBR/pbrBaseMaterial.ts

@@ -126,7 +126,6 @@ export class PBRMaterialDefines extends MaterialDefines
     public USE_LOCAL_REFLECTIONMAP_CUBIC = false;
     public REFLECTIONMAP_PROJECTION = false;
     public REFLECTIONMAP_SKYBOX = false;
-    public REFLECTIONMAP_SKYBOX_TRANSFORMED = false;
     public REFLECTIONMAP_EXPLICIT = false;
     public REFLECTIONMAP_EQUIRECTANGULAR = false;
     public REFLECTIONMAP_EQUIRECTANGULAR_FIXED = false;
@@ -1334,7 +1333,6 @@ export abstract class PBRBaseMaterial extends PushMaterial {
                     defines.REFLECTIONMAP_EQUIRECTANGULAR = false;
                     defines.REFLECTIONMAP_EQUIRECTANGULAR_FIXED = false;
                     defines.REFLECTIONMAP_MIRROREDEQUIRECTANGULAR_FIXED = false;
-                    defines.REFLECTIONMAP_SKYBOX_TRANSFORMED = false;
 
                     switch (reflectionTexture.coordinatesMode) {
                         case Texture.EXPLICIT_MODE:
@@ -1386,9 +1384,6 @@ export abstract class PBRBaseMaterial extends PushMaterial {
                             }
                         }
                     }
-                    else {
-                        defines.REFLECTIONMAP_SKYBOX_TRANSFORMED = !reflectionTexture.getReflectionTextureMatrix().isIdentity();
-                    }
                 } else {
                     defines.REFLECTION = false;
                     defines.REFLECTIONMAP_3D = false;
@@ -1398,7 +1393,6 @@ export abstract class PBRBaseMaterial extends PushMaterial {
                     defines.USE_LOCAL_REFLECTIONMAP_CUBIC = false;
                     defines.REFLECTIONMAP_PROJECTION = false;
                     defines.REFLECTIONMAP_SKYBOX = false;
-                    defines.REFLECTIONMAP_SKYBOX_TRANSFORMED = false;
                     defines.REFLECTIONMAP_EXPLICIT = false;
                     defines.REFLECTIONMAP_EQUIRECTANGULAR = false;
                     defines.REFLECTIONMAP_EQUIRECTANGULAR_FIXED = false;

+ 0 - 2
src/Materials/standardMaterial.ts

@@ -96,7 +96,6 @@ export class StandardMaterialDefines extends MaterialDefines implements IImagePr
     public USE_LOCAL_REFLECTIONMAP_CUBIC = false;
     public REFLECTIONMAP_PROJECTION = false;
     public REFLECTIONMAP_SKYBOX = false;
-    public REFLECTIONMAP_SKYBOX_TRANSFORMED = false;
     public REFLECTIONMAP_EXPLICIT = false;
     public REFLECTIONMAP_EQUIRECTANGULAR = false;
     public REFLECTIONMAP_EQUIRECTANGULAR_FIXED = false;
@@ -864,7 +863,6 @@ export class StandardMaterial extends PushMaterial {
                                 break;
                             case Texture.SKYBOX_MODE:
                                 defines.setReflectionMode("REFLECTIONMAP_SKYBOX");
-                                defines.REFLECTIONMAP_SKYBOX_TRANSFORMED = !this._reflectionTexture.getReflectionTextureMatrix().isIdentity();
                                 break;
                             case Texture.SPHERICAL_MODE:
                                 defines.setReflectionMode("REFLECTIONMAP_SPHERICAL");

+ 1 - 5
src/Shaders/background.vertex.fx

@@ -53,11 +53,7 @@ varying vec3 vDirectionW;
 void main(void) {
 
 #ifdef REFLECTIONMAP_SKYBOX
-    #ifdef REFLECTIONMAP_SKYBOX_TRANSFORMED
-        vPositionUVW = (reflectionMatrix * vec4(position, 1.0)).xyz;
-    #else
-        vPositionUVW = position;
-    #endif
+    vPositionUVW = position;
 #endif 
 
 #include<instancesVertex>

+ 1 - 5
src/Shaders/default.vertex.fx

@@ -112,11 +112,7 @@ void main(void) {
 #include<morphTargetsVertex>[0..maxSimultaneousMorphTargets]
 
 #ifdef REFLECTIONMAP_SKYBOX
-	#ifdef REFLECTIONMAP_SKYBOX_TRANSFORMED
-		vPositionUVW = (reflectionMatrix * vec4(positionUpdated, 1.0)).xyz;
-	#else
-		vPositionUVW = positionUpdated;
-	#endif
+	vPositionUVW = positionUpdated;
 #endif 
 
 #define CUSTOM_VERTEX_UPDATE_POSITION

+ 1 - 5
src/Shaders/pbr.vertex.fx

@@ -153,11 +153,7 @@ void main(void) {
 #include<morphTargetsVertex>[0..maxSimultaneousMorphTargets]
 
 #ifdef REFLECTIONMAP_SKYBOX
-    #ifdef REFLECTIONMAP_SKYBOX_TRANSFORMED
-        vPositionUVW = (reflectionMatrix * vec4(positionUpdated, 1.0)).xyz;
-    #else
-        vPositionUVW = positionUpdated;
-    #endif
+    vPositionUVW = positionUpdated;
 #endif 
 
 #define CUSTOM_VERTEX_UPDATE_POSITION