@gamelearn/arcade-components 0.6.3 → 0.7.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/README.md CHANGED
@@ -48,6 +48,38 @@ Para añadir un componente nuevo se recomienda usar el generador automático que
48
48
 
49
49
  `yarn generate`
50
50
 
51
+ ## How to link arcade-components in other repos (WIP)
52
+
53
+ Para trabajar con arcade-components en local si necesidad de subir a git ni a npm no podemos trabajar con `yarn link` ya que da un error con los hooks de react.
54
+
55
+ Cómo solución alternativa podemos instalar `yalc` que permite publicar el paquete en local e importarlo desde `arcade`.
56
+
57
+ ```bash
58
+ yarn global add yalc
59
+ ```
60
+
61
+ Para generar el paquete en el store local:
62
+
63
+ ```bash
64
+ yarn
65
+ yarn compile
66
+ yalc publish
67
+ ```
68
+
69
+ Después, en el repositorio de `arcade-components` tendremos que linkar el paquete generado de la siguiente forma:
70
+
71
+ ```bash
72
+ yalc link @gamelearn/arcade-components
73
+ ```
74
+
75
+ Y voilá, ya podremos trabajar con arcade y arcade-components en local sin publicar nada.
76
+
77
+ Una vez terminemos de trabajar con el paquete linkado en `arcade`, no nos olvidemos de borrar el link:
78
+
79
+ ```bash
80
+ yalc remove --all
81
+ ```
82
+
51
83
  ## License
52
84
 
53
85
  UNLICENSED © [gamelearn](https://github.com/gamelearn)
@@ -11,6 +11,8 @@ var _react = _interopRequireWildcard(require("react"));
11
11
 
12
12
  var _fiber = require("@react-three/fiber");
13
13
 
14
+ var _drei = require("@react-three/drei");
15
+
14
16
  var _AnimateElement = _interopRequireDefault(require("./AnimateElement"));
15
17
 
16
18
  var _SkeletonUtils = require("three/examples/jsm/utils/SkeletonUtils");
@@ -61,7 +63,8 @@ var Element = function Element(_ref) {
61
63
  type = _ref.type,
62
64
  _ref$onLoad = _ref.onLoad,
63
65
  onLoad = _ref$onLoad === void 0 ? function () {} : _ref$onLoad,
64
- props = _objectWithoutProperties(_ref, ["url", "animationUrl", "position", "rotation", "scale", "size", "material", "layers", "type", "onLoad"]);
66
+ userData = _ref.userData,
67
+ props = _objectWithoutProperties(_ref, ["url", "animationUrl", "position", "rotation", "scale", "size", "material", "layers", "type", "onLoad", "userData"]);
65
68
 
66
69
  var _useGLB = (0, _useGLB2.default)(url),
67
70
  scene = _useGLB.scene;
@@ -93,7 +96,14 @@ var Element = function Element(_ref) {
93
96
  node.castShadow = true;
94
97
  node.material.roughness = 0.7;
95
98
  node.material.metalness = 0.5;
96
- if (isCharacter) node.frustumCulled = false;
99
+
100
+ if (isCharacter) {
101
+ node.frustumCulled = false;
102
+ }
103
+
104
+ if (layers > 0) {
105
+ node.layers.set(layers);
106
+ }
97
107
 
98
108
  if (node.isSkinnedMesh) {
99
109
  node.material.skinned = true;
@@ -103,10 +113,6 @@ var Element = function Element(_ref) {
103
113
  (0, _fiber.applyProps)(node.material, material);
104
114
  }
105
115
 
106
- if (layers > 0) {
107
- node.layers.set(layers);
108
- }
109
-
110
116
  if (node.material.map) node.material.map.encoding = _three.sRGBEncoding;
111
117
  if (node.material.emissiveMap) node.material.emissiveMap.encoding = _three.sRGBEncoding;
112
118
  node.material.needsUpdate = true;
@@ -120,12 +126,14 @@ var Element = function Element(_ref) {
120
126
  model: model,
121
127
  position: position,
122
128
  rotation: rotation,
123
- scale: usingScale
129
+ scale: usingScale,
130
+ raycast: _drei.meshBounds
124
131
  }, props)) : /*#__PURE__*/_react.default.createElement("primitive", _extends({
125
132
  object: model,
126
133
  position: position,
127
134
  rotation: rotation,
128
- scale: usingScale
135
+ scale: usingScale,
136
+ raycast: _drei.meshBounds
129
137
  }, props)), props.uid && /*#__PURE__*/_react.default.createElement(_Projection.default, {
130
138
  object: model,
131
139
  element: props
@@ -97,6 +97,7 @@ var Scene = function Scene(_ref3) {
97
97
  gl.gammaFactor = 2.2;
98
98
  gl.setClearColor(0xcccccc);
99
99
  gl.setPixelRatio(window.devicePixelRatio);
100
+ gl.setSize(window.innerWidth, window.innerHeight);
100
101
  gl.physicallyCorrectLights = true;
101
102
  };
102
103
 
@@ -9,11 +9,9 @@ exports.default = void 0;
9
9
 
10
10
  var _react = _interopRequireWildcard(require("react"));
11
11
 
12
- var _propTypes = _interopRequireDefault(require("prop-types"));
13
-
14
12
  var _Board = _interopRequireDefault(require("./Board"));
15
13
 
16
- var _Feedback = _interopRequireDefault(require("./Feedback"));
14
+ var _FeedbackComponent = _interopRequireDefault(require("../../feedback-component/components/FeedbackComponent"));
17
15
 
18
16
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
19
17
 
@@ -58,7 +56,7 @@ var CardsSelectorPuzzleComponent = function CardsSelectorPuzzleComponent(_ref) {
58
56
  currentOrder = _useState4[0],
59
57
  setCurrentOrder = _useState4[1];
60
58
 
61
- var _useState5 = (0, _react.useState)(''),
59
+ var _useState5 = (0, _react.useState)(false),
62
60
  _useState6 = _slicedToArray(_useState5, 2),
63
61
  feedbackResult = _useState6[0],
64
62
  setFeedbackResult = _useState6[1];
@@ -78,9 +76,16 @@ var CardsSelectorPuzzleComponent = function CardsSelectorPuzzleComponent(_ref) {
78
76
  resolvePuzzle = _useState12[0],
79
77
  setResolvePuzzle = _useState12[1];
80
78
 
79
+ var _useState13 = (0, _react.useState)(''),
80
+ _useState14 = _slicedToArray(_useState13, 2),
81
+ feedBackText = _useState14[0],
82
+ setFeedBackText = _useState14[1];
83
+
81
84
  var _endPuzzle = function endPuzzle() {
85
+ setFeedbackResult(true);
86
+ setFeedBackText(info.solution.right.desc);
87
+ setFeedbackIsShown(true);
82
88
  setFinished(true);
83
- setFeedbackResult('success');
84
89
  var rewards = info.solution.right.rewards;
85
90
  var rewardsData = [].concat(_toConsumableArray(accRewards), _toConsumableArray(rewards));
86
91
  setTimeout(function () {
@@ -92,11 +97,13 @@ var CardsSelectorPuzzleComponent = function CardsSelectorPuzzleComponent(_ref) {
92
97
  };
93
98
 
94
99
  var _handleError = function handleError() {
95
- setFeedbackResult('failed');
100
+ setFeedbackResult(false);
101
+ setFeedBackText(info.solution.wrong.desc);
102
+ setFeedbackIsShown(true);
96
103
  disableExit(true);
97
104
  setRewards([].concat(_toConsumableArray(accRewards), _toConsumableArray(info.solution.wrong.rewards)));
98
105
  setTimeout(function () {
99
- setFeedbackResult('');
106
+ setFeedbackResult(false);
100
107
  disableExit(false);
101
108
  setFeedbackIsShown(false);
102
109
  }, 3000);
@@ -134,10 +141,9 @@ var CardsSelectorPuzzleComponent = function CardsSelectorPuzzleComponent(_ref) {
134
141
  },
135
142
  feedbackIsShown: feedbackIsShown,
136
143
  resolvePuzzle: resolvePuzzle
137
- })), /*#__PURE__*/_react.default.createElement(_Feedback.default, {
138
- feedbackResult: feedbackResult,
139
- setFeedbackIsShown: setFeedbackIsShown,
140
- info: info
144
+ })), feedbackIsShown && /*#__PURE__*/_react.default.createElement(_FeedbackComponent.default, {
145
+ success: feedbackResult,
146
+ text: feedBackText
141
147
  }));
142
148
  };
143
149
 
@@ -145,20 +151,5 @@ CardsSelectorPuzzleComponent.defaultProps = {
145
151
  cards: [],
146
152
  info: {}
147
153
  };
148
- CardsSelectorPuzzleComponent.propTypes = {
149
- cards: _propTypes.default.arrayOf(_propTypes.default.shape),
150
- info: _propTypes.default.shape({
151
- solution: _propTypes.default.shape({
152
- right: _propTypes.default.shape({
153
- rewards: _propTypes.default.arrayOf(_propTypes.default.shape),
154
- desc: _propTypes.default.string
155
- }),
156
- wrong: _propTypes.default.shape({
157
- desc: _propTypes.default.string,
158
- rewards: _propTypes.default.arrayOf(_propTypes.default.shape)
159
- })
160
- })
161
- })
162
- };
163
154
  var _default = CardsSelectorPuzzleComponent;
164
155
  exports.default = _default;
@@ -31,7 +31,9 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
31
31
 
32
32
  var ComicComponent = function ComicComponent(_ref) {
33
33
  var slides = _ref.slides,
34
- emitEvent = _ref.emitEvent;
34
+ emitEvent = _ref.emitEvent,
35
+ _ref$soundActions = _ref.soundActions,
36
+ soundActions = _ref$soundActions === void 0 ? [function () {}, function () {}] : _ref$soundActions;
35
37
 
36
38
  var _useState = (0, _react.useState)(0),
37
39
  _useState2 = _slicedToArray(_useState, 2),
@@ -73,7 +75,8 @@ var ComicComponent = function ComicComponent(_ref) {
73
75
  }, /*#__PURE__*/_react.default.createElement(_Slide.default, {
74
76
  key: "comic page ".concat(slides[slideCount].slideOrder),
75
77
  slide: slides[slideCount],
76
- transition: slideTransition
78
+ transition: slideTransition,
79
+ soundActions: soundActions
77
80
  }), /*#__PURE__*/_react.default.createElement("div", {
78
81
  className: classControls
79
82
  }, slideCount > 0 && /*#__PURE__*/_react.default.createElement("button", {
@@ -11,8 +11,6 @@ var _react = _interopRequireWildcard(require("react"));
11
11
 
12
12
  var _Vignette = _interopRequireDefault(require("./Vignette"));
13
13
 
14
- var _useSound3 = _interopRequireDefault(require("use-sound"));
15
-
16
14
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
17
15
 
18
16
  function _getRequireWildcardCache() { if (typeof WeakMap !== "function") return null; var cache = new WeakMap(); _getRequireWildcardCache = function _getRequireWildcardCache() { return cache; }; return cache; }
@@ -32,16 +30,14 @@ function _iterableToArrayLimit(arr, i) { var _i = arr && (typeof Symbol !== "und
32
30
  function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
33
31
 
34
32
  var Slide = function Slide(_ref) {
35
- var _slide$audio;
36
-
37
33
  var slide = _ref.slide,
38
- transition = _ref.transition;
34
+ transition = _ref.transition,
35
+ soundActions = _ref.soundActions;
39
36
  var slideTransition = slide.transitionEffects || transition;
40
37
 
41
- var _useSound = (0, _useSound3.default)(slide === null || slide === void 0 ? void 0 : (_slide$audio = slide.audio) === null || _slide$audio === void 0 ? void 0 : _slide$audio.url),
42
- _useSound2 = _slicedToArray(_useSound, 2),
43
- play = _useSound2[0],
44
- stop = _useSound2[1].stop;
38
+ var _soundActions = _slicedToArray(soundActions, 2),
39
+ playSound = _soundActions[0],
40
+ stop = _soundActions[1];
45
41
 
46
42
  var _useState = (0, _react.useState)(false),
47
43
  _useState2 = _slicedToArray(_useState, 2),
@@ -55,11 +51,13 @@ var Slide = function Slide(_ref) {
55
51
  };
56
52
  }, []);
57
53
  (0, _react.useEffect)(function () {
58
- isMounted && play();
54
+ var _slide$audio;
55
+
56
+ isMounted && playSound(slide === null || slide === void 0 ? void 0 : (_slide$audio = slide.audio) === null || _slide$audio === void 0 ? void 0 : _slide$audio.url);
59
57
  return function () {
60
58
  stop();
61
59
  };
62
- }, [play, stop, isMounted]);
60
+ }, [playSound, stop, slide, isMounted]);
63
61
  return /*#__PURE__*/_react.default.createElement("div", {
64
62
  className: "comic--slide__item ".concat(slideTransition)
65
63
  }, slide.vignettes.map(function (vignette) {
@@ -9,10 +9,6 @@ exports.default = void 0;
9
9
 
10
10
  var _react = _interopRequireWildcard(require("react"));
11
11
 
12
- var _propTypes = _interopRequireDefault(require("prop-types"));
13
-
14
- var _useSound3 = _interopRequireDefault(require("use-sound"));
15
-
16
12
  var _SlotList = _interopRequireDefault(require("./SlotList"));
17
13
 
18
14
  var _Message = _interopRequireDefault(require("./Message"));
@@ -46,22 +42,22 @@ function _iterableToArrayLimit(arr, i) { var _i = arr && (typeof Symbol !== "und
46
42
  function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
47
43
 
48
44
  var ConversationProViewer = function ConversationProViewer(_ref) {
49
- var _lines$currentLine, _lines$currentLine$au, _background$img;
45
+ var _background$img;
50
46
 
51
47
  var emitEvent = _ref.emitEvent,
52
48
  lines = _ref.lines,
53
49
  characters = _ref.characters,
54
- background = _ref.background;
50
+ background = _ref.background,
51
+ soundActions = _ref.soundActions;
55
52
 
56
53
  var _useState = (0, _react.useState)(0),
57
54
  _useState2 = _slicedToArray(_useState, 2),
58
55
  currentLine = _useState2[0],
59
56
  setCurrentLine = _useState2[1];
60
57
 
61
- var _useSound = (0, _useSound3.default)((_lines$currentLine = lines[currentLine]) === null || _lines$currentLine === void 0 ? void 0 : (_lines$currentLine$au = _lines$currentLine.audio) === null || _lines$currentLine$au === void 0 ? void 0 : _lines$currentLine$au.url),
62
- _useSound2 = _slicedToArray(_useSound, 2),
63
- play = _useSound2[0],
64
- stop = _useSound2[1].stop;
58
+ var _soundActions = _slicedToArray(soundActions, 2),
59
+ playSound = _soundActions[0],
60
+ stop = _soundActions[1];
65
61
 
66
62
  var backgroundImage = (background === null || background === void 0 ? void 0 : (_background$img = background.img) === null || _background$img === void 0 ? void 0 : _background$img.url) || null;
67
63
  var currentLineData = lines[currentLine];
@@ -155,11 +151,13 @@ var ConversationProViewer = function ConversationProViewer(_ref) {
155
151
  };
156
152
 
157
153
  (0, _react.useEffect)(function () {
158
- play();
154
+ var _lines$currentLine, _lines$currentLine$au;
155
+
156
+ playSound((_lines$currentLine = lines[currentLine]) === null || _lines$currentLine === void 0 ? void 0 : (_lines$currentLine$au = _lines$currentLine.audio) === null || _lines$currentLine$au === void 0 ? void 0 : _lines$currentLine$au.url);
159
157
  return function () {
160
158
  stop();
161
159
  };
162
- }, [currentLine, play, stop]);
160
+ }, [currentLine, lines, playSound, stop]);
163
161
 
164
162
  var decisionPayload = _objectSpread(_objectSpread({}, currentLineData.payload), {}, {
165
163
  onFinish: handleClickNext,
@@ -207,20 +205,10 @@ var ConversationProViewer = function ConversationProViewer(_ref) {
207
205
  }))))));
208
206
  };
209
207
 
210
- ConversationProViewer.propTypes = {
211
- emitEvent: _propTypes.default.func,
212
- background: _propTypes.default.shape({}),
213
- lines: _propTypes.default.arrayOf(_propTypes.default.shape({})).isRequired,
214
- characters: _propTypes.default.arrayOf(_propTypes.default.shape({
215
- character: _propTypes.default.string,
216
- emotion: _propTypes.default.string,
217
- slot: _propTypes.default.number,
218
- text: _propTypes.default.string
219
- })).isRequired
220
- };
221
208
  ConversationProViewer.defaultProps = {
222
209
  background: {},
223
- emitEvent: function emitEvent() {}
210
+ emitEvent: function emitEvent() {},
211
+ soundActions: [function () {}, function () {}]
224
212
  };
225
213
  var _default = ConversationProViewer;
226
214
  exports.default = _default;
@@ -9,18 +9,19 @@ exports.default = void 0;
9
9
 
10
10
  var _react = _interopRequireWildcard(require("react"));
11
11
 
12
- var _propTypes = _interopRequireDefault(require("prop-types"));
13
-
14
- function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
15
-
16
12
  function _getRequireWildcardCache() { if (typeof WeakMap !== "function") return null; var cache = new WeakMap(); _getRequireWildcardCache = function _getRequireWildcardCache() { return cache; }; return cache; }
17
13
 
18
14
  function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
19
15
 
20
- var Feedback = function Feedback(_ref) {
16
+ var FeedbackComponent = function FeedbackComponent(_ref) {
21
17
  var text = _ref.text,
22
18
  success = _ref.success,
23
- playSound = _ref.playSound;
19
+ playSound = _ref.playSound,
20
+ additionalStyle = _ref.additionalStyle,
21
+ functionOnClose = _ref.functionOnClose,
22
+ secondText = _ref.secondText,
23
+ _ref$puzzleHeaderClas = _ref.puzzleHeaderClass,
24
+ puzzleHeaderClass = _ref$puzzleHeaderClas === void 0 ? "puzzle--image__result" : _ref$puzzleHeaderClas;
24
25
  (0, _react.useEffect)(function () {
25
26
  if (text && playSound) {
26
27
  playSound(success ? 'score' : 'fail');
@@ -32,19 +33,26 @@ var Feedback = function Feedback(_ref) {
32
33
  }
33
34
 
34
35
  return /*#__PURE__*/_react.default.createElement("div", {
35
- className: "puzzle--image__result ".concat(success ? 'success' : 'failed')
36
+ className: "".concat(puzzleHeaderClass, " ").concat(additionalStyle, " ").concat(success ? 'success' : 'failed')
37
+ }, secondText && /*#__PURE__*/_react.default.createElement("span", {
38
+ className: "puzzle--terminal__visor--file"
36
39
  }, /*#__PURE__*/_react.default.createElement("span", {
40
+ className: "puzzle--terminal__icon ".concat(additionalStyle)
41
+ }), /*#__PURE__*/_react.default.createElement("span", null, secondText)), /*#__PURE__*/_react.default.createElement("span", {
37
42
  className: "title"
38
- }, text));
43
+ }, text), functionOnClose && /*#__PURE__*/_react.default.createElement("span", {
44
+ onClick: function onClick() {
45
+ return functionOnClose();
46
+ },
47
+ className: "puzzle--terminal__folder--close"
48
+ }, /*#__PURE__*/_react.default.createElement("span", {
49
+ className: "icon-close"
50
+ })));
39
51
  };
40
52
 
41
- Feedback.defaultProps = {
53
+ FeedbackComponent.defaultProps = {
42
54
  text: '',
43
55
  success: false
44
56
  };
45
- Feedback.propTypes = {
46
- text: _propTypes.default.string,
47
- success: _propTypes.default.bool
48
- };
49
- var _default = Feedback;
57
+ var _default = FeedbackComponent;
50
58
  exports.default = _default;
@@ -0,0 +1,13 @@
1
+ "use strict";
2
+
3
+ Object.defineProperty(exports, "__esModule", {
4
+ value: true
5
+ });
6
+ exports.default = void 0;
7
+
8
+ var _FeedbackComponent = _interopRequireDefault(require("./components/FeedbackComponent"));
9
+
10
+ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
11
+
12
+ var _default = _FeedbackComponent.default;
13
+ exports.default = _default;
@@ -0,0 +1,20 @@
1
+ "use strict";
2
+
3
+ Object.defineProperty(exports, "__esModule", {
4
+ value: true
5
+ });
6
+ exports.mockProps2 = exports.mockProps = void 0;
7
+ var soundActions = [function (sound) {
8
+ console.log('PlaySound called :', sound);
9
+ }, function () {}];
10
+ var mockProps = {
11
+ soundActions: soundActions,
12
+ text: 'Feedback Text Success',
13
+ success: true
14
+ };
15
+ exports.mockProps = mockProps;
16
+ var mockProps2 = {
17
+ soundActions: soundActions,
18
+ text: 'Feedback Text Failed'
19
+ };
20
+ exports.mockProps2 = mockProps2;
@@ -11,7 +11,7 @@ var _react = _interopRequireWildcard(require("react"));
11
11
 
12
12
  var _KonvaMapper = _interopRequireDefault(require("./KonvaMapper"));
13
13
 
14
- var _Feedback = _interopRequireDefault(require("./Feedback"));
14
+ var _FeedbackComponent = _interopRequireDefault(require("../../feedback-component/components/FeedbackComponent"));
15
15
 
16
16
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
17
17
 
@@ -50,7 +50,7 @@ var defaultImg = 'https://min.gamelearn.io/css-resources/gamelearn/resources/puz
50
50
  var CompletedMessage = function CompletedMessage(_ref) {
51
51
  var text = _ref.text,
52
52
  playSound = _ref.playSound;
53
- return /*#__PURE__*/_react.default.createElement(_Feedback.default, {
53
+ return /*#__PURE__*/_react.default.createElement(_FeedbackComponent.default, {
54
54
  playSound: playSound,
55
55
  text: text,
56
56
  success: true
@@ -69,7 +69,7 @@ var FailedMessage = function FailedMessage(_ref2) {
69
69
  clearTimeout(timeout);
70
70
  };
71
71
  }, [onClose]);
72
- return /*#__PURE__*/_react.default.createElement(_Feedback.default, {
72
+ return /*#__PURE__*/_react.default.createElement(_FeedbackComponent.default, {
73
73
  text: text,
74
74
  playSound: playSound
75
75
  });
@@ -9,7 +9,7 @@ exports.default = void 0;
9
9
 
10
10
  var _react = _interopRequireWildcard(require("react"));
11
11
 
12
- var _FeedbackMessage = _interopRequireDefault(require("./FeedbackMessage"));
12
+ var _FeedbackComponent = _interopRequireDefault(require("../../feedback-component/components/FeedbackComponent"));
13
13
 
14
14
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
15
15
 
@@ -62,14 +62,33 @@ var KeyboardPuzzleComponent = function KeyboardPuzzleComponent(_ref) {
62
62
  inputPassword = _useState8[0],
63
63
  setInputPassword = _useState8[1];
64
64
 
65
+ var _useState9 = (0, _react.useState)(false),
66
+ _useState10 = _slicedToArray(_useState9, 2),
67
+ feedbackResult = _useState10[0],
68
+ setFeedbackResult = _useState10[1];
69
+
70
+ var _useState11 = (0, _react.useState)(''),
71
+ _useState12 = _slicedToArray(_useState11, 2),
72
+ feedBackText = _useState12[0],
73
+ setFeedBackText = _useState12[1];
74
+
75
+ var _useState13 = (0, _react.useState)(false),
76
+ _useState14 = _slicedToArray(_useState13, 2),
77
+ feedbackIsShown = _useState14[0],
78
+ setFeedbackIsShown = _useState14[1];
79
+
65
80
  var imageURL = ((_image$img = image.img) === null || _image$img === void 0 ? void 0 : _image$img.url) || defaultImage;
66
81
 
67
82
  var checkPass = function checkPass(current) {
68
83
  if (current === password) {
69
84
  disableExit(false);
70
85
  setPassClass('success');
86
+ setFeedbackResult(true);
87
+ setFeedBackText(info.solution.right.desc);
88
+ setFeedbackIsShown(true);
71
89
  setFinished(true);
72
90
  setTimeout(function () {
91
+ setFeedbackIsShown(false);
73
92
  emitEvent({
74
93
  type: 'addPoints',
75
94
  payload: failed ? info.solution.wrong.rewards : info.solution.right.rewards
@@ -77,8 +96,12 @@ var KeyboardPuzzleComponent = function KeyboardPuzzleComponent(_ref) {
77
96
  }, 4000);
78
97
  } else {
79
98
  setFailed(true);
99
+ setFeedbackIsShown(true);
80
100
  setPassClass('failed');
101
+ setFeedbackResult(false);
102
+ setFeedBackText(info.solution.wrong.desc);
81
103
  setTimeout(function () {
104
+ setFeedbackIsShown(false);
82
105
  setPassClass('');
83
106
  setInputPassword('');
84
107
  }, 2000);
@@ -89,12 +112,14 @@ var KeyboardPuzzleComponent = function KeyboardPuzzleComponent(_ref) {
89
112
  setResolveAction(function (resolve) {
90
113
  disableExit(false);
91
114
  setPassClass('success');
115
+ setFeedbackResult(true);
116
+ setFeedBackText(info.solution.right.desc);
92
117
  setFinished(true);
93
118
  setTimeout(function () {
94
119
  resolve();
95
120
  }, 4000);
96
121
  });
97
- }, [setResolveAction, disableExit]);
122
+ }, [setResolveAction, disableExit, info.solution.right.desc]);
98
123
 
99
124
  var handleNumbClick = function handleNumbClick(row, col) {
100
125
  var char = keyboard[row][col];
@@ -149,10 +174,10 @@ var KeyboardPuzzleComponent = function KeyboardPuzzleComponent(_ref) {
149
174
  key: col
150
175
  }, col);
151
176
  }));
152
- })), /*#__PURE__*/_react.default.createElement(_FeedbackMessage.default, {
153
- info: info,
154
- passClass: passClass,
155
- finished: finished
177
+ })), feedbackIsShown && /*#__PURE__*/_react.default.createElement(_FeedbackComponent.default, {
178
+ text: feedBackText,
179
+ success: feedbackResult,
180
+ additionalStyle: "bottom"
156
181
  }));
157
182
  };
158
183
 
@@ -13,6 +13,8 @@ var _pdfComponent = require("../../../pdf-component");
13
13
 
14
14
  var _Image = _interopRequireDefault(require("../Image"));
15
15
 
16
+ var _FeedbackComponent = _interopRequireDefault(require("../../../feedback-component/components/FeedbackComponent"));
17
+
16
18
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
17
19
 
18
20
  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) {
112
114
 
113
115
  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("div", {
114
116
  className: "puzzle--terminal__visor"
115
- }, fileId === solutionId ? /*#__PURE__*/_react.default.createElement(Feedback, {
116
- status: "success",
117
- feedback: info.solution.right.desc
117
+ }, fileId === solutionId ? /*#__PURE__*/_react.default.createElement(_FeedbackComponent.default, {
118
+ success: "success",
119
+ text: info.solution.right.desc,
120
+ functionOnClose: backFile,
121
+ additionalStyle: ICONS[file.type],
122
+ secondText: title,
123
+ puzzleHeaderClass: 'puzzle--terminal__visor--message'
118
124
  }) : /*#__PURE__*/_react.default.createElement(Feedback, {
119
- status: "failed",
125
+ success: "failed",
120
126
  feedback: info.solution.wrong.desc
121
127
  }), /*#__PURE__*/_react.default.createElement("div", {
122
128
  className: "puzzle--terminal__visor--body"
@@ -72,7 +72,7 @@ function makeTextSprite(message, opts) {
72
72
  var fontsize = parameters.fontsize || 120;
73
73
  var canvas = document.createElement('canvas');
74
74
  var context = canvas.getContext('2d');
75
- context.font = fontsize + "px " + fontface; // get size data (height depends only on font size)
75
+ context.font = fontsize + 'px ' + fontface; // get size data (height depends only on font size)
76
76
  // var metrics = context.measureText(message);
77
77
  // var textWidth = metrics.width;
78
78
  // text color
@@ -293,7 +293,18 @@ var getHelpers = function getHelpers(scene) {
293
293
  };
294
294
 
295
295
  var drawLOD = function drawLOD(scene, camera) {
296
- if (!camera.parent) return;
296
+ var currentCamera = camera;
297
+
298
+ if (!currentCamera.parent) {
299
+ scene.traverse(function (node) {
300
+ var _node$userData;
301
+
302
+ if (node.isPerspectiveCamera && (_node$userData = node.userData) !== null && _node$userData !== void 0 && _node$userData.defaultCamera) {
303
+ currentCamera = node;
304
+ }
305
+ });
306
+ }
307
+
297
308
  var params = {};
298
309
  params._texturesFrustum = texturesFrustum;
299
310
  params._texturesDistance = texturesDistance;
@@ -306,27 +317,32 @@ var drawLOD = function drawLOD(scene, camera) {
306
317
 
307
318
  params._scene.add(params._helpers);
308
319
 
309
- params._camera = camera;
320
+ params._camera = currentCamera;
310
321
  params._frustum = null;
311
322
 
312
323
  if (params._texturesFrustum || params._texturesDistance) {
313
- if (showHelpers) {
314
- var helper = new THREE.CameraHelper(params._camera.clone());
315
-
316
- params._helpers.add(helper);
317
-
318
- helper.update();
319
- }
324
+ if (params._camera) {
325
+ params._camera.updateMatrixWorld();
320
326
 
321
- ;
327
+ params._camera.updateProjectionMatrix();
322
328
 
323
- if (params._camera) {
324
329
  params._frustum = new THREE.Frustum();
325
330
 
326
331
  params._frustum.setFromProjectionMatrix(new THREE.Matrix4().multiplyMatrices(params._camera.projectionMatrix, params._camera.matrixWorldInverse));
327
332
  } else {
328
333
  params._texturesFrustum = params._texturesDistance = false;
329
334
  }
335
+
336
+ if (showHelpers) {
337
+ var helper = new THREE.CameraHelper(params._camera.clone());
338
+
339
+ params._helpers.add(helper);
340
+
341
+ helper.update();
342
+ var axesHelper = new THREE.AxesHelper(5);
343
+
344
+ params._helpers.add(axesHelper);
345
+ }
330
346
  }
331
347
 
332
348
  setTexturableElements(params);
@@ -46,8 +46,8 @@ var fetchGlb = function fetchGlb(originalUrl) {
46
46
  var url = isTexturableObject ? originalUrl.replace('.glb', '.geometry.glb') : originalUrl;
47
47
  return new Promise(function (resolve, reject) {
48
48
  gltfLoader.load(url, function (result) {
49
- treatGeometry(result);
50
- result.scene.userData.url = originalUrl;
49
+ treatGeometry(result); // result.scene.userData.url = originalUrl;
50
+
51
51
  resolve(result);
52
52
  }, null, function (error) {
53
53
  return reject(error);
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "@gamelearn/arcade-components",
3
3
  "license": "Gamelearn",
4
- "version": "0.6.3",
4
+ "version": "0.7.0",
5
5
  "main": "dist/index.js",
6
6
  "files": [
7
7
  "dist",
@@ -12,7 +12,7 @@
12
12
  "url": "https://github.com/gamelearn/arcade-components"
13
13
  },
14
14
  "dependencies": {
15
- "@react-three/drei": "^5.1.6",
15
+ "@react-three/drei": "^5.3.1",
16
16
  "@react-three/fiber": "6.0.16",
17
17
  "@testing-library/jest-dom": "5.11.4",
18
18
  "@testing-library/react": "11.1.0",
@@ -26,8 +26,7 @@
26
26
  "react-pdf": "5.2.0",
27
27
  "react-promise-suspense": "0.3.3",
28
28
  "react-typist": "^2.0.5",
29
- "three": "0.128.0",
30
- "use-sound": "2.0.1",
29
+ "three": "^0.129.0",
31
30
  "web-vitals": "0.2.4"
32
31
  },
33
32
  "scripts": {
@@ -77,4 +76,4 @@
77
76
  "^react-pdf$": "react-pdf/dist/umd/entry.jest"
78
77
  }
79
78
  }
80
- }
79
+ }
@@ -1,35 +0,0 @@
1
- "use strict";
2
-
3
- Object.defineProperty(exports, "__esModule", {
4
- value: true
5
- });
6
- exports.default = void 0;
7
-
8
- var _react = _interopRequireDefault(require("react"));
9
-
10
- function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
11
-
12
- var FeedbackMessage = function FeedbackMessage(_ref) {
13
- var feedbackResult = _ref.feedbackResult,
14
- setFeedbackIsShown = _ref.setFeedbackIsShown,
15
- info = _ref.info;
16
- if (feedbackResult === '') return null;
17
- setFeedbackIsShown(true);
18
-
19
- if (feedbackResult === 'success') {
20
- return /*#__PURE__*/_react.default.createElement("div", {
21
- className: "puzzle--image__result top ".concat(feedbackResult)
22
- }, /*#__PURE__*/_react.default.createElement("span", {
23
- className: "title"
24
- }, info.solution.right.desc && info.solution.right.desc !== '' ? /*#__PURE__*/_react.default.createElement("span", null, info.solution.right.desc) : null));
25
- }
26
-
27
- return /*#__PURE__*/_react.default.createElement("div", {
28
- className: "puzzle--keyboard__failedfeedback puzzle--image__result top ".concat(feedbackResult)
29
- }, /*#__PURE__*/_react.default.createElement("span", {
30
- className: "title"
31
- }, info.solution.wrong.desc && info.solution.wrong.desc !== '' ? /*#__PURE__*/_react.default.createElement("span", null, info.solution.wrong.desc) : null));
32
- };
33
-
34
- var _default = FeedbackMessage;
35
- exports.default = _default;
@@ -1,30 +0,0 @@
1
- "use strict";
2
-
3
- Object.defineProperty(exports, "__esModule", {
4
- value: true
5
- });
6
- exports.default = void 0;
7
-
8
- var _react = _interopRequireDefault(require("react"));
9
-
10
- function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
11
-
12
- var FeedbackMessage = function FeedbackMessage(_ref) {
13
- var info = _ref.info,
14
- passClass = _ref.passClass,
15
- finished = _ref.finished;
16
- if (!passClass) return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null);
17
- if (finished) return /*#__PURE__*/_react.default.createElement("div", {
18
- className: "puzzle--image__result bottom ".concat(passClass)
19
- }, /*#__PURE__*/_react.default.createElement("span", {
20
- className: "title"
21
- }, info.solution.right.desc ? /*#__PURE__*/_react.default.createElement("span", null, info.solution.right.desc) : null));
22
- return /*#__PURE__*/_react.default.createElement("div", {
23
- className: "puzzle--keyboard__failed feedback puzzle--image__result bottom ".concat(passClass)
24
- }, /*#__PURE__*/_react.default.createElement("span", {
25
- className: "title"
26
- }, info.solution.wrong.desc ? /*#__PURE__*/_react.default.createElement("span", null, info.solution.wrong.desc) : null));
27
- };
28
-
29
- var _default = FeedbackMessage;
30
- exports.default = _default;