@gamelearn/arcade-components 0.27.2 → 0.27.4

package/dist/components/decision-component/components/DecisionComponent.js

@@ -95,7 +95,7 @@ var DecisionComponent = function DecisionComponent(_ref) {
   var listProps = _objectSpread(_objectSpread({}, inheritProps), {}, {
     slots: inheritProps.slots ? inheritProps.slots : inheritProps.characters,
     currentMessage: {
-      position: -1,
+      position: null,
       emotion: ''
     }
   });

package/dist/components/dialog-component/components/DialogComponent.js

@@ -58,6 +58,9 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 var isMobile = (0, _deviceDetection.DeviceDetection)();
 var crossFadeDuration = 0.5; // Mobile always zoom in?
 
+var raycast = new _three.Raycaster();
+raycast.firstHitOnly = true;
+
 var DialogComponent = function DialogComponent(_ref) {
   var _currentLine$audio3, _currentLine$audio4;
 
@@ -100,6 +103,7 @@ var DialogComponent = function DialogComponent(_ref) {
       camera = _useThree2[0],
       scene = _useThree2[1];
 
+  var changedMats = (0, _react.useRef)([]);
   var loader = (0, _react.useMemo)(function () {
     return new _GLTFLoader.GLTFLoader();
   }, []);
@@ -207,10 +211,10 @@ var DialogComponent = function DialogComponent(_ref) {
 
     var onLoadAnim = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : function () {};
     var animation = (_slot$character2 = slot.character) === null || _slot$character2 === void 0 ? void 0 : _slot$character2.resource.animations[slot.emotion];
+    var mixer = element.userData.mixer;
 
-    if (animation) {
-      var mixer = element.userData.mixer;
-      loader.load(animation === null || animation === void 0 ? void 0 : animation.url, function (anim) {
+    if (animation && animation.url) {
+      loader.load(animation.url, function (anim) {
         var emotionClip = anim.animations[0];
         var defaultClip = element.userData.defaultAnim;
         var emotionAction = mixer.clipAction(emotionClip, element);
@@ -223,6 +227,8 @@ var DialogComponent = function DialogComponent(_ref) {
         element.userData.currentEmotion = emotionAction;
         onLoadAnim(mixer, emotionAction, defaultAction);
       });
+    } else {
+      onLoadAnim();
     }
   }, [loader]); // Reset currentEmotion to defaultAnim
 
@@ -325,7 +331,7 @@ var DialogComponent = function DialogComponent(_ref) {
           loadEmotion(slot, element, function (mixer, action, defaultAction) {
             var startAction = element.userData.lastEmotion ? element.userData.lastEmotion : defaultAction;
 
-            if (startAction !== action) {
+            if (startAction && action && startAction !== action) {
               mixer.stopAllAction();
               (0, _helpers.executeCrossFade)(startAction, action, crossFadeDuration);
             }
@@ -343,7 +349,7 @@ var DialogComponent = function DialogComponent(_ref) {
           loadEmotion(talkingCharacter, element, function (mixer, action, defaultAction) {
             var startAction = element.userData.lastEmotion ? element.userData.lastEmotion : defaultAction;
 
-            if (startAction !== action) {
+            if (startAction && action && startAction !== action) {
               mixer.stopAllAction();
               (0, _helpers.executeCrossFade)(startAction, action, crossFadeDuration);
             } // Ugly timeout to wait an animation transition
@@ -423,7 +429,7 @@ var DialogComponent = function DialogComponent(_ref) {
       if (line >= lines.length - 1 && automatic) {
         setAutomatic(false);
       } else if (automatic && currentMessage.text && !currentLine.decision) {
-        var time = 70 * (currentMessage === null || currentMessage === void 0 ? void 0 : currentMessage.text.length);
+        var time = 75 * (currentMessage === null || currentMessage === void 0 ? void 0 : currentMessage.text.length);
         timeout = setTimeout(function () {
           nextLine();
         }, time < 1400 ? 1400 : time);
@@ -494,13 +500,25 @@ var DialogComponent = function DialogComponent(_ref) {
           animationTarget.current.applyQuaternion(camera.quaternion);
         }
 
-        animationTarget.current.translateX(13);
+        animationTarget.current.translateX(12);
         animationTarget.current.translateY(-5);
         animationTarget.current.translateZ(30);
       }
 
       if (animationTarget.current.position.distanceTo(camera.position) < 1) {
         animationStart.current = false;
+        raycast.set(camera.getWorldPosition(new _three.Vector3(0, 0, 0)), camera.getWorldDirection(new _three.Vector3()));
+        var objects = raycast.intersectObjects(scene.children, true);
+        changedMats.current = objects.filter(function (o) {
+          return o.distance < 10;
+        });
+
+        if (changedMats.current.length) {
+          changedMats.current.forEach(function (o) {
+            var object = o.object;
+            object.material.visible = false;
+          });
+        }
 
         if (lastSet.current || !messagePosition.current.child) {
           camera.copy(defaultCamera.current);
@@ -508,6 +526,13 @@ var DialogComponent = function DialogComponent(_ref) {
 
         checkBubblePosition();
       } else {
+        if (changedMats.current.length) {
+          changedMats.current.forEach(function (o) {
+            var object = o.object;
+            object.material.visible = true;
+          });
+        }
+
         camera.position.lerp(animationTarget.current.position, delta * 2.5);
       }
     }

package/package.json

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