Merge pull request #865 from actnwit/feat/math

Feat: Vector4 classes improvement
actnwit · Sep 28, 2021 · 51d9b91 · 51d9b91
2 parents 7ae15c0 + 1ddd38f
commit 51d9b91
Show file tree

Hide file tree

Showing 69 changed files with 691 additions and 399 deletions.
diff --git a/samples/simple/Gltf2ImporterShadow/main.ts b/samples/simple/Gltf2ImporterShadow/main.ts
@@ -179,11 +179,11 @@ declare const Rn: typeof _Rn;
     );
     material.setParameter(
       Rn.ShaderSemantics.DiffuseColorFactor,
-      new Rn.Vector4(0.0, 0.0, 0.0, 0.0)
+      Rn.Vector4.fromCopyArray([0.0, 0.0, 0.0, 0.0])
     );
     material.setParameter(
       Rn.ShadowMapDecodeClassicSingleMaterialNode.ShadowColorFactor,
-      new Rn.Vector4(0.0, 0.0, 0.0, 0.5)
+      Rn.Vector4.fromCopyArray([0.0, 0.0, 0.0, 0.5])
     );
     material.alphaMode = Rn.AlphaMode.Translucent;
 

diff --git a/samples/simple/NodeEditor/main.ts b/samples/simple/NodeEditor/main.ts
@@ -9,12 +9,18 @@ declare const Rn: typeof _Rn;
     Rn.CompositionType.Vec4,
     Rn.ComponentType.Float
   );
-  constant1.setDefaultInputValue('value', new Rn.Vector4(1, 2, 3, 4));
+  constant1.setDefaultInputValue(
+    'value',
+    Rn.Vector4.fromCopyArray([1, 2, 3, 4])
+  );
   const constant2 = new Rn.ConstantVariableShaderNode(
     Rn.CompositionType.Vec4,
     Rn.ComponentType.Float
   );
-  constant2.setDefaultInputValue('value', new Rn.Vector4(4, 3, 2, 1));
+  constant2.setDefaultInputValue(
+    'value',
+    Rn.Vector4.fromCopyArray([4, 3, 2, 1])
+  );
 
   const addShaderNode = new Rn.AddShaderNode(
     Rn.CompositionType.Vec4,

diff --git a/samples/simple/ShadowMapping/main.ts b/samples/simple/ShadowMapping/main.ts
@@ -17,10 +17,10 @@ declare const Rn: typeof _Rn;
 
   const resolutionDepthCamera = 512;
 
-  const diffuseColorFactorSmallBoard = new Rn.Vector4(0.5, 0.1, 0.4, 1);
-  const diffuseColorFactorLargeBoard = new Rn.Vector4(0.1, 0.7, 0.5, 1);
+  const diffuseColorFactorSmallBoard = Rn.Vector4.fromCopyArray([0.5, 0.1, 0.4, 1]);
+  const diffuseColorFactorLargeBoard = Rn.Vector4.fromCopyArray([0.1, 0.7, 0.5, 1]);
 
-  const shadowColorFactorLargeBoard = new Rn.Vector4(0.05, 0.35, 0.25, 1);
+  const shadowColorFactorLargeBoard = Rn.Vector4.fromCopyArray([0.05, 0.35, 0.25, 1]);
 
   // ---main algorithm-----------------------------------------------------------------------------------------
 

diff --git a/samples/simple/SkinShader/main.ts b/samples/simple/SkinShader/main.ts
@@ -19,7 +19,7 @@ const setupRenderPassEntityUidOutput = function (rootGroup: Entity, cameraCompon
 
   const framebuffer = Rn.RenderableHelper.createTexturesForRenderTarget(canvas.clientWidth, canvas.clientHeight, 1, {});
   renderPass.setFramebuffer(framebuffer);
-  renderPass.clearColor = new Rn.Vector4(0, 0, 0, 1);
+  renderPass.clearColor = Rn.Vector4.fromCopyArray([0, 0, 0, 1]);
   renderPass.toClearColorBuffer = true;
   renderPass.toClearDepthBuffer = true;
 

diff --git a/samples/simple/VideoTexture/index.html b/samples/simple/VideoTexture/index.html
@@ -26,6 +26,7 @@ <h2>Rendering Test Image</h2>
       <canvas id="world" width="600" height="600"></canvas>
       <div>
         <button onclick="window.isAnimating = true;">Animate</button>
+        <button onclick="exportGltf2();">Export as glTF2</button>
       </div>
     </section>
     <section class="correct">

diff --git a/samples/simple/VideoTexture/main.ts b/samples/simple/VideoTexture/main.ts
@@ -113,3 +113,8 @@ declare const Rn: typeof _Rn;
 
   draw();
 })();
+
+window.exportGltf2 = function () {
+  const exporter = Rn.Gltf2Exporter.getInstance();
+  exporter.export('Rhodonite');
+};
diff --git a/samples/test_e2e/ColorGradingUsingLUTs/main.ts b/samples/test_e2e/ColorGradingUsingLUTs/main.ts
@@ -79,15 +79,15 @@ declare const Rn: typeof _Rn;
     renderPass.cameraComponent = cameraComponent;
 
     const entitySmallBoard = createEntityColoredBoard(
-      new Rn.Vector4(0.5, 0.1, 0.4, 1)
+      Rn.Vector4.fromCopyArray([0.5, 0.1, 0.4, 1])
     );
     const transformSmallBoard = entitySmallBoard.getTransform();
     transformSmallBoard.scale = new Rn.Vector3(0.2, 0.2, 0.2);
     transformSmallBoard.translate = new Rn.Vector3(0.0, 0.0, -1.0);
     transformSmallBoard.rotate = new Rn.Vector3(Math.PI / 2, 0, 0);
 
     const entityLargeBoard = createEntityColoredBoard(
-      new Rn.Vector4(0.1, 0.7, 0.5, 1)
+      Rn.Vector4.fromCopyArray([0.1, 0.7, 0.5, 1])
     );
     const transformLargeBoard = entityLargeBoard.getTransform();
     transformLargeBoard.translate = new Rn.Vector3(15, 30, -1.5);

diff --git a/samples/test_e2e/GaussianBlur/main.ts b/samples/test_e2e/GaussianBlur/main.ts
@@ -95,15 +95,15 @@ declare const Rn: typeof _Rn;
     renderPass.cameraComponent = cameraComponent;
 
     const entitySmallBoard = createEntityColoredBoard(
-      new Rn.Vector4(0.5, 0.1, 0.4, 1)
+      Rn.Vector4.fromCopyArray([0.5, 0.1, 0.4, 1])
     );
     const transformSmallBoard = entitySmallBoard.getTransform();
     transformSmallBoard.scale = new Rn.Vector3(0.2, 0.2, 0.2);
     transformSmallBoard.translate = new Rn.Vector3(0.0, 0.0, -1.0);
     transformSmallBoard.rotate = new Rn.Vector3(Math.PI / 2, 0, 0);
 
     const entityLargeBoard = createEntityColoredBoard(
-      new Rn.Vector4(0.1, 0.7, 0.5, 1)
+      Rn.Vector4.fromCopyArray([0.1, 0.7, 0.5, 1])
     );
     const transformLargeBoard = entityLargeBoard.getTransform();
     transformLargeBoard.translate = new Rn.Vector3(15, 30, -1.5);

diff --git a/samples/test_e2e/Gltf2Importer-GlareEffect/main.ts b/samples/test_e2e/Gltf2Importer-GlareEffect/main.ts
@@ -62,7 +62,7 @@ declare const Rn: typeof _Rn;
   createAndSetFramebuffer(renderPassHDR, rnCanvasElement.width, 1, {
     type: Rn.ComponentType.HalfFloat,
   });
-  renderPassHDR.clearColor = new Rn.Vector4(0.0, 0.0, 0.0, 1.0);
+  renderPassHDR.clearColor = Rn.Vector4.fromCopyArray([0.0, 0.0, 0.0, 1.0]);
 
   const materialHighLuminance = Rn.MaterialHelper.createDetectHighLuminanceMaterial(
     {maxInstancesNumber: 1},
@@ -335,7 +335,7 @@ declare const Rn: typeof _Rn;
 
         // need to draw the full viewport size
         renderPassBlurH.setViewport(
-          new Rn.Vector4(0, 0, resolutionBlur, resolutionBlur)
+          Rn.Vector4.fromCopyArray([0, 0, resolutionBlur, resolutionBlur])
         );
       }
       renderPassBlurH.cameraComponent = cameraComponentPostEffect;
@@ -480,7 +480,7 @@ declare const Rn: typeof _Rn;
   ) {
     const renderPass = new Rn.RenderPass();
     renderPass.toClearColorBuffer = true;
-    renderPass.clearColor = new Rn.Vector4(1.0, 1.0, 1.0, 1.0);
+    renderPass.clearColor = Rn.Vector4.fromCopyArray([1.0, 1.0, 1.0, 1.0]);
     renderPass.cameraComponent = cameraComponent;
     renderPass.addEntities([entityGlareTarget]);
     renderPass.setMaterial(material);

diff --git a/samples/test_e2e/GltfImporter-draco-extension/index.html b/samples/test_e2e/GltfImporter-draco-extension/index.html
@@ -29,6 +29,7 @@ <h2>Rendering Test Image</h2>
       <canvas id="world" width="600" height="600"></canvas>
       <div>
         <button onclick="window.isAnimating = true;">Animate</button>
+        <button onclick="exportGltf2();">Export as glTF2</button>
       </div>
     </section>
     <section class="correct">

diff --git a/samples/test_e2e/GltfImporter-draco-extension/main.ts b/samples/test_e2e/GltfImporter-draco-extension/main.ts
@@ -1,5 +1,6 @@
 import _Rn, {CameraComponent, Material} from '../../../dist/esm/index';
 
+declare const window: any;
 declare const Rn: typeof _Rn;
 const p = document.createElement('p');
 document.body.appendChild(p);
@@ -183,3 +184,8 @@ function setTextureParameterForMeshComponents(
     }
   }
 }
+
+window.exportGltf2 = function () {
+  const exporter = Rn.Gltf2Exporter.getInstance();
+  exporter.export('Rhodonite');
+};
diff --git a/samples/test_e2e/GltfImporter-ibl-1/index.html b/samples/test_e2e/GltfImporter-ibl-1/index.html
@@ -27,6 +27,10 @@ <h1 class="header-title">Rhodonite E2E Test - GltfImporter-ibl-1</h1>
     <section class="test">
       <h2>Rendering Test Image</h2>
       <canvas id="world" width="600" height="600"></canvas>
+      <div>
+        <button onclick="window.isAnimating = true;">Animate</button>
+        <button onclick="exportGltf2();">Export as glTF2</button>
+      </div>
     </section>
     <section class="correct">
       <h2>Correct PNG Image</h2>

diff --git a/samples/test_e2e/GltfImporter-ibl-1/main.ts b/samples/test_e2e/GltfImporter-ibl-1/main.ts
@@ -6,6 +6,7 @@ import _Rn, {
 } from '../../../dist/esm/index';
 
 declare const Rn: typeof _Rn;
+declare const window: any;
 const p = document.createElement('p');
 document.body.appendChild(p);
 
@@ -206,3 +207,8 @@ function setTextureParameterForMeshComponents(
     }
   }
 }
+
+window.exportGltf2 = function () {
+  const exporter = Rn.Gltf2Exporter.getInstance();
+  exporter.export('Rhodonite');
+};
diff --git a/samples/test_e2e/GltfImporter-orbit-moving/main.ts b/samples/test_e2e/GltfImporter-orbit-moving/main.ts
@@ -80,7 +80,7 @@ document.body.appendChild(p);
   }
   mainExpression.renderPasses[0].toClearColorBuffer = true;
   mainExpression.renderPasses[0].toClearDepthBuffer = true;
-  mainExpression.renderPasses[0].clearColor = new Rn.Vector4(0, 0, 0, 0);
+  mainExpression.renderPasses[0].clearColor = Rn.Vector4.fromCopyArray([0, 0, 0, 0]);
 
   const postEffectCameraEntity = createPostEffectCameraEntity();
   const postEffectCameraComponent = postEffectCameraEntity.getCamera();

diff --git a/samples/test_e2e/GltfImporter-specify-noLight/main.ts b/samples/test_e2e/GltfImporter-specify-noLight/main.ts
@@ -58,7 +58,7 @@ let p = null;
   setParameterForMeshComponents(
     meshComponents,
     Rn.ShaderSemantics.BaseColorFactor,
-    new Rn.Vector4(0.5, 0.5, 0.5, 1.0)
+    Rn.Vector4.fromCopyArray([0.5, 0.5, 0.5, 1.0])
   );
 
   // cameraController

diff --git a/samples/test_e2e/MultiPass/main.ts b/samples/test_e2e/MultiPass/main.ts
@@ -41,7 +41,7 @@ declare const Stats: any;
   Promise.all(promises).then(() => {
     const system = Rn.System.getInstance();
     const entityRepository = Rn.EntityRepository.getInstance();
-  
+
     const gl = system.setProcessApproachAndCanvas(
       Rn.ProcessApproach.UniformWebGL1,
       document.getElementById('world') as HTMLCanvasElement
@@ -107,7 +107,7 @@ declare const Stats: any;
     //primitive.material.setTextureParameter(Rn.ShaderSemantics.DiffuseColorTexture, texture);
     primitive.material.setParameter(
       Rn.ShaderSemantics.DiffuseColorFactor,
-      new Rn.Vector4(1, 0, 1, 1)
+      Rn.Vector4.fromCopyArray([1, 0, 1, 1])
     );
 
     const entities = [];
@@ -242,7 +242,7 @@ declare const Stats: any;
 })();
 
 window.exportGltf2 = function () {
-  
+
   const exporter = Rn.Gltf2Exporter.getInstance();
   exporter.export('Rhodonite');
-};
+};
diff --git a/samples/test_e2e/PixelPickingTest/main.ts b/samples/test_e2e/PixelPickingTest/main.ts
@@ -26,7 +26,7 @@ const setupRenderPassEntityUidOutput = function (
     {}
   );
   renderPass.setFramebuffer(framebuffer);
-  renderPass.clearColor = new Rn.Vector4(0, 0, 0, 1);
+  renderPass.clearColor = Rn.Vector4.fromCopyArray([0, 0, 0, 1]);
   renderPass.toClearColorBuffer = true;
   renderPass.toClearDepthBuffer = true;
 
@@ -58,7 +58,7 @@ const pick = function (e: any) {
   const pickedPixel = renderTargetTexture.getPixelValueAt(x, y);
   console.log(pickedPixel.toString());
 
-  const bitDec = new Rn.Vector4(1, 255, 65025, 0);
+  const bitDec = Rn.Vector4.fromCopyArray([1, 255, 65025, 0]);
   const pickedEntityUID = bitDec.dot(pickedPixel);
   console.log(pickedEntityUID);
 
@@ -209,7 +209,7 @@ let p: any;
 })();
 
 window.exportGltf2 = function () {
-  
+
   const exporter = Rn.Gltf2Exporter.getInstance();
   exporter.export('Rhodonite');
 };
diff --git a/samples/test_e2e/ShadowMap/main.ts b/samples/test_e2e/ShadowMap/main.ts
@@ -67,17 +67,17 @@ document.body.appendChild(p);
   setParameterForMeshComponent(
     meshComponentSmallBoard,
     Rn.ShaderSemantics.DiffuseColorFactor,
-    new Rn.Vector4(0.5, 0.1, 0.4, 1)
+    Rn.Vector4.fromCopyArray([0.5, 0.1, 0.4, 1])
   );
   setParameterForMeshComponent(
     meshComponentLargeBoard,
     Rn.ShaderSemantics.DiffuseColorFactor,
-    new Rn.Vector4(0.1, 0.7, 0.5, 1)
+    Rn.Vector4.fromCopyArray([0.1, 0.7, 0.5, 1])
   );
   setParameterForMeshComponent(
     meshComponentLargeBoard,
     Rn.ShadowMapDecodeClassicSingleMaterialNode.ShadowColorFactor,
-    new Rn.Vector4(0.05, 0.35, 0.25, 1)
+    Rn.Vector4.fromCopyArray([0.05, 0.35, 0.25, 1])
   );
 
   const scaleSmallBoard = new Rn.Vector3(0.2, 0.2, 0.2);

diff --git a/samples/test_e2e/ShadowMapDebugMode/main.ts b/samples/test_e2e/ShadowMapDebugMode/main.ts
@@ -67,22 +67,22 @@ let p: any;
   setParameterForMeshComponent(
     meshComponentSmallBoard,
     Rn.ShaderSemantics.DiffuseColorFactor,
-    new Rn.Vector4(0.5, 0.1, 0.4, 1)
+    Rn.Vector4.fromCopyArray([0.5, 0.1, 0.4, 1])
   );
   setParameterForMeshComponent(
     meshComponentLargeBoard,
     Rn.ShaderSemantics.DiffuseColorFactor,
-    new Rn.Vector4(0.1, 0.7, 0.5, 1)
+    Rn.Vector4.fromCopyArray([0.1, 0.7, 0.5, 1])
   );
   setParameterForMeshComponent(
     meshComponentLargeBoard,
     Rn.ShadowMapDecodeClassicSingleMaterialNode.DebugColorFactor,
-    new Rn.Vector4(0.85, 0.0, 0.0, 1.0)
+    Rn.Vector4.fromCopyArray([0.85, 0.0, 0.0, 1.0])
   );
   setParameterForMeshComponent(
     meshComponentLargeBoard,
     Rn.ShadowMapDecodeClassicSingleMaterialNode.ShadowColorFactor,
-    new Rn.Vector4(0.05, 0.35, 0.25, 1)
+    Rn.Vector4.fromCopyArray([0.05, 0.35, 0.25, 1])
   );
 
   const scaleSmallBoard = new Rn.Vector3(0.2, 0.2, 0.2);

diff --git a/samples/test_e2e/ShadowMapVariance/main.ts b/samples/test_e2e/ShadowMapVariance/main.ts
@@ -203,11 +203,11 @@ declare const Rn: typeof _Rn;
     );
     materialSphere.setParameter(
       Rn.ShaderSemantics.DiffuseColorFactor,
-      new Rn.Vector4(0.5, 0.1, 0.4, 1)
+      Rn.Vector4.fromCopyArray([0.5, 0.1, 0.4, 1])
     );
     materialSphere.setParameter(
       Rn.VarianceShadowMapDecodeClassicSingleMaterialNode.ShadowColor,
-      new Rn.Vector4(0.25, 0.05, 0.2, 1)
+      Rn.Vector4.fromCopyArray([0.25, 0.05, 0.2, 1])
     );
     materialSphere.setParameter(
       Rn.VarianceShadowMapDecodeClassicSingleMaterialNode.MinimumVariance,
@@ -223,11 +223,11 @@ declare const Rn: typeof _Rn;
     );
     materialBoard.setParameter(
       Rn.ShaderSemantics.DiffuseColorFactor,
-      new Rn.Vector4(0.1, 0.7, 0.5, 1)
+      Rn.Vector4.fromCopyArray([0.1, 0.7, 0.5, 1])
     );
     materialBoard.setParameter(
       Rn.VarianceShadowMapDecodeClassicSingleMaterialNode.ShadowColor,
-      new Rn.Vector4(0.05, 0.35, 0.25, 1)
+      Rn.Vector4.fromCopyArray([0.05, 0.35, 0.25, 1])
     );
     materialBoard.setParameter(
       Rn.VarianceShadowMapDecodeClassicSingleMaterialNode.MinimumVariance,

diff --git a/...ge_snapshots__/__diff_output__/test-js-regression-test-vrm-animation-1-diff.png b/...ge_snapshots__/__diff_output__/test-js-regression-test-vrm-animation-1-diff.png
diff --git a/src/effekseer/EffekseerComponent.ts b/src/effekseer/EffekseerComponent.ts
@@ -3,7 +3,6 @@ import EntityRepository from '../foundation/core/EntityRepository';
 import SceneGraphComponent from '../foundation/components/SceneGraphComponent';
 import {ProcessStage} from '../foundation/definitions/ProcessStage';
 import TransformComponent from '../foundation/components/TransformComponent';
-import Vector3 from '../foundation/math/Vector3';
 import CameraComponent from '../foundation/components/CameraComponent';
 import ComponentRepository from '../foundation/core/ComponentRepository';
 import {WellKnownComponentTIDs} from '../foundation/components/WellKnownComponentTIDs';
@@ -17,6 +16,7 @@ import {
 import Config from '../foundation/core/Config';
 import MutableMatrix44 from '../foundation/math/MutableMatrix44';
 import {Is} from '../foundation/misc/Is';
+import { IVector3 } from '../foundation/math/IVector';
 
 declare let effekseer: any;
 
@@ -133,7 +133,7 @@ export default class EffekseerComponent extends Component {
     return true;
   }
 
-  set translate(vec: Vector3) {
+  set translate(vec: IVector3) {
     if (this.__handle) {
       this.__handle.setLocation(vec.x, vec.y, vec.z);
     }