Fix view dir in ortho projection (#1962)

* fix: view dir in ortho projection
galacean · Jan 12, 2024 · e1a511c · e1a511c
1 parent 2e8b172
commit e1a511c
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 6 deletions.
diff --git a/packages/core/src/Camera.ts b/packages/core/src/Camera.ts
@@ -221,6 +221,12 @@ export class Camera extends Component {
   set isOrthographic(value: boolean) {
     this._virtualCamera.isOrthographic = value;
     this._projectionMatrixChange();
+
+    if (value) {
+      this.shaderData.enableMacro("CAMERA_ORTHOGRAPHIC");
+    } else {
+      this.shaderData.disableMacro("CAMERA_ORTHOGRAPHIC");
+    }
   }
 
   /**

diff --git a/packages/core/src/shaderlib/begin_viewdir_frag.glsl b/packages/core/src/shaderlib/begin_viewdir_frag.glsl
@@ -1,3 +1,7 @@
-#ifdef MATERIAL_NEED_WORLD_POS
-    vec3 V =  normalize( camera_Position - v_pos );
-#endif
+#ifdef CAMERA_ORTHOGRAPHIC
+    vec3 V = -camera_Forward;
+#else
+    #ifdef MATERIAL_NEED_WORLD_POS
+        vec3 V =  normalize( camera_Position - v_pos );
+    #endif
+#endif
diff --git a/packages/core/src/shaderlib/camera_declare.glsl b/packages/core/src/shaderlib/camera_declare.glsl
@@ -1 +1,2 @@
-uniform vec3 camera_Position;
+uniform vec3 camera_Position;
+uniform vec3 camera_Forward; 
diff --git a/packages/core/src/shaderlib/pbr/pbr_helper.glsl b/packages/core/src/shaderlib/pbr/pbr_helper.glsl
@@ -33,8 +33,11 @@ float getAARoughnessFactor(vec3 normal) {
 
 void initGeometry(out Geometry geometry, bool isFrontFacing){
     geometry.position = v_pos;
-    geometry.viewDir =  normalize(camera_Position - v_pos);
-
+    #ifdef CAMERA_ORTHOGRAPHIC
+        geometry.viewDir =  -camera_Forward;
+    #else
+        geometry.viewDir =  normalize(camera_Position - v_pos);
+    #endif
     #if defined(MATERIAL_HAS_NORMALTEXTURE) || defined(MATERIAL_HAS_CLEAR_COAT_NORMAL_TEXTURE) || defined(MATERIAL_ENABLE_ANISOTROPY)
         mat3 tbn = getTBN(isFrontFacing);
     #endif