@gamelearn/arcade-components 0.6.2 → 0.7.0

package/dist/components/keyboard-puzzle-component/components/KeyboardPuzzleComponent.js

@@ -9,7 +9,7 @@ exports.default = void 0;
 
 var _react = _interopRequireWildcard(require("react"));
 
-var _FeedbackMessage = _interopRequireDefault(require("./FeedbackMessage"));
+var _FeedbackComponent = _interopRequireDefault(require("../../feedback-component/components/FeedbackComponent"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -62,14 +62,33 @@ var KeyboardPuzzleComponent = function KeyboardPuzzleComponent(_ref) {
       inputPassword = _useState8[0],
       setInputPassword = _useState8[1];
 
+  var _useState9 = (0, _react.useState)(false),
+      _useState10 = _slicedToArray(_useState9, 2),
+      feedbackResult = _useState10[0],
+      setFeedbackResult = _useState10[1];
+
+  var _useState11 = (0, _react.useState)(''),
+      _useState12 = _slicedToArray(_useState11, 2),
+      feedBackText = _useState12[0],
+      setFeedBackText = _useState12[1];
+
+  var _useState13 = (0, _react.useState)(false),
+      _useState14 = _slicedToArray(_useState13, 2),
+      feedbackIsShown = _useState14[0],
+      setFeedbackIsShown = _useState14[1];
+
   var imageURL = ((_image$img = image.img) === null || _image$img === void 0 ? void 0 : _image$img.url) || defaultImage;
 
   var checkPass = function checkPass(current) {
     if (current === password) {
       disableExit(false);
       setPassClass('success');
+      setFeedbackResult(true);
+      setFeedBackText(info.solution.right.desc);
+      setFeedbackIsShown(true);
       setFinished(true);
       setTimeout(function () {
+        setFeedbackIsShown(false);
         emitEvent({
           type: 'addPoints',
           payload: failed ? info.solution.wrong.rewards : info.solution.right.rewards
@@ -77,8 +96,12 @@ var KeyboardPuzzleComponent = function KeyboardPuzzleComponent(_ref) {
       }, 4000);
     } else {
       setFailed(true);
+      setFeedbackIsShown(true);
       setPassClass('failed');
+      setFeedbackResult(false);
+      setFeedBackText(info.solution.wrong.desc);
       setTimeout(function () {
+        setFeedbackIsShown(false);
         setPassClass('');
         setInputPassword('');
       }, 2000);
@@ -89,12 +112,14 @@ var KeyboardPuzzleComponent = function KeyboardPuzzleComponent(_ref) {
     setResolveAction(function (resolve) {
       disableExit(false);
       setPassClass('success');
+      setFeedbackResult(true);
+      setFeedBackText(info.solution.right.desc);
       setFinished(true);
       setTimeout(function () {
         resolve();
       }, 4000);
     });
-  }, [setResolveAction, disableExit]);
+  }, [setResolveAction, disableExit, info.solution.right.desc]);
 
   var handleNumbClick = function handleNumbClick(row, col) {
     var char = keyboard[row][col];
@@ -149,10 +174,10 @@ var KeyboardPuzzleComponent = function KeyboardPuzzleComponent(_ref) {
         key: col
       }, col);
     }));
-  })), /*#__PURE__*/_react.default.createElement(_FeedbackMessage.default, {
-    info: info,
-    passClass: passClass,
-    finished: finished
+  })), feedbackIsShown && /*#__PURE__*/_react.default.createElement(_FeedbackComponent.default, {
+    text: feedBackText,
+    success: feedbackResult,
+    additionalStyle: "bottom"
   }));
 };
 

package/dist/components/terminal-puzzle-component/components/Visor/index.js

@@ -13,6 +13,8 @@ var _pdfComponent = require("../../../pdf-component");
 
 var _Image = _interopRequireDefault(require("../Image"));
 
+var _FeedbackComponent = _interopRequireDefault(require("../../../feedback-component/components/FeedbackComponent"));
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
@@ -112,11 +114,15 @@ var Visor = function Visor(_ref) {
 
   return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("div", {
     className: "puzzle--terminal__visor"
-  }, fileId === solutionId ? /*#__PURE__*/_react.default.createElement(Feedback, {
-    status: "success",
-    feedback: info.solution.right.desc
+  }, fileId === solutionId ? /*#__PURE__*/_react.default.createElement(_FeedbackComponent.default, {
+    success: "success",
+    text: info.solution.right.desc,
+    functionOnClose: backFile,
+    additionalStyle: ICONS[file.type],
+    secondText: title,
+    puzzleHeaderClass: 'puzzle--terminal__visor--message'
   }) : /*#__PURE__*/_react.default.createElement(Feedback, {
-    status: "failed",
+    success: "failed",
     feedback: info.solution.wrong.desc
   }), /*#__PURE__*/_react.default.createElement("div", {
     className: "puzzle--terminal__visor--body"

package/dist/helpers/drawLOD.js

@@ -72,7 +72,7 @@ function makeTextSprite(message, opts) {
   var fontsize = parameters.fontsize || 120;
   var canvas = document.createElement('canvas');
   var context = canvas.getContext('2d');
-  context.font = fontsize + "px " + fontface; // get size data (height depends only on font size)
+  context.font = fontsize + 'px ' + fontface; // get size data (height depends only on font size)
   // var metrics = context.measureText(message);
   // var textWidth = metrics.width;
   // text color
@@ -293,7 +293,18 @@ var getHelpers = function getHelpers(scene) {
 };
 
 var drawLOD = function drawLOD(scene, camera) {
-  if (!camera.parent) return;
+  var currentCamera = camera;
+
+  if (!currentCamera.parent) {
+    scene.traverse(function (node) {
+      var _node$userData;
+
+      if (node.isPerspectiveCamera && (_node$userData = node.userData) !== null && _node$userData !== void 0 && _node$userData.defaultCamera) {
+        currentCamera = node;
+      }
+    });
+  }
+
   var params = {};
   params._texturesFrustum = texturesFrustum;
   params._texturesDistance = texturesDistance;
@@ -306,27 +317,32 @@ var drawLOD = function drawLOD(scene, camera) {
 
   params._scene.add(params._helpers);
 
-  params._camera = camera;
+  params._camera = currentCamera;
   params._frustum = null;
 
   if (params._texturesFrustum || params._texturesDistance) {
-    if (showHelpers) {
-      var helper = new THREE.CameraHelper(params._camera.clone());
-
-      params._helpers.add(helper);
-
-      helper.update();
-    }
+    if (params._camera) {
+      params._camera.updateMatrixWorld();
 
-    ;
+      params._camera.updateProjectionMatrix();
 
-    if (params._camera) {
       params._frustum = new THREE.Frustum();
 
       params._frustum.setFromProjectionMatrix(new THREE.Matrix4().multiplyMatrices(params._camera.projectionMatrix, params._camera.matrixWorldInverse));
     } else {
       params._texturesFrustum = params._texturesDistance = false;
     }
+
+    if (showHelpers) {
+      var helper = new THREE.CameraHelper(params._camera.clone());
+
+      params._helpers.add(helper);
+
+      helper.update();
+      var axesHelper = new THREE.AxesHelper(5);
+
+      params._helpers.add(axesHelper);
+    }
   }
 
   setTexturableElements(params);

package/dist/helpers/useGLB.js

@@ -46,8 +46,8 @@ var fetchGlb = function fetchGlb(originalUrl) {
   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;
+      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.6.2",
+  "version": "0.7.0",
   "main": "dist/index.js",
   "files": [
     "dist",
@@ -12,7 +12,7 @@
     "url": "https://github.com/gamelearn/arcade-components"
   },
   "dependencies": {
-    "@react-three/drei": "^5.1.6",
+    "@react-three/drei": "^5.3.1",
     "@react-three/fiber": "6.0.16",
     "@testing-library/jest-dom": "5.11.4",
     "@testing-library/react": "11.1.0",
@@ -26,8 +26,7 @@
     "react-pdf": "5.2.0",
     "react-promise-suspense": "0.3.3",
     "react-typist": "^2.0.5",
-    "three": "0.128.0",
-    "use-sound": "2.0.1",
+    "three": "^0.129.0",
     "web-vitals": "0.2.4"
   },
   "scripts": {
@@ -56,7 +55,7 @@
     "@babel/cli": "7.12.10",
     "@babel/preset-env": "7.12.11",
     "@babel/preset-react": "7.12.10",
-    "@gamelearn/ui-components-core": "5.16.0",
+    "@gamelearn/ui-components-core": "5.18.0",
     "@react-three/test-renderer": "6.0.6",
     "@storybook/addon-actions": "6.1.11",
     "@storybook/addon-essentials": "6.1.11",

package/dist/components/keyboard-puzzle-component/components/FeedbackMessage.js

@@ -1,30 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-
-var _react = _interopRequireDefault(require("react"));
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-var FeedbackMessage = function FeedbackMessage(_ref) {
-  var info = _ref.info,
-      passClass = _ref.passClass,
-      finished = _ref.finished;
-  if (!passClass) return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null);
-  if (finished) return /*#__PURE__*/_react.default.createElement("div", {
-    className: "puzzle--image__result bottom ".concat(passClass)
-  }, /*#__PURE__*/_react.default.createElement("span", {
-    className: "title"
-  }, info.solution.right.desc ? /*#__PURE__*/_react.default.createElement("span", null, info.solution.right.desc) : null));
-  return /*#__PURE__*/_react.default.createElement("div", {
-    className: "puzzle--keyboard__failed feedback puzzle--image__result bottom ".concat(passClass)
-  }, /*#__PURE__*/_react.default.createElement("span", {
-    className: "title"
-  }, info.solution.wrong.desc ? /*#__PURE__*/_react.default.createElement("span", null, info.solution.wrong.desc) : null));
-};
-
-var _default = FeedbackMessage;
-exports.default = _default;