@gamelearn/arcade-components 0.11.1 → 0.11.2

package/dist/components/arcade-render/background/scene-elements/index.js

@@ -51,7 +51,16 @@ var SceneElements = function SceneElements(_ref) {
     if ((_object$userData = object.userData) !== null && _object$userData !== void 0 && _object$userData.isPrimitive) {
       return /*#__PURE__*/_react.default.createElement("mesh", _extends({
         key: object.uid || i
-      }, object), /*#__PURE__*/_react.default.createElement(_customGeometry.default, {
+      }, object, {
+        onBeforeRender: function onBeforeRender() {
+          _three.DefaultLoadingManager.onStart(1, 0, 1);
+        },
+        onAfterRender: function onAfterRender() {
+          _three.DefaultLoadingManager.onProgress(1, 1, 1);
+
+          _three.DefaultLoadingManager.onLoad();
+        }
+      }), /*#__PURE__*/_react.default.createElement(_customGeometry.default, {
         type: object.userData.primitiveType,
         args: object.userData.props
       }), /*#__PURE__*/_react.default.createElement("meshLambertMaterial", material));

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

@@ -51,6 +51,10 @@ var ClickableArea = function ClickableArea(_ref) {
       loaded = _useState2[0],
       setLoaded = _useState2[1];
 
+  if (usingScale.length === 2) {
+    usingScale.push(1);
+  }
+
   (0, _react.useEffect)(function () {
     setLoaded(true);
   }, []);

package/dist/components/arcade-render/scene/ConfigController.js

@@ -0,0 +1,56 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var _react = require("react");
+
+var _fiber = require("@react-three/fiber");
+
+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; }
+
+var ConfigController = function ConfigController(_ref) {
+  var current = _ref.current;
+
+  var _useThree = (0, _fiber.useThree)(function (state) {
+    return [state.gl, state.scene, state.invalidate];
+  }),
+      _useThree2 = _slicedToArray(_useThree, 3),
+      gl = _useThree2[0],
+      scene = _useThree2[1],
+      invalidate = _useThree2[2];
+
+  (0, _fiber.useFrame)(function (_ref2) {
+    var gl = _ref2.gl,
+        scene = _ref2.scene,
+        camera = _ref2.camera;
+    gl.render(scene, camera);
+
+    if (!current.animate) {
+      invalidate();
+    }
+  }, 1);
+  (0, _react.useEffect)(function () {
+    gl.shadowMap.enabled = current.shadows;
+
+    if (!current.animate) {
+      invalidate();
+    }
+  }, [gl, scene, current, invalidate]);
+  return null;
+};
+
+var _default = ConfigController;
+exports.default = _default;

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

@@ -19,6 +19,8 @@ var _background = _interopRequireDefault(require("../background"));
 
 var _loading = _interopRequireWildcard(require("../loading"));
 
+var _ConfigController = _interopRequireDefault(require("./ConfigController"));
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 function _getRequireWildcardCache() { if (typeof WeakMap !== "function") return null; var cache = new WeakMap(); _getRequireWildcardCache = function _getRequireWildcardCache() { return cache; }; return cache; }
@@ -37,61 +39,30 @@ function _iterableToArrayLimit(arr, i) { var _i = arr && (typeof Symbol !== "und
 
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
-var ConfigController = function ConfigController(_ref) {
-  var current = _ref.current;
-
-  var _useThree = (0, _fiber.useThree)(function (state) {
-    return [state.gl, state.scene, state.invalidate];
-  }),
-      _useThree2 = _slicedToArray(_useThree, 3),
-      gl = _useThree2[0],
-      scene = _useThree2[1],
-      invalidate = _useThree2[2];
-
-  (0, _fiber.useFrame)(function (_ref2) {
-    var gl = _ref2.gl,
-        scene = _ref2.scene,
-        camera = _ref2.camera;
-    gl.render(scene, camera);
-
-    if (!current.animate) {
-      invalidate();
-    }
-  }, 1);
-  (0, _react.useEffect)(function () {
-    gl.shadowMap.enabled = current.shadows;
-
-    if (!current.animate) {
-      invalidate();
-    }
-  }, [gl, scene, current, invalidate]);
-  return null;
-};
-
-var Scene = function Scene(_ref3) {
-  var _ref3$elements = _ref3.elements,
-      elements = _ref3$elements === void 0 ? [] : _ref3$elements,
-      _ref3$hasControls = _ref3.hasControls,
-      hasControls = _ref3$hasControls === void 0 ? false : _ref3$hasControls,
-      _ref3$backgroundData = _ref3.backgroundData,
-      backgroundData = _ref3$backgroundData === void 0 ? {} : _ref3$backgroundData,
-      _ref3$loadingText = _ref3.loadingText,
-      loadingText = _ref3$loadingText === void 0 ? '' : _ref3$loadingText,
-      _ref3$toggleShadows = _ref3.toggleShadows,
-      toggleShadows = _ref3$toggleShadows === void 0 ? true : _ref3$toggleShadows,
-      _ref3$stopAnimate = _ref3.stopAnimate,
-      stopAnimate = _ref3$stopAnimate === void 0 ? false : _ref3$stopAnimate,
-      _ref3$emitEvent = _ref3.emitEvent,
-      emitEvent = _ref3$emitEvent === void 0 ? function () {} : _ref3$emitEvent;
+var Scene = function Scene(_ref) {
+  var _ref$elements = _ref.elements,
+      elements = _ref$elements === void 0 ? [] : _ref$elements,
+      _ref$hasControls = _ref.hasControls,
+      hasControls = _ref$hasControls === void 0 ? false : _ref$hasControls,
+      _ref$backgroundData = _ref.backgroundData,
+      backgroundData = _ref$backgroundData === void 0 ? {} : _ref$backgroundData,
+      _ref$loadingText = _ref.loadingText,
+      loadingText = _ref$loadingText === void 0 ? '' : _ref$loadingText,
+      _ref$toggleShadows = _ref.toggleShadows,
+      toggleShadows = _ref$toggleShadows === void 0 ? true : _ref$toggleShadows,
+      _ref$stopAnimate = _ref.stopAnimate,
+      stopAnimate = _ref$stopAnimate === void 0 ? false : _ref$stopAnimate,
+      _ref$emitEvent = _ref.emitEvent,
+      emitEvent = _ref$emitEvent === void 0 ? function () {} : _ref$emitEvent;
 
   var _useState = (0, _react.useState)(true),
       _useState2 = _slicedToArray(_useState, 2),
       showLoad = _useState2[0],
       setShowLoad = _useState2[1];
 
-  var handleOnCreate = function handleOnCreate(_ref4) {
-    var gl = _ref4.gl,
-        raycaster = _ref4.raycaster;
+  var handleOnCreate = function handleOnCreate(_ref2) {
+    var gl = _ref2.gl,
+        raycaster = _ref2.raycaster;
     raycaster.layers.set(1);
     gl.outputEncoding = 3001;
     gl.gammaFactor = 2.2;
@@ -101,13 +72,12 @@ var Scene = function Scene(_ref3) {
     gl.physicallyCorrectLights = true;
   };
 
-  var handleLoadFinish = function handleLoadFinish() {
+  var handleLoadFinish = (0, _react.useCallback)(function () {
     emitEvent({
       type: 'sceneLoaded'
     });
     setShowLoad(false);
-  };
-
+  }, [emitEvent]);
   (0, _react.useEffect)(function () {
     setShowLoad(true);
   }, [backgroundData, elements]);
@@ -126,7 +96,7 @@ var Scene = function Scene(_ref3) {
     frameloop: "demand",
     onCreated: handleOnCreate,
     tabIndex: 0
-  }, /*#__PURE__*/_react.default.createElement(ConfigController, {
+  }, /*#__PURE__*/_react.default.createElement(_ConfigController.default, {
     current: {
       shadows: toggleShadows,
       animate: stopAnimate

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@gamelearn/arcade-components",
   "license": "Gamelearn",
-  "version": "0.11.1",
+  "version": "0.11.2",
   "main": "dist/index.js",
   "files": [
     "dist",
@@ -55,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.21.0",
+    "@gamelearn/ui-components-core": "5.22.0",
     "@react-three/test-renderer": "6.0.6",
     "@storybook/addon-actions": "6.1.11",
     "@storybook/addon-essentials": "6.1.11",