@gamelearn/arcade-components 0.26.1 → 0.26.3

package/dist/components/arcade-render/element/index.js

@@ -64,7 +64,9 @@ var Element = /*#__PURE__*/_react.default.forwardRef(function (_ref, ref) {
       onLoad = _ref.onLoad,
       userData = _ref.userData,
       enableBounding = _ref.enableBounding,
-      props = _objectWithoutProperties(_ref, ["url", "animationUrl", "position", "rotation", "scale", "size", "material", "layers", "type", "onLoad", "userData", "enableBounding"]);
+      _ref$showProjection = _ref.showProjection,
+      showProjection = _ref$showProjection === void 0 ? true : _ref$showProjection,
+      props = _objectWithoutProperties(_ref, ["url", "animationUrl", "position", "rotation", "scale", "size", "material", "layers", "type", "onLoad", "userData", "enableBounding", "showProjection"]);
 
   var model = (0, _useGLB.default)(url);
   var modelClone = (0, _react.useMemo)(function () {
@@ -139,7 +141,7 @@ var Element = /*#__PURE__*/_react.default.forwardRef(function (_ref, ref) {
     position: position,
     rotation: rotation,
     scale: usingScale
-  }, props)), props.uid ? /*#__PURE__*/_react.default.createElement(_Projection.default, {
+  }, props)), props.uid && showProjection ? /*#__PURE__*/_react.default.createElement(_Projection.default, {
     object: modelClone,
     element: _objectSpread(_objectSpread({}, props), {}, {
       type: type

package/dist/components/arcade-render/elements-list/ClickableArea.js

@@ -35,13 +35,18 @@ function _objectWithoutProperties(source, excluded) { if (source == null) return
 
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 
-var ClickableArea = function ClickableArea(_ref) {
+var ClickableArea = /*#__PURE__*/_react.default.forwardRef(function (_ref, _ref2) {
   var position = _ref.position,
       rotation = _ref.rotation,
       _ref$scale = _ref.scale,
       scale = _ref$scale === void 0 ? [1, 1, 1] : _ref$scale,
       size = _ref.size,
-      props = _objectWithoutProperties(_ref, ["position", "rotation", "scale", "size"]);
+      _ref$showProjection = _ref.showProjection,
+      showProjection = _ref$showProjection === void 0 ? true : _ref$showProjection,
+      onLoad = _ref.onLoad,
+      _ref$showMat = _ref.showMat,
+      showMat = _ref$showMat === void 0 ? false : _ref$showMat,
+      props = _objectWithoutProperties(_ref, ["position", "rotation", "scale", "size", "showProjection", "onLoad", "showMat"]);
 
   var usingScale = size ? [size.width, size.height, size.depth] : scale;
   var object = (0, _react.useRef)();
@@ -56,25 +61,32 @@ var ClickableArea = function ClickableArea(_ref) {
   }
 
   (0, _react.useEffect)(function () {
+    if (onLoad) onLoad(object.current);
     setLoaded(true);
-  }, []);
+  }, [onLoad]);
   return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("mesh", _extends({
-    ref: object,
+    ref: function ref(node) {
+      if (node) {
+        object.current = node;
+        if (_ref2) _ref2.current = node;
+      }
+    },
     position: position,
     rotation: rotation,
     scale: usingScale
   }, props), /*#__PURE__*/_react.default.createElement("meshBasicMaterial", {
     color: "white",
+    opacity: 0.5,
     transparent: true,
-    visible: false,
+    visible: showMat,
     side: 2
   }), /*#__PURE__*/_react.default.createElement("planeBufferGeometry", {
     args: [1, 1, 2]
-  })), loaded ? /*#__PURE__*/_react.default.createElement(_Projection.default, {
+  })), loaded && showProjection ? /*#__PURE__*/_react.default.createElement(_Projection.default, {
     object: object.current,
     element: props
   }) : null);
-};
+});
 
 var _default = ClickableArea;
 exports.default = _default;

package/dist/components/arcade-render/elements-list/Poster.js

@@ -37,14 +37,17 @@ function _objectWithoutProperties(source, excluded) { if (source == null) return
 
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 
-var Poster = function Poster(_ref) {
+var Poster = /*#__PURE__*/_react.default.forwardRef(function (_ref, _ref2) {
   var url = _ref.url,
       position = _ref.position,
       rotation = _ref.rotation,
       _ref$scale = _ref.scale,
       scale = _ref$scale === void 0 ? [1, 1, 1] : _ref$scale,
       size = _ref.size,
-      props = _objectWithoutProperties(_ref, ["url", "position", "rotation", "scale", "size"]);
+      _ref$showProjection = _ref.showProjection,
+      showProjection = _ref$showProjection === void 0 ? true : _ref$showProjection,
+      onLoad = _ref.onLoad,
+      props = _objectWithoutProperties(_ref, ["url", "position", "rotation", "scale", "size", "showProjection", "onLoad"]);
 
   var texture = (0, _drei.useTexture)(url);
   var usingScale = size ? Object.values(size) : scale;
@@ -57,10 +60,16 @@ var Poster = function Poster(_ref) {
   var object = (0, _react.useRef)();
   var imageRatio = texture.image.height / texture.image.width;
   (0, _react.useEffect)(function () {
+    if (onLoad) onLoad(object.current);
     setLoaded(true);
-  }, []);
+  }, [onLoad]);
   return texture ? /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("mesh", _extends({
-    ref: object,
+    ref: function ref(node) {
+      if (node) {
+        object.current = node;
+        if (_ref2) _ref2.current = node;
+      }
+    },
     position: position,
     rotation: rotation,
     scale: [usingScale[0] / imageRatio, usingScale[1], [2]]
@@ -71,11 +80,11 @@ var Poster = function Poster(_ref) {
     side: 2
   }), /*#__PURE__*/_react.default.createElement("planeBufferGeometry", {
     args: [10, 10, 10]
-  })), loaded ? /*#__PURE__*/_react.default.createElement(_Projection.default, {
+  })), loaded && showProjection ? /*#__PURE__*/_react.default.createElement(_Projection.default, {
     object: object.current,
     element: props
   }) : null) : null;
-};
+});
 
 var _default = Poster;
 exports.default = _default;

package/dist/components/index.js

@@ -17,6 +17,18 @@ Object.defineProperty(exports, "ElementList", {
     return _elementsList.default;
   }
 });
+Object.defineProperty(exports, "ClickableArea", {
+  enumerable: true,
+  get: function get() {
+    return _ClickableArea.default;
+  }
+});
+Object.defineProperty(exports, "Poster", {
+  enumerable: true,
+  get: function get() {
+    return _Poster.default;
+  }
+});
 Object.defineProperty(exports, "Background", {
   enumerable: true,
   get: function get() {
@@ -256,6 +268,10 @@ var _scene = _interopRequireDefault(require("./arcade-render/scene"));
 
 var _elementsList = _interopRequireDefault(require("./arcade-render/elements-list"));
 
+var _ClickableArea = _interopRequireDefault(require("./arcade-render/elements-list/ClickableArea"));
+
+var _Poster = _interopRequireDefault(require("./arcade-render/elements-list/Poster"));
+
 var _background = _interopRequireDefault(require("./arcade-render/background"));
 
 var _element = _interopRequireDefault(require("./arcade-render/element"));

package/dist/components/writer-puzzle-component/components/WriterPuzzleComponent.js

@@ -121,25 +121,20 @@ var WriterPuzzleComponent = function WriterPuzzleComponent(_ref) {
       feedbackScreen = _useState19[0],
       setFeedbackScreen = _useState19[1];
 
-  var _useState20 = (0, _react.useState)(false),
+  var _useState20 = (0, _react.useState)(true),
       _useState21 = _slicedToArray(_useState20, 2),
-      feedbackScreenDone = _useState21[0],
-      setFeedbackScreenDone = _useState21[1];
+      isActive = _useState21[0],
+      setIsActive = _useState21[1];
 
-  var _useState22 = (0, _react.useState)(true),
+  var _useState22 = (0, _react.useState)([]),
       _useState23 = _slicedToArray(_useState22, 2),
-      isActive = _useState23[0],
-      setIsActive = _useState23[1];
+      rewardsStack = _useState23[0],
+      setRewardsStack = _useState23[1];
 
-  var _useState24 = (0, _react.useState)([]),
+  var _useState24 = (0, _react.useState)(true),
       _useState25 = _slicedToArray(_useState24, 2),
-      rewardsStack = _useState25[0],
-      setRewardsStack = _useState25[1];
-
-  var _useState26 = (0, _react.useState)(true),
-      _useState27 = _slicedToArray(_useState26, 2),
-      disableExit = _useState27[0],
-      setDisableExit = _useState27[1];
+      disableExit = _useState25[0],
+      setDisableExit = _useState25[1];
 
   var _soundActions = _slicedToArray(soundActions, 1),
       playSound = _soundActions[0];
@@ -231,7 +226,7 @@ var WriterPuzzleComponent = function WriterPuzzleComponent(_ref) {
   var checkFeedbackScreen = function checkFeedbackScreen() {
     return decisionsList.find(function (decision) {
       var feedback = texts[decision.currenTextParagraph].electionTexts[decision.index].feedback;
-      return feedback.body !== null || feedback.rewards && feedback.rewards.length > 0;
+      return feedback.body || feedback.rewards && feedback.rewards.length > 0;
     });
   };
 
@@ -301,7 +296,6 @@ var WriterPuzzleComponent = function WriterPuzzleComponent(_ref) {
     } else if (checkAllDecisionsRightWrong()) {
       // if all Decisions are right or wrong we just skip to end
       setReviewDone(true);
-      setFeedbackScreenDone(true);
       endGame();
     }
 
@@ -312,22 +306,15 @@ var WriterPuzzleComponent = function WriterPuzzleComponent(_ref) {
       if (checkFeedbackScreen()) {
         // CHECK IF THERE IS NEED OF FEEDBACK SCREEN
         setFeedbackScreen(true);
-      } else {
-        setFeedbackScreenDone(true);
       }
-    }
-
-    if (reviewDone && !feedbackScreenDone) {
+    } else {
       setIsActive(false); // Second EXECUTION  shows Feedback Screen
 
-      if (feedbackScreen) {
+      if (feedbackScreen && !showFeedback) {
         setShowFeedback(true);
+      } else if (showFeedback || !feedbackScreen && !showFeedback) {
+        endGame();
       }
-    } // Third EXECUTION  Give Points
-
-
-    if (feedbackScreenDone) {
-      endGame();
     }
   };
 
@@ -468,12 +455,7 @@ var WriterPuzzleComponent = function WriterPuzzleComponent(_ref) {
       return _setFailed(true);
     },
     decisionsList: decisionsList,
-    closingAction: function closingAction() {
-      return setShowFeedback(false);
-    },
-    feedbackIsDone: function feedbackIsDone() {
-      return setFeedbackScreenDone(true);
-    },
+    closingAction: handleFinish,
     retry: retry,
     skip: skip,
     checkCorrect: checkAllDecisionsAreCorrect,

package/dist/helpers/drawLOD.js

@@ -313,7 +313,7 @@ var drawLOD = function drawLOD(scene, camera, settings) {
   params._forceRender = (scene === null || scene === void 0 ? void 0 : scene.lastLOD) !== (settings === null || settings === void 0 ? void 0 : settings.currentLOD) || (scene === null || scene === void 0 ? void 0 : scene.lastRGB) !== params._rgbSimulation;
   scene.lastLOD = settings === null || settings === void 0 ? void 0 : settings.currentLOD;
   scene.lastRGB = params._rgbSimulation;
-  params._texturesFrustum = texturesFrustum;
+  params._texturesFrustum = (settings === null || settings === void 0 ? void 0 : settings.texturesFrustum) !== undefined ? settings.texturesFrustum : texturesFrustum;
   params._texturesDistance = texturesDistance;
   params._scene = scene;
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@gamelearn/arcade-components",
   "license": "Gamelearn",
-  "version": "0.26.1",
+  "version": "0.26.3",
   "main": "dist/index.js",
   "files": [
     "dist",