@gamelearn/arcade-components 0.4.0 → 0.4.1-beta-terminal

package/dist/helpers/drawLOD.js

@@ -94,12 +94,14 @@ function makeTextSprite(message, opts) {
   sprite.center.set(0.5, 0.5);
   return sprite;
 }
+/*
+const texturablesDone = (params) => {
+  params._texturableElements.forEach((elem) => {
+    elem.userData._isDone = true;
+  })
+}
+*/
 
-var texturablesDone = function texturablesDone(params) {
-  params._texturableElements.forEach(function (elem) {
-    elem._isDone = true;
-  });
-};
 
 var materialize = function materialize(params, lod) {
   var totalLods = 0;
@@ -113,13 +115,10 @@ var materialize = function materialize(params, lod) {
 
         if (currentIndex < lastIndex) {
           materialize(params, progressiveOrder[currentIndex + 1]);
-        } else {
-          params._scene._isDone = true;
-          texturablesDone(params);
+        } else {// texturablesDone(params);
+        }
+      } else {// texturablesDone(params);
         }
-      } else {
-        texturablesDone(params);
-      }
     }
   };
 
@@ -128,18 +127,19 @@ var materialize = function materialize(params, lod) {
       return;
     }
 
-    if (elem._isDone) return;
-    var jsonUrl = elem.url.replace('.glb', '.json');
+    var jsonUrl = elem.userData.url.replace('.glb', '.json');
     fetch(jsonUrl).then(function (response) {
       return response.json();
     }).then(function (materials) {
       elem.traverse(function (obj) {
-        if (obj.isMesh || obj.isSkinnedMesh) {
+        if ((obj.isMesh || obj.isSkinnedMesh) && (!obj.material._isDone || !obj.material._isDone[lod])) {
           obj.material.wireframe = false;
+          if (!obj.material._isDone) obj.material._isDone = {};
+          obj.material._isDone[lod] = true;
 
           if (materials[obj.material.name]) {
             materials[obj.material.name].forEach(function (item) {
-              var imgSrc = "".concat(elem.url, ".textures.").concat(lod, ".").concat(item.positionInArray, ".png");
+              var imgSrc = "".concat(elem.userData.url, ".textures.").concat(lod, ".").concat(item.positionInArray, ".png");
               imgLoader.load(imgSrc, function (result) {
                 if (showStats) {
                   statsTextures(lod, imgSrc, result);
@@ -184,34 +184,13 @@ var materialize = function materialize(params, lod) {
 };
 
 var updateSceneLods = function updateSceneLods(params) {
-  if (!pureGlbMode && !pureGeometryMode
-  /*&& !params._scene._isDone*/
-  ) {
-      if (progressiveMode) {
-        materialize(params, progressiveOrder[0]);
-      } else {
-        materialize(params, currentLOD);
-      }
-    }
-};
-
-var getPerspectiveCamera = function getPerspectiveCamera(params) {
-  params._scene.children.forEach(function (item) {
-    if (item.type === 'PerspectiveCamera') {
-      params._camera = item;
-
-      if (showHelpers) {
-        var helper = new THREE.CameraHelper(params._camera.clone());
-
-        params._helpers.add(helper);
-
-        helper.update();
-      }
-
-      ;
-      return;
+  if (!pureGlbMode && !pureGeometryMode) {
+    if (progressiveMode) {
+      materialize(params, progressiveOrder[0]);
+    } else {
+      materialize(params, currentLOD);
     }
-  });
+  }
 };
 
 var invalidateOutOfFrustum = function invalidateOutOfFrustum(params) {
@@ -262,7 +241,7 @@ var checkDistances = function checkDistances(params) {
 
 var statsGeometries = function statsGeometries(params) {
   params._texturableElements.forEach(function (item) {
-    var url = item.url.replace('.glb', '.geometry.glb');
+    var url = item.userData.url.replace('.glb', '.geometry.glb');
     fetch(url).then(function (response) {
       return response.blob();
     }).then(function (blob) {
@@ -289,7 +268,7 @@ var setTexturableElements = function setTexturableElements(params) {
   params._texturableElements = [];
 
   params._scene.traverse(function (item) {
-    if (item.url) {
+    if (item.userData.url) {
       params._texturableElements.push(item);
     }
   });
@@ -313,7 +292,8 @@ var getHelpers = function getHelpers(scene) {
   return helper;
 };
 
-var drawLOD = function drawLOD(scene) {
+var drawLOD = function drawLOD(scene, camera) {
+  if (!camera.parent) return;
   var params = {};
   params._texturesFrustum = texturesFrustum;
   params._texturesDistance = texturesDistance;
@@ -326,11 +306,19 @@ var drawLOD = function drawLOD(scene) {
 
   params._scene.add(params._helpers);
 
-  params._camera = null;
+  params._camera = camera;
   params._frustum = null;
 
   if (params._texturesFrustum || params._texturesDistance) {
-    getPerspectiveCamera(params);
+    if (showHelpers) {
+      var helper = new THREE.CameraHelper(params._camera.clone());
+
+      params._helpers.add(helper);
+
+      helper.update();
+    }
+
+    ;
 
     if (params._camera) {
       params._frustum = new THREE.Frustum();

package/dist/helpers/useGLB.js

@@ -18,22 +18,36 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 // used
 var dracoDecoderPath = 'https://www.gstatic.com/draco/versioned/decoders/1.4.1/'; // TODO: Maybe download those files to statics.gamelearn
 
+var whiteImage = new Image();
+whiteImage.src = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mP8/x8AAwMCAO+ip1sAAAAASUVORK5CYII=';
 var dracoLoader = new _DRACOLoader.DRACOLoader();
 var gltfLoader = new _GLTFLoader.GLTFLoader();
 dracoLoader.setDecoderPath(dracoDecoderPath);
 gltfLoader.setDRACOLoader(dracoLoader);
 
-var fetchGlb = function fetchGlb(originalUrl) {
-  var takeGeometry = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
-  var url = originalUrl;
-
-  if (takeGeometry) {
-    var isTexturableObject = url.includes('/character/') || url.includes('/object/');
-    url = isTexturableObject ? url.replace('.glb', '.geometry.glb') : url;
-  }
+var treatGeometry = function treatGeometry(res) {
+  res.scene.traverse(function (obj) {
+    if (obj.isMesh || obj.isSkinnedMesh) {
+      var keys = Object.keys(obj.material);
+      keys.forEach(function (key) {
+        var value = obj.material[key];
+
+        if (value && value.isTexture) {
+          obj.material[key].image = whiteImage;
+        }
+      });
+      obj.material.needsUpdate = true;
+    }
+  });
+};
 
+var fetchGlb = function fetchGlb(originalUrl) {
+  var isTexturableObject = originalUrl.includes('/character/') || originalUrl.includes('/object/');
+  var url = isTexturableObject ? originalUrl.replace('.glb', '.geometry.glb') : originalUrl;
   return new Promise(function (resolve, reject) {
     gltfLoader.load(url, function (result) {
+      treatGeometry(result);
+      result.scene.userData.url = originalUrl;
       resolve(result);
     }, null, function (error) {
       return reject(error);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@gamelearn/arcade-components",
   "license": "Gamelearn",
-  "version": "0.4.0",
+  "version": "0.4.1-beta-terminal",
   "main": "dist/index.js",
   "files": [
     "dist",
@@ -18,6 +18,8 @@
     "@testing-library/react": "11.1.0",
     "@testing-library/user-event": "12.1.10",
     "hls.js": "0.12.4",
+    "html-react-parser": "^0.10.2",
+    "interactjs": "^1.10.11",
     "konva": "^7.2.5",
     "prop-types": "15.7.2",
     "react-konva": "^17.0.2-0",
@@ -36,9 +38,7 @@
     "eject": "react-scripts eject",
     "storybook": "start-storybook -p 6006 -s public",
     "build-storybook": "build-storybook -s public",
-    "generate": "plop",
-    "postinstall": "husky install",
-    "pre-commit": "lint-staged"
+    "generate": "plop"
   },
   "browserslist": {
     "production": [
@@ -56,8 +56,7 @@
     "@babel/cli": "7.12.10",
     "@babel/preset-env": "7.12.11",
     "@babel/preset-react": "7.12.10",
-    "@gamelearn/ui-components-core": "5.10.1",
-    "@gamelearn/version": "^1.0.3",
+    "@gamelearn/ui-components-core": "5.16.0",
     "@react-three/test-renderer": "6.0.6",
     "@storybook/addon-actions": "6.1.11",
     "@storybook/addon-essentials": "6.1.11",
@@ -67,8 +66,6 @@
     "@storybook/react": "6.1.11",
     "babel-loader": "8.2.2",
     "cross-env": "7.0.3",
-    "husky": "^6.0.0",
-    "lint-staged": "^11.0.0",
     "plop": "^2.7.4",
     "react": "0.0.0-experimental-27659559e",
     "react-dom": "0.0.0-experimental-27659559e",
@@ -79,10 +76,5 @@
     "moduleNameMapper": {
       "^react-pdf$": "react-pdf/dist/umd/entry.jest"
     }
-  },
-  "lint-staged": {
-    "src/**/*.{js,jsx,ts,tsx,json,css,scss,md}": [
-      "prettier --write"
-    ]
   }
-}
+}