fix(UniformNode): Fix error of Uniform data(number) (#276)

Fix error of Uniform data(number)
Orillusion · Aug 9, 2023 · 09266a6 · 09266a6
1 parent e00b1b4
commit 09266a6
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 12 deletions.
diff --git a/public b/public
diff --git a/samples/gi/Sample_GI.ts b/samples/gi/Sample_GI.ts
@@ -44,7 +44,14 @@ class Sample_GI {
             strength: 1.2
         };
 
-        await Engine3D.init({});
+        await Engine3D.init({
+            renderLoop: () => {
+                if (this.giComponent?.isStart) {
+                    GUIUtil.renderGIComponent(this.giComponent);
+                    this.giComponent = null;
+                }
+            }
+        });
         GUIHelp.init();
         let param = createSceneParam();
         param.camera.distance = 200;
@@ -65,13 +72,12 @@ class Sample_GI {
 
     }
 
+    private giComponent: GlobalIlluminationComponent;
+
     private addGIProbes() {
         let probeObj = new Object3D();
-        let component = probeObj.addComponent(GlobalIlluminationComponent);
+        this.giComponent = probeObj.addComponent(GlobalIlluminationComponent);
         this.scene.addChild(probeObj);
-        setTimeout(() => {
-            GUIUtil.renderGIComponent(component);
-        }, 2000);
     }
 
     async initScene() {

diff --git a/samples/gi/Sample_GICornellBox.ts b/samples/gi/Sample_GICornellBox.ts
@@ -48,7 +48,14 @@ class Sample_GICornellBox {
             strength: 1.2
         };
 
-        await Engine3D.init({});
+        await Engine3D.init({
+            renderLoop: () => {
+                if (this.giComponent?.isStart) {
+                    GUIUtil.renderGIComponent(this.giComponent);
+                    this.giComponent = null;
+                }
+            }
+        });
         let param = createSceneParam();
         param.camera.distance = 40;
 
@@ -65,14 +72,12 @@ class Sample_GICornellBox {
         await this.initScene();
     }
 
+    private giComponent: GlobalIlluminationComponent;
     private addGIProbes() {
         let probeObj = new Object3D();
         GUIHelp.init();
-        let component = probeObj.addComponent(GlobalIlluminationComponent);
+        this.giComponent = probeObj.addComponent(GlobalIlluminationComponent);
         this.scene.addChild(probeObj);
-        setTimeout(() => {
-            GUIUtil.renderGIComponent(component);
-        }, 2000);
     }
 
     async initScene() {

diff --git a/src/components/ComponentBase.ts b/src/components/ComponentBase.ts
@@ -36,6 +36,9 @@ export class ComponentBase implements IComponent {
 
     private __isStart: boolean = false;
 
+    public get isStart(): boolean {
+        return this.__isStart;
+    }
 
     /**
      * Return the Transform component attached to the Object3D.

diff --git a/src/gfx/graphics/webGpu/core/uniforms/UniformNode.ts b/src/gfx/graphics/webGpu/core/uniforms/UniformNode.ts
@@ -63,7 +63,8 @@ export class UniformNode {
             this._type = UniformType.Float32Array;
         } else {
             this.size = 1;
-            this._x = value.x;
+            this._x = value;
+            this._data = value;
             this._type = UniformType.Number;
         }
     }