@gamelearn/arcade-components 0.11.2 → 0.14.0

package/dist/components/web-builder-puzzle-component/components/WebBuilderPuzzleComponent.js

@@ -76,6 +76,7 @@ var WebBuilderPuzzleComponent = function WebBuilderPuzzleComponent(_ref) {
       info = _ref.info,
       emitEvent = _ref.emitEvent,
       setResolveAction = _ref.setResolveAction,
+      soundActions = _ref.soundActions,
       disableExit = _ref.disableExit;
 
   var _useState = (0, _react.useState)(false),
@@ -129,6 +130,9 @@ var WebBuilderPuzzleComponent = function WebBuilderPuzzleComponent(_ref) {
       body = _useState18[0],
       setBody = _useState18[1];
 
+  var _soundActions = _slicedToArray(soundActions, 1),
+      playSound = _soundActions[0];
+
   var translate = function translate(id) {
     return emitEvent({
       type: 'translate',
@@ -168,6 +172,7 @@ var WebBuilderPuzzleComponent = function WebBuilderPuzzleComponent(_ref) {
     if (info.solution) {
       var rewards = info.solution.right.rewards;
       var wrongRewards = info.solution.wrong.rewards;
+      playSound(failed ? 'fail' : 'score');
       emitEvent({
         type: 'addPoints',
         payload: failed ? rewards : wrongRewards

package/dist/components/web-builder-puzzle-component/mocks/mockForStory.js

@@ -22,6 +22,7 @@ var mockProps = {
       wrong: {}
     }
   },
+  soundActions: [function () {}, function () {}],
   emitEvent: emitEvent,
   setResolveAction: noop,
   disableExit: noop

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

@@ -51,10 +51,6 @@ function _iterableToArrayLimit(arr, i) { var _i = arr && (typeof Symbol !== "und
 
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
-function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
-
-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 WriterPuzzleComponent = function WriterPuzzleComponent(_ref) {
   var emitEvent = _ref.emitEvent,
       info = _ref.info,
@@ -65,7 +61,7 @@ var WriterPuzzleComponent = function WriterPuzzleComponent(_ref) {
       type = _ref.type,
       documentTitle = _ref.documentTitle,
       texts = _ref.texts,
-      props = _objectWithoutProperties(_ref, ["emitEvent", "info", "styles", "nodeId", "retry", "skip", "type", "documentTitle", "texts"]);
+      soundActions = _ref.soundActions;
 
   var translate = function translate(id) {
     return emitEvent({
@@ -144,6 +140,9 @@ var WriterPuzzleComponent = function WriterPuzzleComponent(_ref) {
       disableExit = _useState27[0],
       setDisableExit = _useState27[1];
 
+  var _soundActions = _slicedToArray(soundActions, 1),
+      playSound = _soundActions[0];
+
   (0, _react.useEffect)(function () {
     if (finished) {
       setDisableExit(false);
@@ -238,7 +237,7 @@ var WriterPuzzleComponent = function WriterPuzzleComponent(_ref) {
   var handleLectures = function handleLectures() {
     var text = createLecture();
     emitEvent({
-      type: 'finishLecture??',
+      type: 'finishLecture',
       payload: {
         name: documentTitle,
         text: text,
@@ -269,8 +268,10 @@ var WriterPuzzleComponent = function WriterPuzzleComponent(_ref) {
     var pointsToEmit = [];
 
     if (failed) {
+      playSound('fail');
       pointsToEmit = accumulatedRewards;
     } else {
+      playSound(AllDecisionsCorrect ? 'score' : 'fail');
       pointsToEmit = AllDecisionsCorrect ? rightRewards : wrongRewards;
     }
 

package/dist/components/writer-puzzle-component/mocks/mockForStory.js

@@ -83,6 +83,7 @@ var messages = {
 exports.messages = messages;
 var mock = {
   emitEvent: emitEvent,
+  soundActions: [function () {}, function () {}],
   texts: [{
     type: 'fixed',
     fullText: messages.fullText1

package/dist/helpers/deviceDetection.js

@@ -0,0 +1,13 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.DeviceDetection = void 0;
+
+var DeviceDetection = function DeviceDetection() {
+  return navigator.userAgent.match(/(android)/i) || ['iPad Simulator', 'iPhone Simulator', 'iPod Simulator', 'iPad', 'iPhone', 'iPod'].includes(navigator.platform) || // iPad on iOS 13 detection
+  navigator.userAgent.includes('Mac') && 'ontouchend' in document;
+};
+
+exports.DeviceDetection = DeviceDetection;

package/dist/helpers/drawLOD.js

@@ -111,7 +111,7 @@ var materialize = function materialize(params, lod) {
     if (doneLods >= totalLods) {
       if (progressiveMode) {
         var currentIndex = progressiveOrder.indexOf(lod);
-        var lastIndex = progressiveOrder.indexOf(currentLOD);
+        var lastIndex = progressiveOrder.indexOf(params._currentLOD);
 
         if (currentIndex < lastIndex) {
           materialize(params, progressiveOrder[currentIndex + 1]);
@@ -132,7 +132,7 @@ var materialize = function materialize(params, lod) {
       return response.json();
     }).then(function (materials) {
       elem.traverse(function (obj) {
-        if ((obj.isMesh || obj.isSkinnedMesh) && (!obj.material._isDone || !obj.material._isDone[lod])) {
+        if ((obj.isMesh || obj.isSkinnedMesh) && (!obj.material._isDone || !obj.material._isDone[lod] || params._forceRender)) {
           obj.material.wireframe = false;
           if (!obj.material._isDone) obj.material._isDone = {};
           obj.material._isDone[lod] = true;
@@ -141,13 +141,13 @@ var materialize = function materialize(params, lod) {
             materials[obj.material.name].forEach(function (item) {
               var imgSrc = "".concat(elem.userData.url, ".textures.").concat(lod, ".").concat(item.positionInArray, ".png");
               imgLoader.load(imgSrc, function (result) {
-                if (showStats) {
+                if (params._showStats) {
                   statsTextures(lod, imgSrc, result);
                 }
 
                 obj.material[item.key].image = result;
 
-                if (rgbSimulation) {
+                if (params._rgbSimulation) {
                   var image;
 
                   switch (lod) {
@@ -188,7 +188,7 @@ var updateSceneLods = function updateSceneLods(params) {
     if (progressiveMode) {
       materialize(params, progressiveOrder[0]);
     } else {
-      materialize(params, currentLOD);
+      materialize(params, params._currentLOD);
     }
   }
 };
@@ -201,7 +201,7 @@ var invalidateOutOfFrustum = function invalidateOutOfFrustum(params) {
 
     elem.bbox = bbox;
 
-    if (showHelpers) {
+    if (params._showHelpers) {
       var boundingHelper = new THREE.Box3Helper(bbox, insideFrustum ? 0x00ff00 : 0xff0000);
 
       params._helpers.add(boundingHelper);
@@ -219,7 +219,7 @@ var checkDistances = function checkDistances(params) {
     var distance = params._camera.position.distanceTo(center) - bsphere.radius;
     elem.distanceToCam = distance;
 
-    if (showHelpers) {
+    if (params._showHelpers) {
       var sphere = new THREE.Mesh(new THREE.SphereGeometry(bsphere.radius, 32, 32), new THREE.MeshStandardMaterial({
         color: 0xffffff,
         opacity: 0.3,
@@ -277,7 +277,7 @@ var setTexturableElements = function setTexturableElements(params) {
     reset: true
   });
 
-  if (showStats) {
+  if (params._showStats) {
     statsGeometries(params);
   }
 };
@@ -292,7 +292,7 @@ var getHelpers = function getHelpers(scene) {
   return helper;
 };
 
-var drawLOD = function drawLOD(scene, camera) {
+var drawLOD = function drawLOD(scene, camera, settings) {
   var currentCamera = camera;
 
   if (!currentCamera.parent) {
@@ -306,6 +306,12 @@ var drawLOD = function drawLOD(scene, camera) {
   }
 
   var params = {};
+  params._currentLOD = settings !== null && settings !== void 0 && settings.currentLOD ? settings.currentLOD : currentLOD;
+  params._rgbSimulation = settings !== null && settings !== void 0 && settings.rgbSimulation ? settings.rgbSimulation : rgbSimulation;
+  params._showHelpers = settings !== null && settings !== void 0 && settings.showHelpers ? settings.showHelpers : showHelpers;
+  params._showStats = settings !== null && settings !== void 0 && settings.showStats ? settings.showStats : showStats;
+  params._forceRender = (scene === null || scene === void 0 ? void 0 : scene.lastLOD) !== (settings === null || settings === void 0 ? void 0 : settings.currentLOD);
+  scene.lastLOD = settings === null || settings === void 0 ? void 0 : settings.currentLOD;
   params._texturesFrustum = texturesFrustum;
   params._texturesDistance = texturesDistance;
   params._scene = scene;
@@ -333,7 +339,7 @@ var drawLOD = function drawLOD(scene, camera) {
       params._texturesFrustum = params._texturesDistance = false;
     }
 
-    if (showHelpers) {
+    if (params._showHelpers) {
       var helper = new THREE.CameraHelper(params._camera.clone());
 
       params._helpers.add(helper);

package/dist/helpers/index.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getObjectPosition = exports.cameraFitAnyObject = exports.usePrevious = exports.formatMessage = void 0;
+exports.getObjectPosition = exports.cameraFitAnyObject = exports.roundFloat = exports.usePrevious = exports.formatMessage = void 0;
 
 var _react = require("react");
 
@@ -30,6 +30,12 @@ var usePrevious = function usePrevious(value) {
 
 exports.usePrevious = usePrevious;
 
+var roundFloat = function roundFloat(number, decimals) {
+  return parseFloat(number.toFixed(decimals));
+};
+
+exports.roundFloat = roundFloat;
+
 var cameraFitAnyObject = function cameraFitAnyObject(object, camera) {
   var uOff = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : null;
   var controls = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : null;

package/dist/helpers/useWindowSize.js

@@ -0,0 +1,56 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.useWindowSize = void 0;
+
+var _react = require("react");
+
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
+
+function _iterableToArrayLimit(arr, i) { var _i = arr && (typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]); if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
+
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+
+function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
+
+// Hook
+var useWindowSize = function useWindowSize() {
+  var isClient = (typeof window === "undefined" ? "undefined" : _typeof(window)) === 'object';
+
+  var _useState = (0, _react.useState)({
+    width: isClient ? window.innerWidth : undefined,
+    height: isClient ? window.innerHeight : undefined
+  }),
+      _useState2 = _slicedToArray(_useState, 2),
+      windowSize = _useState2[0],
+      setWindowSize = _useState2[1];
+
+  (0, _react.useEffect)(function () {
+    if (!isClient) {
+      return false;
+    }
+
+    function handleResize() {
+      setWindowSize({
+        width: isClient ? window.innerWidth : undefined,
+        height: isClient ? window.innerHeight : undefined
+      });
+    }
+
+    window.addEventListener('resize', handleResize);
+    return function () {
+      return window.removeEventListener('resize', handleResize);
+    };
+  }, [isClient]);
+  return windowSize;
+};
+
+exports.useWindowSize = useWindowSize;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@gamelearn/arcade-components",
   "license": "Gamelearn",
-  "version": "0.11.2",
+  "version": "0.14.0",
   "main": "dist/index.js",
   "files": [
     "dist",
@@ -12,8 +12,8 @@
     "url": "https://github.com/gamelearn/arcade-components"
   },
   "dependencies": {
-    "@react-three/drei": "^5.3.1",
-    "@react-three/fiber": "6.0.16",
+    "@react-three/drei": "^6.1.1",
+    "@react-three/fiber": "^7.0.1",
     "@testing-library/jest-dom": "5.11.4",
     "@testing-library/react": "11.1.0",
     "@testing-library/user-event": "12.1.10",