Mirrors/overte-AleziaKurdis
3
0
Fork 0
mirror of https://github.com/AleziaKurdis/overte.git synced 2025-08-26 05:03:39 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix application button not resetting state after exiting the app.

Browse source 
Fix hovering tablet detection not working before unhovering the tablet.
Fix finger closing and opening while hovering the tablet and drawing.
This commit is contained in:
Artur Gomes 2017-07-06 15:45:20 +01:00
parent b6beb2033f
commit 69a532ea45
2 changed files with 82 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

102
scripts/system/fingerPaint/fingerPaint.js
View file

@ -16,7 +16,7 @@
UNDO_STACK_SIZE = 5,
undoStack = [];
isFingerPainting = false,
isTabletFocused = false,
isTabletFocused = false, //starts with true cause you need to be hovering the tablet in order to open the app
tabletDebugFocusLine = null,
//dynamic brush vars
/*9isDynamicBrushEnabled = false,
@ -89,6 +89,10 @@
function getStrokeColor() {
return STROKE_COLOR;
}
function isDrawing() {
return isDrawingLine;
}
function changeStrokeWidthMultiplier(multiplier) {
strokeWidthMultiplier = multiplier;
@ -121,6 +125,8 @@
changeStrokeWidthMultiplier(0.1);
isDynamicBrushRunning = true;
}*/
if (isTabletFocused)
return;
width = width * strokeWidthMultiplier;
@ -270,6 +276,7 @@
changeStrokeColor: changeStrokeColor,
changeStrokeWidthMultiplier: changeStrokeWidthMultiplier,
changeTexture: changeTexture,
isDrawing: isDrawing,
undoErasing: undoErasing,
getStrokeColor: getStrokeColor,
getStrokeWidth: getStrokeWidth,
@ -430,7 +437,7 @@
direction: Quat.getUp(fingerTipRotation)
}
var overlays = Overlays.findRayIntersection(pickRay, false, [HMD.tabletID], [inkSourceOverlay.overlayID]);
print(JSON.stringify(overlays));
//print(JSON.stringify(overlays));
if (overlays.intersects && HMD.tabletID == overlays.overlayID) {
if (!isTabletFocused) {
isTabletFocused = true;
@ -515,8 +522,7 @@
/*frameDeltaSeconds = Date.now() - lastFrameTime;
lastFrameTime = Date.now();
runDynamicBrush(); */
if (((!leftBrush || !rightBrush) || !leftBrush.isDrawingLine && !rightBrush.isDrawingLine)) {
if ((leftBrush == null || rightBrush == null) || (!leftBrush.isDrawing() && !rightBrush.isDrawing())) {
checkTabletHasFocus();
}
updateTriggerPress();
@ -654,6 +660,33 @@
MyAvatar.restoreRoleAnimation("leftIndexPointAndThumbRaiseOpen");
MyAvatar.restoreRoleAnimation("leftIndexPointAndThumbRaiseClosed");
}
function pauseProcessing() {
//Script.update.disconnect(leftHand.onUpdate);
//Script.update.disconnect(rightHand.onUpdate);
//Controller.disableMapping(CONTROLLER_MAPPING_NAME);
Messages.sendLocalMessage("Hifi-Hand-Disabler", "none");
Messages.unsubscribe(HIFI_POINT_INDEX_MESSAGE_CHANNEL);
Messages.unsubscribe(HIFI_GRAB_DISABLE_MESSAGE_CHANNEL);
Messages.unsubscribe(HIFI_POINTER_DISABLE_MESSAGE_CHANNEL);
//Restores and clears hand animations
restoreAllHandAnimations();
}
function resumeProcessing() {
//Change to finger paint hand animation
updateHandAnimations();
// Messages channels for enabling/disabling other scripts' functions.
Messages.subscribe(HIFI_POINT_INDEX_MESSAGE_CHANNEL);
Messages.subscribe(HIFI_GRAB_DISABLE_MESSAGE_CHANNEL);
Messages.subscribe(HIFI_POINTER_DISABLE_MESSAGE_CHANNEL);
}
function enableProcessing() {
// Connect controller API to handController objects.
@ -690,20 +723,20 @@
// enable window palette
window = new OverlayWindow({
/*window = new OverlayWindow({
title: 'Paint Window',
source: qml,
width: 600, height: 600,
});
});*/
// 75
//50
window.setPosition(75, 100);
//window.setPosition(75, 100);
//window.closed.connect(function() {
//Script.stop();
//});
//}); uncomment for qml interface
window.fromQml.connect(function(message){
/*window.fromQml.connect(function(message){
if (message[0] === "color"){
leftBrush.changeStrokeColor(message[1], message[2], message[3]);
rightBrush.changeStrokeColor(message[1], message[2], message[3]);
@ -754,38 +787,7 @@
updateHandAnimations();
return;
}
});
}
function pauseProcessing() {
//Script.update.disconnect(leftHand.onUpdate);
//Script.update.disconnect(rightHand.onUpdate);
//Controller.disableMapping(CONTROLLER_MAPPING_NAME);
Messages.sendLocalMessage("Hifi-Hand-Disabler", "none");
Messages.unsubscribe(HIFI_POINT_INDEX_MESSAGE_CHANNEL);
Messages.unsubscribe(HIFI_GRAB_DISABLE_MESSAGE_CHANNEL);
Messages.unsubscribe(HIFI_POINTER_DISABLE_MESSAGE_CHANNEL);
//Restores and clears hand animations
restoreAllHandAnimations();
}
function resumeProcessing() {
//Change to finger paint hand animation
updateHandAnimations();
// Messages channels for enabling/disabling other scripts' functions.
Messages.subscribe(HIFI_POINT_INDEX_MESSAGE_CHANNEL);
Messages.subscribe(HIFI_GRAB_DISABLE_MESSAGE_CHANNEL);
Messages.subscribe(HIFI_POINTER_DISABLE_MESSAGE_CHANNEL);
});*/ //uncomment for qml interface
}
function disableProcessing() {
@ -819,10 +821,11 @@
inkSourceOverlay = null;
// disable window palette
window.close();
//window.close(); //uncomment for qml interface
}
function onButtonClicked() {
isTabletFocused = false; //should always start false so onUpdate updates this variable to true in the beggining
var wasFingerPainting = isFingerPainting;
isFingerPainting = !isFingerPainting;
@ -849,8 +852,17 @@
function onTabletScreenChanged(type, url) {
var TABLET_SCREEN_CLOSED = "Closed";
var TABLET_SCREEN_HOME = "Home";
isTabletDisplayed = type !== TABLET_SCREEN_CLOSED;
if (type === TABLET_SCREEN_HOME) {
if (isFingerPainting) {
isFingerPainting = false;
disableProcessing();
}
button.editProperties({ isActive: isFingerPainting });
print("Closing the APP");
}
updateHandFunctions();
}
@ -882,6 +894,12 @@
leftBrush.changeUVMode(true);
rightBrush.changeUVMode(true);
}
/*leftBrush.changeUVMode(false);
rightBrush.changeUVMode(false);
if (event.brushName.indexOf("256x256") != -1) {
leftBrush.changeUVMode(true);
rightBrush.changeUVMode(true);
}*/
print("changing brush to " + event.brushName);
event.brushName = CONTENT_PATH + "/" + event.brushName;
leftBrush.changeTexture(event.brushName);

22
scripts/system/fingerPaint/html/brushesTab.html
View file

@ -24,9 +24,31 @@
<button class="brushButton" id="content/brushes/paintbrush4.png" onclick="changePaintBrush(3)"><img width="130px" src="../content/brushes/paintbrush4.png" class="BrushIcon" ></button>
<button class="brushButton" id="content/brushes/paintbrush5.png" onclick="changePaintBrush(4)"><img width="130px" src="../content/brushes/paintbrush5.png" class="BrushIcon" ></button>
<button class="brushButton" id="content/brushes/paintbrush6.png" onclick="changePaintBrush(5)"><img width="130px" src="../content/brushes/paintbrush6.png" class="BrushIcon" ></button>
<!--<button class="brushButton" id="content/brushes/basic.png" onclick="changePaintBrush(6)"><img width="130px" src="../content/brushes/basic.png" class="BrushIcon" ></button>
<button class="brushButton" id="content/brushes/bristle.png" onclick="changePaintBrush(7)"><img width="130px" src="../content/brushes/bristle.png" class="BrushIcon" ></button>
<button class="brushButton" id="content/brushes/gouache.png" onclick="changePaintBrush(8)"><img width="130px" src="../content/brushes/gouache.png" class="BrushIcon" ></button>
<button class="brushButton" id="content/brushes/gradient.png" onclick="changePaintBrush(9)"><img width="130px" src="../content/brushes/gradient.png" class="BrushIcon" ></button>
<button class="brushButton" id="content/brushes/gradient2.png" onclick="changePaintBrush(10)"><img width="130px" src="../content/brushes/gradient2.png" class="BrushIcon" ></button>
<button class="brushButton" id="content/brushes/gradient3.png" onclick="changePaintBrush(11)"><img width="130px" src="../content/brushes/gradient3.png" class="BrushIcon" ></button>
<button class="brushButton" id="content/brushes/koons.png" onclick="changePaintBrush(12)"><img width="130px" src="../content/brushes/koons.png" class="BrushIcon" ></button>
<button class="brushButton" id="content/brushes/oil.png" onclick="changePaintBrush(13)"><img width="130px" src="../content/brushes/oil.png" class="BrushIcon" ></button>
<button class="brushButton" id="content/brushes/pastel.png" onclick="changePaintBrush(14)"><img width="130px" src="../content/brushes/pastel.png" class="BrushIcon" ></button>
<button class="brushButton" id="content/brushes/soft.png" onclick="changePaintBrush(15)"><img width="130px" src="../content/brushes/soft.png" class="BrushIcon" ></button>
<button class="brushButton" id="content/brushes/sponge.png" onclick="changePaintBrush(16)"><img width="130px" src="../content/brushes/sponge.png" class="BrushIcon" ></button>
<button class="brushButton" id="content/brushes/square.png" onclick="changePaintBrush(17)"><img width="130px" src="../content/brushes/square.png" class="BrushIcon" ></button>
-->
<!--256x256-->
<!--<button class="brushButton" id="content/brushes/256x256/dupuiz.png" onclick="changePaintBrush(18)"><img width="130px" src="../content/brushes/256x256/dupuiz.png" class="BrushIcon" ></button>
<button class="brushButton" id="content/brushes/256x256/graphite.png" onclick="changePaintBrush(19)"><img width="130px" src="../content/brushes/256x256/graphite.png" class="BrushIcon" ></button>
<button class="brushButton" id="content/brushes/256x256/spat-fine.png" onclick="changePaintBrush(20)"><img width="130px" src="../content/brushes/256x256/spat-fine.png" class="BrushIcon" ></button>
<button class="brushButton" id="content/brushes/256x256/spat-medium.png" onclick="changePaintBrush(21)"><img width="130px" src="../content/brushes/256x256/spat-medium.png" class="BrushIcon" ></button>-->
</div>
<script type="text/javascript">
var currentBrush = 5;
function changePaintBrush(brushIndex) {