clean and makeup

alibaba · Oct 30, 2018 · 9b7915c · 9b7915c
1 parent c171a9f
commit 9b7915c
Show file tree

Hide file tree

Showing 38 changed files with 153 additions and 1,128 deletions.
diff --git a/demo/001-first-steps.js b/demo/001-first-steps.js
@@ -1,48 +1,22 @@
 // G3D_TEMPLATE_GENERATED
-
 import G3D from '../src/G3D';
 
 import main from './001-first-steps-main';
 import loader from './lib/loader';
 import pbrAssets from './lib/pbr-assets';
 import { controlArcRotateCamera } from './lib/attach-control';
-import * as dat from 'dat.gui';
 
 const canvas = document.getElementById('canvas');
-
-canvas.width = document.documentElement.clientWidth;
-canvas.height = document.documentElement.clientHeight;
-
-let stop = false;
+canvas.width = document.documentElement.clientWidth * devicePixelRatio;
+canvas.height = document.documentElement.clientHeight * devicePixelRatio;
 
 main(G3D, {
     canvas,
-    requestAnimationFrame: function (f) {
-        requestAnimationFrame(() => {
-            if (!stop) {
-                f();
-            }
-        });
-    },
+    requestAnimationFrame,
     controlArcRotateCamera,
     pbrAssets,
     loader,
     onClickCanvas: function (callback) {
         canvas.addEventListener('click', callback)
     },
-});
-
-
-// GUI Control
-const data = {
-    destroy: () => {
-        if (G3D.Engine.instance) {
-            stop = true;
-            G3D.Engine.instance.destroy();
-        }
-    }
-}
-var gui = new dat.GUI();
-Object.keys(data).forEach((key) => {
-    gui.add(data, key);
 });
diff --git a/demo/002-shapes.js b/demo/002-shapes.js
@@ -5,43 +5,18 @@ import main from './002-shapes-main';
 import loader from './lib/loader';
 import pbrAssets from './lib/pbr-assets';
 import { controlArcRotateCamera } from './lib/attach-control';
-import * as dat from 'dat.gui';
 
 const canvas = document.getElementById('canvas');
-
-canvas.width = document.documentElement.clientWidth;
-canvas.height = document.documentElement.clientHeight;
-
-let stop = false;
+canvas.width = document.documentElement.clientWidth * devicePixelRatio;
+canvas.height = document.documentElement.clientHeight * devicePixelRatio;
 
 main(G3D, {
     canvas,
-    requestAnimationFrame: function (f) {
-        requestAnimationFrame(() => {
-            if (!stop) {
-                f();
-            }
-        });
-    },
+    requestAnimationFrame,
     controlArcRotateCamera,
     pbrAssets,
     loader,
     onClickCanvas: function (callback) {
         canvas.addEventListener('click', callback)
     },
-});
-
-
-// GUI Control
-const data = {
-    destroy: () => {
-        if (G3D.Engine.instance) {
-            stop = true;
-            G3D.Engine.instance.destroy();
-        }
-    }
-}
-var gui = new dat.GUI();
-Object.keys(data).forEach((key) => {
-    gui.add(data, key);
 });
diff --git a/demo/003-ortho-camera-main.js b/demo/003-ortho-camera-main.js
@@ -21,7 +21,7 @@ function main(
     const light2 = new G3D.AmbientLight(scene);
     light2.intensity = 0.5;
 
-    const m1 = G3D.MeshBuilder.createGround(scene, 6, 4);
+    const m1 = G3D.MeshBuilder.createPlane(scene, 6, 4);
     m1.position.z = -1;
 
     const m2 = G3D.MeshBuilder.createSphere(scene, 1, 32);

diff --git a/demo/003-ortho-camera.js b/demo/003-ortho-camera.js
@@ -5,43 +5,18 @@ import main from './003-ortho-camera-main';
 import loader from './lib/loader';
 import pbrAssets from './lib/pbr-assets';
 import { controlArcRotateCamera } from './lib/attach-control';
-import * as dat from 'dat.gui';
 
 const canvas = document.getElementById('canvas');
-
-canvas.width = document.documentElement.clientWidth;
-canvas.height = document.documentElement.clientHeight;
-
-let stop = false;
+canvas.width = document.documentElement.clientWidth * devicePixelRatio;
+canvas.height = document.documentElement.clientHeight * devicePixelRatio;
 
 main(G3D, {
     canvas,
-    requestAnimationFrame: function (f) {
-        requestAnimationFrame(() => {
-            if (!stop) {
-                f();
-            }
-        });
-    },
+    requestAnimationFrame,
     controlArcRotateCamera,
     pbrAssets,
     loader,
     onClickCanvas: function (callback) {
         canvas.addEventListener('click', callback)
     },
-});
-
-
-// GUI Control
-const data = {
-    destroy: () => {
-        if (G3D.Engine.instance) {
-            stop = true;
-            G3D.Engine.instance.destroy();
-        }
-    }
-}
-var gui = new dat.GUI();
-Object.keys(data).forEach((key) => {
-    gui.add(data, key);
 });
diff --git a/demo/004-point-light-main.js b/demo/004-point-light-main.js
@@ -45,7 +45,7 @@ function main(
     m3.position.z = 1;
     m3.position.x = -3;
 
-    const ground = G3D.MeshBuilder.createGround(scene, 12, 8);
+    const ground = G3D.MeshBuilder.createPlane(scene, 12, 8);
 
     function render() {
 

diff --git a/demo/004-point-light.js b/demo/004-point-light.js
@@ -5,43 +5,18 @@ import main from './004-point-light-main';
 import loader from './lib/loader';
 import pbrAssets from './lib/pbr-assets';
 import { controlArcRotateCamera } from './lib/attach-control';
-import * as dat from 'dat.gui';
 
 const canvas = document.getElementById('canvas');
-
-canvas.width = document.documentElement.clientWidth;
-canvas.height = document.documentElement.clientHeight;
-
-let stop = false;
+canvas.width = document.documentElement.clientWidth * devicePixelRatio;
+canvas.height = document.documentElement.clientHeight * devicePixelRatio;
 
 main(G3D, {
     canvas,
-    requestAnimationFrame: function (f) {
-        requestAnimationFrame(() => {
-            if (!stop) {
-                f();
-            }
-        });
-    },
+    requestAnimationFrame,
     controlArcRotateCamera,
     pbrAssets,
     loader,
     onClickCanvas: function (callback) {
         canvas.addEventListener('click', callback)
     },
-});
-
-
-// GUI Control
-const data = {
-    destroy: () => {
-        if (G3D.Engine.instance) {
-            stop = true;
-            G3D.Engine.instance.destroy();
-        }
-    }
-}
-var gui = new dat.GUI();
-Object.keys(data).forEach((key) => {
-    gui.add(data, key);
 });
diff --git a/demo/005-directional-light.js b/demo/005-directional-light.js
@@ -5,43 +5,18 @@ import main from './005-directional-light-main';
 import loader from './lib/loader';
 import pbrAssets from './lib/pbr-assets';
 import { controlArcRotateCamera } from './lib/attach-control';
-import * as dat from 'dat.gui';
 
 const canvas = document.getElementById('canvas');
-
-canvas.width = document.documentElement.clientWidth;
-canvas.height = document.documentElement.clientHeight;
-
-let stop = false;
+canvas.width = document.documentElement.clientWidth * devicePixelRatio;
+canvas.height = document.documentElement.clientHeight * devicePixelRatio;
 
 main(G3D, {
     canvas,
-    requestAnimationFrame: function (f) {
-        requestAnimationFrame(() => {
-            if (!stop) {
-                f();
-            }
-        });
-    },
+    requestAnimationFrame,
     controlArcRotateCamera,
     pbrAssets,
     loader,
     onClickCanvas: function (callback) {
         canvas.addEventListener('click', callback)
     },
-});
-
-
-// GUI Control
-const data = {
-    destroy: () => {
-        if (G3D.Engine.instance) {
-            stop = true;
-            G3D.Engine.instance.destroy();
-        }
-    }
-}
-var gui = new dat.GUI();
-Object.keys(data).forEach((key) => {
-    gui.add(data, key);
 });
diff --git a/demo/010-model-obj-load-cola.js b/demo/010-model-obj-load-cola.js
@@ -5,43 +5,18 @@ import main from './010-model-obj-load-cola-main';
 import loader from './lib/loader';
 import pbrAssets from './lib/pbr-assets';
 import { controlArcRotateCamera } from './lib/attach-control';
-import * as dat from 'dat.gui';
 
 const canvas = document.getElementById('canvas');
-
-canvas.width = document.documentElement.clientWidth;
-canvas.height = document.documentElement.clientHeight;
-
-let stop = false;
+canvas.width = document.documentElement.clientWidth * devicePixelRatio;
+canvas.height = document.documentElement.clientHeight * devicePixelRatio;
 
 main(G3D, {
     canvas,
-    requestAnimationFrame: function (f) {
-        requestAnimationFrame(() => {
-            if (!stop) {
-                f();
-            }
-        });
-    },
+    requestAnimationFrame,
     controlArcRotateCamera,
     pbrAssets,
     loader,
     onClickCanvas: function (callback) {
         canvas.addEventListener('click', callback)
     },
-});
-
-
-// GUI Control
-const data = {
-    destroy: () => {
-        if (G3D.Engine.instance) {
-            stop = true;
-            G3D.Engine.instance.destroy();
-        }
-    }
-}
-var gui = new dat.GUI();
-Object.keys(data).forEach((key) => {
-    gui.add(data, key);
 });
diff --git a/demo/011-model-stl-load-ring.js b/demo/011-model-stl-load-ring.js
@@ -5,43 +5,18 @@ import main from './011-model-stl-load-ring-main';
 import loader from './lib/loader';
 import pbrAssets from './lib/pbr-assets';
 import { controlArcRotateCamera } from './lib/attach-control';
-import * as dat from 'dat.gui';
 
 const canvas = document.getElementById('canvas');
-
-canvas.width = document.documentElement.clientWidth;
-canvas.height = document.documentElement.clientHeight;
-
-let stop = false;
+canvas.width = document.documentElement.clientWidth * devicePixelRatio;
+canvas.height = document.documentElement.clientHeight * devicePixelRatio;
 
 main(G3D, {
     canvas,
-    requestAnimationFrame: function (f) {
-        requestAnimationFrame(() => {
-            if (!stop) {
-                f();
-            }
-        });
-    },
+    requestAnimationFrame,
     controlArcRotateCamera,
     pbrAssets,
     loader,
     onClickCanvas: function (callback) {
         canvas.addEventListener('click', callback)
     },
-});
-
-
-// GUI Control
-const data = {
-    destroy: () => {
-        if (G3D.Engine.instance) {
-            stop = true;
-            G3D.Engine.instance.destroy();
-        }
-    }
-}
-var gui = new dat.GUI();
-Object.keys(data).forEach((key) => {
-    gui.add(data, key);
 });
diff --git a/demo/012-model-font.html b/demo/012-model-font.html
@@ -7,7 +7,7 @@
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta http-equiv="X-UA-Compatible" content="ie=edge">
-    <title>G3D | 012-font</title>
+    <title>G3D | 012-model-font</title>
 </head>
 
 <body>