diff --git a/scripts/simplifiedUI/simplifiedEmote/emojiApp/resources/images/icons/checkMark.png b/scripts/simplifiedUI/simplifiedEmote/emojiApp/resources/images/icons/checkMark.png deleted file mode 100644 index 76c900a09a..0000000000 Binary files a/scripts/simplifiedUI/simplifiedEmote/emojiApp/resources/images/icons/checkMark.png and /dev/null differ diff --git a/scripts/simplifiedUI/simplifiedEmote/emojiApp/resources/images/icons/pencil.png b/scripts/simplifiedUI/simplifiedEmote/emojiApp/resources/images/icons/pencil.png deleted file mode 100644 index 6618088192..0000000000 Binary files a/scripts/simplifiedUI/simplifiedEmote/emojiApp/resources/images/icons/pencil.png and /dev/null differ diff --git a/scripts/simplifiedUI/simplifiedEmote/simplifiedEmote.js b/scripts/simplifiedUI/simplifiedEmote/simplifiedEmote.js index e9cb4d59e5..7a9b94b700 100644 --- a/scripts/simplifiedUI/simplifiedEmote/simplifiedEmote.js +++ b/scripts/simplifiedUI/simplifiedEmote/simplifiedEmote.js @@ -18,8 +18,8 @@ // The information needed to properly use the sprite sheets and get the general information // about the emojis -var emojiList = Script.require("./emojiApp/resources/modules/emojiList.js?" + Date.now()); -var customEmojiList = Script.require("./emojiApp/resources/modules/customEmojiList.js?" + Date.now()); +var emojiList = Script.require("./emojiApp/resources/modules/emojiList.js"); +var customEmojiList = Script.require("./emojiApp/resources/modules/customEmojiList.js"); var imageURLBase = Script.resolvePath("./resources/images/emojis/1024px/"); // #endregion @@ -159,7 +159,6 @@ function toggleReaction(reaction) { } } -var UPDATE_POINT_EMOTE_MS = 1000; var reactionsBegun = []; var pointReticle = null; var mouseMoveEventsConnected = false; @@ -179,8 +178,10 @@ function beginReactionWrapper(reaction) { break; case ("point"): deleteOldReticles(); - Controller.mouseMoveEvent.connect(mouseMoveEvent); - mouseMoveEventsConnected = true; + if (!mouseMoveEventsConnected) { + Controller.mouseMoveEvent.connect(mouseMoveEvent); + mouseMoveEventsConnected = true; + } } } @@ -216,14 +217,13 @@ function mouseMoveEvent(event) { } else if (entityIntersectionDistanceM) { reticlePosition = entityIntersectionData.intersection; } else { - print("ERROR: No intersected avatar or entity found or the distance is too far."); deleteOldReticles(); return; } - if (pointReticle) { + if (pointReticle && reticlePosition) { Entities.editEntity(pointReticle, { position: reticlePosition }); - } else { + } else if (reticlePosition) { pointReticle = Entities.addEntity({ type: "Sphere", name: "Point Reticle", @@ -231,7 +231,10 @@ function mouseMoveEvent(event) { dimensions: { x: 0.1, y: 0.1, z: 0.1 }, color: { red: 255, green: 0, blue: 0 }, collisionless: true, - ignorePickIntersection: true + ignorePickIntersection: true, + grab: { + grabbable: false + } }, true); } } @@ -265,7 +268,7 @@ function endReactionWrapper(reaction) { Controller.mouseMoveEvent.disconnect(mouseMoveEvent); } intersectedEntityOrAvatarID = null; - deleteOldReticles() + deleteOldReticles(); break; } } @@ -438,7 +441,7 @@ function onSettingsValueChanged(settingName, newValue) { } -var EmojiAPI = Script.require("./emojiApp/simplifiedEmoji.js?" + Date.now()); +var EmojiAPI = Script.require("./emojiApp/simplifiedEmoji.js"); var emojiAPI = new EmojiAPI(); var keyPressSignalsConnected = false; var emojiCodeMap;