fix(sample): remove errors (Orillusion#110)

remove errors
garNUE · May 7, 2023 · e47e027 · e47e027
1 parent 34ba5d9
commit e47e027
Show file tree

Hide file tree

Showing 27 changed files with 90 additions and 343 deletions.
diff --git a/samples/base/Sample_InitEngine.ts b/samples/base/Sample_InitEngine.ts
@@ -1,4 +1,4 @@
-import { Engine3D, Scene3D, CameraUtil, webGPUContext, View3D, AtmosphericComponent } from "@orillusion/core";
+import { Engine3D, Scene3D, CameraUtil, View3D, AtmosphericComponent } from "@orillusion/core";
 
 // init engine
 class Sample_InitEngine {
@@ -12,7 +12,7 @@ class Sample_InitEngine {
 
         // init camera3D
         let mainCamera = CameraUtil.createCamera3D(null, scene);
-        mainCamera.perspective(60, webGPUContext.aspect, 1, 2000.0);
+        mainCamera.perspective(60, Engine3D.aspect, 1, 2000.0);
 
         // create a view with target scene and camera
         let view = new View3D();

diff --git a/samples/base/Sample_Transform.ts b/samples/base/Sample_Transform.ts
@@ -1,6 +1,6 @@
 import { GUIHelp } from '@orillusion/debug/GUIHelp';
 import { Stats } from '@orillusion/stats'
-import { Engine3D, Scene3D, AtmosphericComponent, CameraUtil, webGPUContext, HoverCameraController, Object3D, MeshRenderer, BoxGeometry, LitMaterial, DirectLight, KelvinUtil, View3D } from '@orillusion/core';
+import { Engine3D, Scene3D, AtmosphericComponent, CameraUtil, HoverCameraController, Object3D, MeshRenderer, BoxGeometry, LitMaterial, DirectLight, KelvinUtil, View3D } from '@orillusion/core';
 import { GUIUtil } from '@samples/utils/GUIUtil';
 
 // simple base demo
@@ -20,11 +20,11 @@ class Sample_Transform {
 
         // init camera3D
         let mainCamera = CameraUtil.createCamera3D(null, scene);
-        mainCamera.perspective(60, webGPUContext.aspect, 1, 2000.0);
+        mainCamera.perspective(60, Engine3D.aspect, 1, 2000.0);
 
         // add a basic camera controller
         let hoverCameraController = mainCamera.object3D.addComponent(HoverCameraController);
-        hoverCameraController.setCamera(15, -15, 300);
+        hoverCameraController.setCamera(15, -15, 10);
 
         // create a basic cube
         let cubeObj = new Object3D();

diff --git a/samples/base/Sample_UseComponent.ts b/samples/base/Sample_UseComponent.ts
@@ -1,4 +1,4 @@
-import { Engine3D, Scene3D, CameraUtil, webGPUContext, View3D, AtmosphericComponent, ComponentBase, Time, AxisObject, Object3DUtil, KelvinUtil, DirectLight, Object3D, HoverCameraController } from "@orillusion/core";
+import { Engine3D, Scene3D, CameraUtil, View3D, AtmosphericComponent, ComponentBase, Time, AxisObject, Object3DUtil, KelvinUtil, DirectLight, Object3D, HoverCameraController } from "@orillusion/core";
 import { GUIHelp } from "@orillusion/debug/GUIHelp";
 
 // sample use component
@@ -13,7 +13,7 @@ class Sample_UseComponent {
 
         // init camera3D
         let mainCamera = CameraUtil.createCamera3D(null, scene);
-        mainCamera.perspective(60, webGPUContext.aspect, 1, 2000.0);
+        mainCamera.perspective(60, Engine3D.aspect, 1, 2000.0);
         let hoverCameraController = mainCamera.object3D.addComponent(HoverCameraController);
         hoverCameraController.setCamera(15, -30, 10);
 

diff --git a/samples/lights/Sample_DirectLight.ts b/samples/lights/Sample_DirectLight.ts
@@ -1,5 +1,5 @@
 import { GUIHelp } from "@orillusion/debug/GUIHelp";
-import { Scene3D, HoverCameraController, Engine3D, AtmosphericComponent, Object3D, Camera3D, webGPUContext, Vector3, View3D, DirectLight, KelvinUtil, LitMaterial, MeshRenderer, BoxGeometry, CameraUtil } from "@orillusion/core";
+import { Scene3D, HoverCameraController, Engine3D, AtmosphericComponent, Object3D, Camera3D, Vector3, View3D, DirectLight, KelvinUtil, LitMaterial, MeshRenderer, BoxGeometry, CameraUtil } from "@orillusion/core";
 
 //sample of direction light
 class Sample_DirectLight {
@@ -16,7 +16,7 @@ class Sample_DirectLight {
 
         // init camera3D
         let mainCamera = CameraUtil.createCamera3D(null, this.scene);
-        mainCamera.perspective(60, webGPUContext.aspect, 1, 2000.0);
+        mainCamera.perspective(60, Engine3D.aspect, 1, 2000.0);
         //set camera data
         mainCamera.object3D.addComponent(HoverCameraController).setCamera(0, -25, 1000);
 

diff --git a/samples/lights/Sample_PointLight.ts b/samples/lights/Sample_PointLight.ts
@@ -1,5 +1,5 @@
 import { GUIHelp } from "@orillusion/debug/GUIHelp";
-import { AtmosphericComponent, BoxGeometry, CameraUtil, Engine3D, HoverCameraController, LitMaterial, MeshRenderer, Object3D, Object3DUtil, PointLight, Scene3D, SphereGeometry, View3D, webGPUContext, } from "@orillusion/core";
+import { AtmosphericComponent, BoxGeometry, CameraUtil, Engine3D, HoverCameraController, LitMaterial, MeshRenderer, Object3D, Object3DUtil, PointLight, Scene3D, SphereGeometry, View3D, } from "@orillusion/core";
 import { PointLightsScript } from "./PointLightsScript";
 
 class Sample_PointLight {
@@ -18,7 +18,7 @@ class Sample_PointLight {
         this.scene.addComponent(AtmosphericComponent);
         // init camera3D
         let mainCamera = CameraUtil.createCamera3D(null, this.scene);
-        mainCamera.perspective(60, webGPUContext.aspect, 1, 2000.0);
+        mainCamera.perspective(60, Engine3D.aspect, 1, 2000.0);
         //set camera data
         mainCamera.object3D.addComponent(HoverCameraController).setCamera(0, -25, 500);
 

diff --git a/samples/lights/Sample_PointLightShadow.ts b/samples/lights/Sample_PointLightShadow.ts
@@ -1,5 +1,5 @@
 import { GUIHelp } from "@orillusion/debug/GUIHelp";
-import { Scene3D, Engine3D, AtmosphericComponent, CameraUtil, webGPUContext, HoverCameraController, Vector3, View3D, SphereGeometry, Object3D, MeshRenderer, LitMaterial, PointLight, BoxGeometry, Object3DUtil } from "@orillusion/core";
+import { Scene3D, Engine3D, AtmosphericComponent, CameraUtil, HoverCameraController, Vector3, View3D, SphereGeometry, Object3D, MeshRenderer, LitMaterial, PointLight, BoxGeometry, Object3DUtil } from "@orillusion/core";
 
 // sample of point light shadow
 class Sample_PointLightShadow {
@@ -19,7 +19,7 @@ class Sample_PointLightShadow {
 
         // init camera3D
         let mainCamera = CameraUtil.createCamera3D(null, this.scene);
-        mainCamera.perspective(60, webGPUContext.aspect, 1, 2000.0);
+        mainCamera.perspective(60, Engine3D.aspect, 1, 2000.0);
         //set camera data
         mainCamera.object3D.addComponent(HoverCameraController).setCamera(0, -45, 500);
 

diff --git a/samples/lights/Sample_SpotLight.ts b/samples/lights/Sample_SpotLight.ts
@@ -1,4 +1,4 @@
-import { Scene3D, Engine3D, AtmosphericComponent, CameraUtil, webGPUContext, HoverCameraController, View3D, SphereGeometry, Object3D, MeshRenderer, LitMaterial, SpotLight, BoxGeometry, Vector3 } from "@orillusion/core";
+import { Scene3D, Engine3D, AtmosphericComponent, CameraUtil, HoverCameraController, View3D, SphereGeometry, Object3D, MeshRenderer, LitMaterial, SpotLight, BoxGeometry, Vector3 } from "@orillusion/core";
 import { GUIHelp } from "@orillusion/debug/GUIHelp";
 
 // sample of SpotLight
@@ -8,7 +8,7 @@ class Sample_SpotLight {
     async run() {
         Engine3D.setting.occlusionQuery.enable = false;
         Engine3D.setting.shadow.enable = true;
-        Engine3D.setting.shadow.pointShadowBias = 0.075;
+        Engine3D.setting.shadow.pointShadowBias = 0.0001;
         await Engine3D.init({});
 
         GUIHelp.init();
@@ -18,7 +18,7 @@ class Sample_SpotLight {
 
         // init camera3D
         let mainCamera = CameraUtil.createCamera3D(null, this.scene);
-        mainCamera.perspective(60, webGPUContext.aspect, 1, 2000.0);
+        mainCamera.perspective(60, Engine3D.aspect, 1, 2000.0);
         //set camera data
         mainCamera.object3D.addComponent(HoverCameraController).setCamera(0, -25, 1000);
 
@@ -46,8 +46,8 @@ class Sample_SpotLight {
 
         let spotLight = lightObj3D.addComponent(SpotLight);
         lightObj3D.x = -86;
-        lightObj3D.y = 130;
-        lightObj3D.z = -395;
+        lightObj3D.y = 200;
+        lightObj3D.z = -300;
         lightObj3D.transform.rotationX = 342;
         lightObj3D.transform.rotationY = 360;
         lightObj3D.transform.rotationZ = 199;

diff --git a/samples/loader/Sample_FlightHelmet.ts b/samples/loader/Sample_FlightHelmet.ts
@@ -1,5 +1,5 @@
 import { GUIHelp } from "@orillusion/debug/GUIHelp";
-import { Object3D, Camera3D, Scene3D, HoverCameraController, Engine3D, CameraUtil, webGPUContext, View3D, SSRPost, HDRBloomPost, AtmosphericComponent, DirectLight, KelvinUtil, Time } from "@orillusion/core";
+import { Object3D, Camera3D, Scene3D, HoverCameraController, Engine3D, CameraUtil, View3D, SSRPost, HDRBloomPost, AtmosphericComponent, DirectLight, KelvinUtil, Time } from "@orillusion/core";
 import { GUIUtil as GUIUtil } from "@samples/utils/GUIUtil";
 
 class Sample_FlightHelmet {
@@ -18,16 +18,11 @@ class Sample_FlightHelmet {
             renderLoop: () => this.loop(),
         });
 
-        Engine3D.setting.material.materialChannelDebug = true;
-        Engine3D.setting.shadow.debug = true;
         Engine3D.setting.shadow.autoUpdate = true;
         Engine3D.setting.shadow.shadowBound = 10;
-        Engine3D.setting.shadow.shadowBias = 0.00001;
-
+        Engine3D.setting.shadow.shadowBias = 0.0001;
         Engine3D.setting.render.postProcessing.ssao.radius = 0.018;
         Engine3D.setting.render.postProcessing.ssao.aoPower = 1;
-        Engine3D.setting.render.postProcessing.gtao.debug = false;
-
         Engine3D.setting.render.postProcessing.bloom = {
             enable: true,
             blurX: 4,
@@ -39,9 +34,8 @@ class Sample_FlightHelmet {
 
 
         this.scene = new Scene3D();
-        this.scene.hideSky();
         let camera = CameraUtil.createCamera3DObject(this.scene);
-        camera.perspective(60, webGPUContext.aspect, 1, 5000.0);
+        camera.perspective(60, Engine3D.aspect, 1, 5000.0);
 
         camera.object3D.addComponent(HoverCameraController).setCamera(-45, -30, 15);
 
@@ -67,6 +61,7 @@ class Sample_FlightHelmet {
             let atmospheric = this.scene.addComponent(AtmosphericComponent);
             atmospheric.sunY = 0.73;
             atmospheric.sunRadiance = 47;
+            atmospheric.enable = false
         }
         /******** light *******/
         {

diff --git a/samples/loader/Sample_LoadGLTF.ts b/samples/loader/Sample_LoadGLTF.ts
@@ -1,5 +1,5 @@
 import { GUIHelp } from "@orillusion/debug/GUIHelp";
-import { Object3D, Scene3D, Engine3D, CameraUtil, webGPUContext, HoverCameraController, View3D, AtmosphericComponent, DirectLight, KelvinUtil } from "@orillusion/core";
+import { Object3D, Scene3D, Engine3D, CameraUtil, HoverCameraController, View3D, AtmosphericComponent, DirectLight, KelvinUtil } from "@orillusion/core";
 import { GUIUtil } from "@samples/utils/GUIUtil";
 
 //Samples to show models, they are using PBR material
@@ -10,14 +10,14 @@ class Sample_LoadGLTF {
         //config settings
         Engine3D.setting.material.materialChannelDebug = true;
         Engine3D.setting.shadow.shadowBound = 5;
-        Engine3D.setting.shadow.shadowBias = 0.002;
+        Engine3D.setting.shadow.shadowBias = 0.0001;
         Engine3D.setting.render.postProcessing.bloom = {
             enable: true,
             blurX: 4,
             blurY: 4,
             intensity: 5,
             brightness: 0.86,
-            debug: true
+            debug: false
         };
 
         //init engine
@@ -26,7 +26,7 @@ class Sample_LoadGLTF {
         this.scene = new Scene3D();
 
         let camera = CameraUtil.createCamera3DObject(this.scene);
-        camera.perspective(60, webGPUContext.aspect, 0.01, 5000.0);
+        camera.perspective(60, Engine3D.aspect, 0.01, 5000.0);
         camera.object3D.addComponent(HoverCameraController).setCamera(25, -5, 100);
 
         let view = new View3D();
@@ -44,8 +44,8 @@ class Sample_LoadGLTF {
             let atmospheric = this.scene.addComponent(AtmosphericComponent);
             atmospheric.sunY = 0.62;
             atmospheric.sunRadiance = 47;
-            this.scene.exposure = 1;
-            this.scene.roughness = 0.56;
+            atmospheric.exposure = 1;
+            atmospheric.roughness = 0.56;
         }
 
         /******** light *******/
@@ -67,34 +67,33 @@ class Sample_LoadGLTF {
             /******** player1 *******/
             let player1 = (await Engine3D.res.loadGltf('gltfs/anim/Minion_Lane_Super_Dawn/Minion_Lane_Super_Dawn.glb', {})) as Object3D;
             player1.transform.x = -10;
+            player1.transform.y = -10;
             player1.transform.z = 20;
             player1.transform.scaleX = 10;
             player1.transform.scaleY = 10;
             player1.transform.scaleZ = 10;
-            player1.transform.y = 5;
             this.scene.addChild(player1);
 
             /******** player2 *******/
             let player2 = (await Engine3D.res.loadGltf('gltfs/anim/Minion_Lane_Super_Dawn/Prime_Helix.glb', {})) as Object3D;
             player2.transform.x = 10;
+            player2.transform.y = -10;
             player2.transform.scaleX = 10;
             player2.transform.scaleY = 10;
             player2.transform.scaleZ = 10;
-            player2.transform.y = 5;
             this.scene.addChild(player2);
 
             /******** player3 *******/
             let player3 = (await Engine3D.res.loadGltf('gltfs/anim/Minion_Lane_Super_Dawn/Minion_Lane_Ranged_Dusk.glb', {})) as Object3D;
             player3.transform.x = 10;
+            player3.transform.y = -10;
             player3.transform.z = 20;
             player3.transform.scaleX = 10;
             player3.transform.scaleY = 10;
             player3.transform.scaleZ = 10;
-            player3.transform.y = 5;
             this.scene.addChild(player3);
         }
     }
-
 }
 
 new Sample_LoadGLTF().run();
diff --git a/samples/material/Sample_CustomMaterial.ts b/samples/material/Sample_CustomMaterial.ts
diff --git a/samples/material/Sample_PBR.ts b/samples/material/Sample_PBR.ts
@@ -1,5 +1,5 @@
 import { GUIHelp } from "@orillusion/debug/GUIHelp";
-import { Object3D, Scene3D, Engine3D, AtmosphericComponent, CameraUtil, webGPUContext, HoverCameraController, View3D, DirectLight, KelvinUtil, LitMaterial, MeshRenderer, BoxGeometry, SphereGeometry } from "@orillusion/core";
+import { Object3D, Scene3D, Engine3D, AtmosphericComponent, CameraUtil, HoverCameraController, View3D, DirectLight, KelvinUtil, LitMaterial, MeshRenderer, BoxGeometry, SphereGeometry } from "@orillusion/core";
 import { GUIUtil } from "@samples/utils/GUIUtil";
 
 class Sample_PBR {
@@ -19,7 +19,7 @@ class Sample_PBR {
         this.scene = new Scene3D();
         this.scene.addComponent(AtmosphericComponent);
         let camera = CameraUtil.createCamera3DObject(this.scene);
-        camera.perspective(60, webGPUContext.aspect, 1, 5000.0);
+        camera.perspective(60, Engine3D.aspect, 1, 5000.0);
 
         camera.object3D.addComponent(HoverCameraController).setCamera(30, 0, 120);