Refactor sample folder structure

actnwit · Feb 28, 2019 · d6c3ad5 · d6c3ad5
1 parent 55228ba
commit d6c3ad5
Show file tree

Hide file tree

Showing 34 changed files with 168 additions and 8 deletions.
diff --git a/index.html b/index.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-    <meta http-equiv="refresh" content="0; URL=test">
+    <meta http-equiv="refresh" content="0; URL=samples">
 </head>
 <body>
 </body>

diff --git a/package.json b/package.json
@@ -15,8 +15,8 @@
     "serv": "node server.js",
     "test": "yarn test-unit ; yarn test-e2e",
     "test-unit": "jest --config jest.config.js ./src",
-    "test-e2e": "JEST_PUPPETEER_CONFIG=jest-puppeteer-config.js jest ./test/e2e --runInBand --config jest.config.e2e.js",
-    "test-e2e-update": "JEST_PUPPETEER_CONFIG=jest-puppeteer-config.js jest ./test/e2e --runInBand --config jest.config.e2e.js --updateSnapshot",
+    "test-e2e": "JEST_PUPPETEER_CONFIG=jest-puppeteer-config.js jest ./samples/test_e2e --runInBand --config jest.config.e2e.js",
+    "test-e2e-update": "JEST_PUPPETEER_CONFIG=jest-puppeteer-config.js jest ./samples/test_e2e --runInBand --config jest.config.e2e.js --updateSnapshot",
     "test-coverage": "jest --coverage",
     "doc": "typedoc --includeDeclarations --exclude '**/*.test.ts' --out ./docs/ ./src/"
   },

diff --git a/test/assets/navigate.js → samples/assets/navigate.js b/test/assets/navigate.js → samples/assets/navigate.js
diff --git a/test/example-list.json → samples/example-list.json b/test/example-list.json → samples/example-list.json
@@ -1,8 +1,12 @@
 {
-  "e2e": [
+  "test_e2e": [
     "DataTextureInstancedDrawingWebGL1",
     "DataTextureInstancedDrawingWebGL2",
     "Gltf2Importer",
     "UBOInstancedDrawing"
+  ],
+  "simple": [
+    "Effekseer",
+    "SparkGear"
   ]
 }
diff --git a/test/index.html → samples/index.html b/test/index.html → samples/index.html
diff --git a/test/e2e/Effekseer/index.html → samples/simple/Effekseer/index.html b/test/e2e/Effekseer/index.html → samples/simple/Effekseer/index.html
diff --git a/test/e2e/Effekseer/main.js → samples/simple/Effekseer/main.js b/test/e2e/Effekseer/main.js → samples/simple/Effekseer/main.js
diff --git a/..._snapshots__/__diff_output__/test-js-regression-test-gltf-2-importer-1-diff.png b/..._snapshots__/__diff_output__/test-js-regression-test-gltf-2-importer-1-diff.png
diff --git a/...egression-test-gltf-2-importer-1-snap.png → ...egression-test-gltf-2-importer-1-snap.png b/...egression-test-gltf-2-importer-1-snap.png → ...egression-test-gltf-2-importer-1-snap.png
diff --git a/test/e2e/Gltf2Importer/index.html → samples/simple/Gltf2Importer/index.html b/test/e2e/Gltf2Importer/index.html → samples/simple/Gltf2Importer/index.html
diff --git a/test/e2e/Gltf2Importer/main.js → samples/simple/Gltf2Importer/main.js b/test/e2e/Gltf2Importer/main.js → samples/simple/Gltf2Importer/main.js
diff --git a/test/e2e/Gltf2Importer/test.js → samples/simple/Gltf2Importer/test.js b/test/e2e/Gltf2Importer/test.js → samples/simple/Gltf2Importer/test.js
diff --git a/test/e2e/SparkGear/index.html → samples/simple/SparkGear/index.html b/test/e2e/SparkGear/index.html → samples/simple/SparkGear/index.html
diff --git a/test/e2e/SparkGear/main.js → samples/simple/SparkGear/main.js b/test/e2e/SparkGear/main.js → samples/simple/SparkGear/main.js
diff --git a/...ure-instanced-drawing-web-gl-1-1-snap.png → ...ure-instanced-drawing-web-gl-1-1-snap.png b/...ure-instanced-drawing-web-gl-1-1-snap.png → ...ure-instanced-drawing-web-gl-1-1-snap.png
diff --git a/...aTextureInstancedDrawingWebGL1/index.html → ...aTextureInstancedDrawingWebGL1/index.html b/...aTextureInstancedDrawingWebGL1/index.html → ...aTextureInstancedDrawingWebGL1/index.html
diff --git a/...DataTextureInstancedDrawingWebGL1/main.js → ...DataTextureInstancedDrawingWebGL1/main.js b/...DataTextureInstancedDrawingWebGL1/main.js → ...DataTextureInstancedDrawingWebGL1/main.js
diff --git a/...DataTextureInstancedDrawingWebGL1/test.js → ...DataTextureInstancedDrawingWebGL1/test.js b/...DataTextureInstancedDrawingWebGL1/test.js → ...DataTextureInstancedDrawingWebGL1/test.js
@@ -1,7 +1,7 @@
 test('regression test DataTextureInstancedDrawingWebGL1', async () => {
   jest.setTimeout(60000);
   const page = await browser.newPage();
-  await page.goto('http://localhost:8082/test/e2e/DataTextureInstancedDrawingWebGL1');
+  await page.goto('http://localhost:8082/samples/test_e2e/DataTextureInstancedDrawingWebGL1');
   await page.setViewport({width: 1000, height: 1000});
   await page.waitForSelector('p#rendered', {timeout: 60000});
   const canvasElement = await page.$('#world');

diff --git a/...ure-instanced-drawing-web-gl-2-1-snap.png → ...ure-instanced-drawing-web-gl-2-1-snap.png b/...ure-instanced-drawing-web-gl-2-1-snap.png → ...ure-instanced-drawing-web-gl-2-1-snap.png
diff --git a/...aTextureInstancedDrawingWebGL2/index.html → ...aTextureInstancedDrawingWebGL2/index.html b/...aTextureInstancedDrawingWebGL2/index.html → ...aTextureInstancedDrawingWebGL2/index.html
diff --git a/...DataTextureInstancedDrawingWebGL2/main.js → ...DataTextureInstancedDrawingWebGL2/main.js b/...DataTextureInstancedDrawingWebGL2/main.js → ...DataTextureInstancedDrawingWebGL2/main.js
diff --git a/...DataTextureInstancedDrawingWebGL2/test.js → ...DataTextureInstancedDrawingWebGL2/test.js b/...DataTextureInstancedDrawingWebGL2/test.js → ...DataTextureInstancedDrawingWebGL2/test.js
@@ -1,7 +1,7 @@
 test('regression test DataTextureInstancedDrawingWebGL2', async () => {
   jest.setTimeout(60000);
   const page = await browser.newPage();
-  await page.goto('http://localhost:8082/test/e2e/DataTextureInstancedDrawingWebGL2');
+  await page.goto('http://localhost:8082/samples/test_e2e/DataTextureInstancedDrawingWebGL2');
   await page.setViewport({width: 1000, height: 1000});
   await page.waitForSelector('p#rendered', {timeout: 60000});
   const canvasElement = await page.$('#world');

diff --git a/...Importer/__image_snapshots__/test-js-regression-test-gltf-2-importer-1-snap.png b/...Importer/__image_snapshots__/test-js-regression-test-gltf-2-importer-1-snap.png
diff --git a/samples/test_e2e/Gltf2Importer/index.html b/samples/test_e2e/Gltf2Importer/index.html
@@ -0,0 +1,43 @@
+<!doctype html>
+<html>
+<head>
+  <title>Gltf2Importer</title>
+  <meta charset="UTF-8" />
+  <meta name="viewport" content="width=device-width, user-scalable=no" />
+  <meta name="apple-mobile-web-app-capable" content="yes" />
+  <style>
+    main {
+      display: flex;
+    }
+    section {
+      background-color: darkgray;
+      padding: 10px;
+      margin: 20px;
+    }
+  </style>
+</head>
+<body>
+  <header>
+    <h1 class="header-title">Rhodonite E2E Test - Gltf2Importer</h1>
+  </header>
+  <main>
+    <section class="test">
+      <h2>Rendering Test Image</h2>
+      <canvas id="world" width="600" height="600"></canvas>
+      <div>
+        <button onclick="window.isAnimating = true;">Animate</button>
+      </div>
+    </section>
+    <section class="correct">
+      <h2>Correct PNG Image</h2>
+      <img src="__image_snapshots__/test-js-regression-test-gltf-2-importer-1-snap.png" />
+    </section>
+  </main>
+  <script src="../../assets/navigate.js"></script>
+  <script src="https://cdnjs.cloudflare.com/ajax/libs/babel-standalone/6.26.0/babel.min.js"></script>
+  <script src="https://cdnjs.cloudflare.com/ajax/libs/babel-polyfill/6.26.0/polyfill.min.js"></script>
+  <script src="../../../dist/rhodonite.js"></script>
+  <script src="main.js"></script>
+</body>
+
+</html>
diff --git a/samples/test_e2e/Gltf2Importer/main.js b/samples/test_e2e/Gltf2Importer/main.js
@@ -0,0 +1,103 @@
+
+let p = null;
+
+const load = async function(time){
+  await Rn.ModuleManager.getInstance().loadModule('webgl');
+  await Rn.ModuleManager.getInstance().loadModule('pbr');
+  const importer = Rn.Gltf2Importer.getInstance();
+  const system = Rn.System.getInstance();
+  const gl = system.setProcessApproachAndCanvas(Rn.ProcessApproach.UniformWebGL1, document.getElementById('world'));
+
+  const entityRepository = Rn.EntityRepository.getInstance();
+
+  // Camera
+  const cameraEntity = entityRepository.createEntity([Rn.TransformComponent, Rn.SceneGraphComponent, Rn.CameraComponent, Rn.CameraControllerComponent])
+  const cameraComponent = cameraEntity.getComponent(Rn.CameraComponent);
+  //cameraComponent.type = Rn.CameraTyp]e.Orthographic;
+  cameraComponent.parameters = new Rn.Vector4(0.1, 1000, 90, 1);
+  cameraEntity.getTransform().translate = new Rn.Vector3(0.0, 0, 0.5);
+
+
+  // Lights
+  const lightEntity = entityRepository.createEntity([Rn.TransformComponent, Rn.SceneGraphComponent, Rn.LightComponent])
+  lightEntity.getTransform().translate = new Rn.Vector3(1.0, 100000.0, 1.0);
+  lightEntity.getComponent(Rn.LightComponent).intensity = new Rn.Vector3(1, 1, 1);
+  //lightEntity2.getTransform().rotate = new Rn.Vector3(Math.PI/2, 0, 0);
+  //lightEntity2.getComponent(Rn.LightComponent).type = Rn.LightType.Directional;
+
+
+  const response = await importer.import('../../../assets/gltf/2.0/BoxAnimated/glTF/BoxAnimated.gltf');
+  const modelConverter = Rn.ModelConverter.getInstance();
+  const rootGroup = modelConverter.convertToRhodoniteObject(response);
+  //rootGroup.getTransform().translate = new Rn.Vector3(1.0, 0, 0);
+  rootGroup.getTransform().rotate = new Rn.Vector3(0, 1.0, 0.0);
+
+
+  // CameraComponent
+  const cameraControllerComponent = cameraEntity.getComponent(Rn.CameraControllerComponent);
+  cameraControllerComponent.setTarget(rootGroup);
+
+  // Env Map
+  const specularCubeTexture = new Rn.CubeTexture();
+  specularCubeTexture.baseUriToLoad = '../../../assets/ibl/specular/specular';
+  specularCubeTexture.mipmapLevelNumber = 10;
+  const diffuseCubeTexture = new Rn.CubeTexture();
+  diffuseCubeTexture.baseUriToLoad = '../../../assets/ibl/diffuse/diffuse';
+  diffuseCubeTexture.mipmapLevelNumber = 1;
+  const componentRepository = Rn.ComponentRepository.getInstance();
+  const meshRendererComponents = componentRepository.getComponentsWithType(Rn.MeshRendererComponent);
+  for (let meshRendererComponent of meshRendererComponents) {
+    meshRendererComponent.specularCubeMap = specularCubeTexture;
+    meshRendererComponent.diffuseCubeMap = diffuseCubeTexture;
+  }
+
+
+  Rn.CameraComponent.main = 0;
+  let startTime = Date.now();
+  const rotationVec3 = Rn.MutableVector3.one();
+  let count = 0;
+  const draw = function(time) {
+
+    if (p == null && count > 0) {
+      if (response != null) {
+
+        gl.enable(gl.DEPTH_TEST);
+        gl.viewport(0, 0, 600, 600);
+        gl.clearColor(0.8, 0.8, 0.8, 1.0);
+        gl.clear(gl.COLOR_BUFFER_BIT | gl.DEPTH_BUFFER_BIT);
+      }
+
+      p = document.createElement('p');
+      p.setAttribute("id", "rendered");
+      p.innerText = 'Rendered.';
+      document.body.appendChild(p);
+
+    }
+
+    if (window.isAnimating) {
+      const date = new Date();
+      const rotation = 0.001 * (date.getTime() - startTime);
+      //rotationVec3.v[0] = 0.1;
+      //rotationVec3.v[1] = rotation;
+      //rotationVec3.v[2] = 0.1;
+      const time = (date.getTime() - startTime) / 1000;
+      Rn.AnimationComponent.globalTime = time;
+      if (time > Rn.AnimationComponent.endInputValue) {
+        startTime = date.getTime();
+      }
+      //console.log(time);
+//      rootGroup.getTransform().scale = rotationVec3;
+      //rootGroup.getTransform().translate = rootGroup.getTransform().translate;
+    }
+
+    system.process();
+    count++;
+
+    requestAnimationFrame(draw);
+  }
+
+  draw();
+}
+
+document.body.onload = load;
+
diff --git a/samples/test_e2e/Gltf2Importer/test.js b/samples/test_e2e/Gltf2Importer/test.js
@@ -0,0 +1,10 @@
+test('regression test Gltf2Importer', async () => {
+  jest.setTimeout(60000);
+  const page = await browser.newPage();
+  await page.goto('http://localhost:8082/samples/test_e2e/Gltf2Importer');
+  await page.setViewport({width: 1000, height: 1000});
+  await page.waitForSelector('p#rendered', {timeout: 60000});
+  const canvasElement = await page.$('#world');
+  const image = await canvasElement.screenshot();
+  expect(image).toMatchImageSnapshot();
+});
diff --git a/...ack-instanced-drawing-web-gl-2-1-snap.png → ...ack-instanced-drawing-web-gl-2-1-snap.png b/...ack-instanced-drawing-web-gl-2-1-snap.png → ...ack-instanced-drawing-web-gl-2-1-snap.png
diff --git a/...nsformFeedbackInstancedDrawing/index.html → ...nsformFeedbackInstancedDrawing/index.html b/...nsformFeedbackInstancedDrawing/index.html → ...nsformFeedbackInstancedDrawing/index.html
diff --git a/...TransformFeedbackInstancedDrawing/main.js → ...TransformFeedbackInstancedDrawing/main.js b/...TransformFeedbackInstancedDrawing/main.js → ...TransformFeedbackInstancedDrawing/main.js
diff --git a/...TransformFeedbackInstancedDrawing/test.js → ...TransformFeedbackInstancedDrawing/test.js b/...TransformFeedbackInstancedDrawing/test.js → ...TransformFeedbackInstancedDrawing/test.js
@@ -1,7 +1,7 @@
 test('regression test TransformFeedbackInstancedDrawingWebGL2', async () => {
   jest.setTimeout(60000);
   const page = await browser.newPage();
-  await page.goto('http://localhost:8082/test/e2e/TransformFeedbackInstancedDrawing');
+  await page.goto('http://localhost:8082/samples/test_e2e/TransformFeedbackInstancedDrawing');
   await page.setViewport({width: 1000, height: 1000});
   await page.waitForSelector('p#rendered', {timeout: 60000});
   const canvasElement = await page.$('#world');

diff --git a/...ion-test-ubo-instanced-drawing-1-snap.png → ...ion-test-ubo-instanced-drawing-1-snap.png b/...ion-test-ubo-instanced-drawing-1-snap.png → ...ion-test-ubo-instanced-drawing-1-snap.png
diff --git a/test/e2e/UBOInstancedDrawing/index.html → ...s/test_e2e/UBOInstancedDrawing/index.html b/test/e2e/UBOInstancedDrawing/index.html → ...s/test_e2e/UBOInstancedDrawing/index.html
diff --git a/test/e2e/UBOInstancedDrawing/main.js → samples/test_e2e/UBOInstancedDrawing/main.js b/test/e2e/UBOInstancedDrawing/main.js → samples/test_e2e/UBOInstancedDrawing/main.js
diff --git a/test/e2e/UBOInstancedDrawing/test.js → samples/test_e2e/UBOInstancedDrawing/test.js b/test/e2e/UBOInstancedDrawing/test.js → samples/test_e2e/UBOInstancedDrawing/test.js
@@ -1,7 +1,7 @@
 test('regression test UBOInstancedDrawing', async () => {
   jest.setTimeout(60000);
   const page = await browser.newPage();
-  await page.goto('http://localhost:8082/test/e2e/UBOInstancedDrawing');
+  await page.goto('http://localhost:8082/samples/test_e2e/UBOInstancedDrawing');
   await page.setViewport({width: 1000, height: 1000});
   await page.waitForSelector('p#rendered', {timeout: 60000});
   const canvasElement = await page.$('#world');