Merge pull request #1135 from actnwit/fix/camera

fix: camera controller inner znear calculation
actnwit · Jun 14, 2022 · fa3a849 · fa3a849
2 parents aa7f687 + 59115f3
commit fa3a849
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/assets/gltf/glTF-Sample-Models b/assets/gltf/glTF-Sample-Models
diff --git a/src/foundation/cameras/AbstractCameraController.ts b/src/foundation/cameras/AbstractCameraController.ts
@@ -38,10 +38,10 @@ export abstract class AbstractCameraController {
         ) *
           eyeDirection.length());
 
-      camera.zNearInner = Math.min(
+      camera.zNearInner = Math.max(Math.min(
         lengthOfCenterToEye * cos - targetAABB.lengthCenterToCorner,
         this.zNearMax
-      );
+      ), 0.01);
     } else {
       camera.zNearInner = camera.zNear;
     }
+1 −1		.github/workflows/ci.yml
+ −		2.0/BoxTextured/glTF-Binary/BoxTextured.glb
+1 −1		2.0/BoxTextured/glTF-Embedded/BoxTextured.gltf
+ −		2.0/BoxTextured/glTF/CesiumLogoFlat.png
+0 −48		2.0/EmissiveStrengthTest/README.md
+ −		2.0/EmissiveStrengthTest/glTF-Binary/EmissiveStrengthTest.glb
+ −		2.0/EmissiveStrengthTest/glTF/EmissiveStrengthTest.bin
+0 −532		2.0/EmissiveStrengthTest/glTF/EmissiveStrengthTest.gltf
+ −		2.0/EmissiveStrengthTest/glTF/PlainGrid.png
+ −		2.0/EmissiveStrengthTest/screenshot/screenshot.jpg
+ −		2.0/EmissiveStrengthTest/screenshot/screenshot_large_bloom.jpg
+ −		2.0/EmissiveStrengthTest/screenshot/screenshot_large_plain.jpg
+ −		2.0/EmissiveStrengthTest/screenshot/test_fail.jpg
+1 −1		2.0/EnvironmentTest/README.md
+ −		2.0/EnvironmentTest/screenshot/screenshot.jpg
+ −		2.0/EnvironmentTest/screenshot/screenshot.png
+ −		2.0/Fox/glTF-Binary/Fox.glb
+1,777 −0		2.0/Fox/glTF-Embedded/Fox.gltf
+ −		2.0/Fox/glTF/Fox.bin
+11 −11		2.0/Fox/glTF/Fox.gltf
+0 −17		2.0/IridescenceDielectricSpheres/README.md
+ −		2.0/IridescenceDielectricSpheres/glTF/IridescenceDielectricSpheres.bin
+0 −33,223		2.0/IridescenceDielectricSpheres/glTF/IridescenceDielectricSpheres.gltf
+ −		2.0/IridescenceDielectricSpheres/glTF/textures/guides.png
+ −		2.0/IridescenceDielectricSpheres/screenshot/screenshot.jpg
+ −		2.0/IridescenceDielectricSpheres/screenshot/screenshot_large.jpg
+0 −46		2.0/IridescenceLamp/README.md
+ −		2.0/IridescenceLamp/glTF-Binary/IridescenceLamp.glb
+ −		2.0/IridescenceLamp/glTF/IridescenceLamp.bin
+0 −338		2.0/IridescenceLamp/glTF/IridescenceLamp.gltf
+ −		2.0/IridescenceLamp/glTF/IridescenceLamp_BaseColor.png
+ −		2.0/IridescenceLamp/glTF/IridescenceLamp_Iridescence.png
+ −		2.0/IridescenceLamp/glTF/IridescenceLamp_OcclusionRoughnessMetalness.png
+ −		2.0/IridescenceLamp/screenshot/reference_Photos.jpg
+ −		2.0/IridescenceLamp/screenshot/screenshot.jpg
+ −		2.0/IridescenceLamp/screenshot/screenshot_Large.jpg
+ −		2.0/IridescenceLamp/screenshot/textures.jpg
+0 −17		2.0/IridescenceMetallicSpheres/README.md
+ −		2.0/IridescenceMetallicSpheres/glTF/IridescenceMetallicSpheres.bin
+0 −32,194		2.0/IridescenceMetallicSpheres/glTF/IridescenceMetallicSpheres.gltf
+ −		2.0/IridescenceMetallicSpheres/glTF/textures/guides.png
+ −		2.0/IridescenceMetallicSpheres/screenshot/screenshot.jpg
+ −		2.0/IridescenceMetallicSpheres/screenshot/screenshot_large.jpg
+0 −17		2.0/IridescenceSuzanne/README.md
+ −		2.0/IridescenceSuzanne/glTF-Binary/IridescenceSuzanne.glb
+ −		2.0/IridescenceSuzanne/glTF/IridescenceSuzanne.bin
+0 −308		2.0/IridescenceSuzanne/glTF/IridescenceSuzanne.gltf
+ −		2.0/IridescenceSuzanne/glTF/noise.png
+ −		2.0/IridescenceSuzanne/screenshot/screenshot.jpg
+ −		2.0/IridescenceSuzanne/screenshot/screenshot_large.jpg
+0 −30		2.0/LightsPunctualLamp/README.md
+ −		2.0/LightsPunctualLamp/glTF-Binary/LightsPunctualLamp.glb
+ −		2.0/LightsPunctualLamp/glTF/LightsPunctualLamp.data.bin
+0 −731		2.0/LightsPunctualLamp/glTF/LightsPunctualLamp.gltf
+ −		2.0/LightsPunctualLamp/glTF/material0_basecolor.jpeg
+ −		2.0/LightsPunctualLamp/glTF/material0_emissive.jpeg
+ −		2.0/LightsPunctualLamp/glTF/material0_metallic_roughness.jpeg
+ −		2.0/LightsPunctualLamp/glTF/material0_normal.png
+ −		2.0/LightsPunctualLamp/glTF/material1_basecolor.png
+ −		2.0/LightsPunctualLamp/glTF/material1_normal.png
+ −		2.0/LightsPunctualLamp/glTF/material2_transmission.jpeg
+ −		2.0/LightsPunctualLamp/screenshot/lamp_white_bg.png
+ −		2.0/LightsPunctualLamp/screenshot/lights_on_off.gif
+ −		2.0/LightsPunctualLamp/screenshot/screenshot.png
+ −		2.0/LightsPunctualLamp/screenshot/shade_details.gif
+10 −17		2.0/README.md
+0 −19		2.0/Unicode❤♻Test/README.md
+ −		2.0/Unicode❤♻Test/glTF-Binary/Unicode❤♻Test.glb
+ −		2.0/Unicode❤♻Test/glTF/Unicode❤♻Binary.bin
+0 −131		2.0/Unicode❤♻Test/glTF/Unicode❤♻Test.gltf
+ −		2.0/Unicode❤♻Test/glTF/Unicode❤♻Texture.png
+ −		2.0/Unicode❤♻Test/screenshot/screenshot.png
+0 −47		2.0/glTF_RGB_June16.svg
+3 −56		2.0/model-index.json
+3 −3		README.md
+ −		sourceModels/EmissiveStrengthTest/EmissiveStrengthTest.blend
+ −		sourceModels/EmissiveStrengthTest/PlainGrid.png