Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-09 10:19:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add Support to different UV modes in the finger paint script and deactivate "paint hand"

Browse source
This commit is contained in:
Delanir 2017-06-23 09:43:50 +01:00 committed by Artur Gomes
parent 0a97cfd736
commit 066598fe3f
1 changed files with 29 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -55,6 +55,7 @@
texture = null , texture = null ,
//'https://upload.wikimedia.org/wikipedia/commons/thumb/9/93/Caris_Tessellation.svg/1024px-Caris_Tessellation.svg.png', // Daantje //'https://upload.wikimedia.org/wikipedia/commons/thumb/9/93/Caris_Tessellation.svg/1024px-Caris_Tessellation.svg.png', // Daantje
strokeWidthMultiplier = 0.6, strokeWidthMultiplier = 0.6,
IS_UV_MODE_STRETCH = true,
MIN_STROKE_LENGTH = 0.005, // m MIN_STROKE_LENGTH = 0.005, // m
MIN_STROKE_INTERVAL = 66, // ms MIN_STROKE_INTERVAL = 66, // ms
MAX_POINTS_PER_LINE = 70; // Hard-coded limit in PolyLineEntityItem.h. MAX_POINTS_PER_LINE = 70; // Hard-coded limit in PolyLineEntityItem.h.
@ -78,11 +79,15 @@
function changeStrokeWidthMultiplier(multiplier) { function changeStrokeWidthMultiplier(multiplier) {
strokeWidthMultiplier = multiplier; strokeWidthMultiplier = multiplier;
} }
function changeUVMode(isUVModeStretch) {
IS_UV_MODE_STRETCH = isUVModeStretch;
}
function getStrokeWidth() { function getStrokeWidth() {
return strokeWidthMultiplier; return strokeWidthMultiplier;
} }
function changeTexture(textureURL) { function changeTexture(textureURL) {
texture = textureURL; texture = textureURL;
} }
@ -120,6 +125,7 @@
normals: strokeNormals, normals: strokeNormals,
strokeWidths: strokeWidths, strokeWidths: strokeWidths,
textures: texture, // Daantje textures: texture, // Daantje
isUVModeStretch: IS_UV_MODE_STRETCH,
dimensions: STROKE_DIMENSIONS dimensions: STROKE_DIMENSIONS
}); });
@ -244,7 +250,8 @@
changeTexture: changeTexture, changeTexture: changeTexture,
undoErasing: undoErasing, undoErasing: undoErasing,
getStrokeColor: getStrokeColor, getStrokeColor: getStrokeColor,
getStrokeWidth: getStrokeWidth getStrokeWidth: getStrokeWidth,
changeUVMode: changeUVMode
}; };
} }
@ -507,6 +514,10 @@
//"rightIndexPointAndThumbRaiseOpen","rightIndexPointAndThumbRaiseClosed", //"rightIndexPointAndThumbRaiseOpen","rightIndexPointAndThumbRaiseClosed",
MyAvatar.overrideRoleAnimation(handLiteral + "IndexPointAndThumbRaiseOpen", ANIM_OPEN, 30, false, 19, 20); MyAvatar.overrideRoleAnimation(handLiteral + "IndexPointAndThumbRaiseOpen", ANIM_OPEN, 30, false, 19, 20);
MyAvatar.overrideRoleAnimation(handLiteral + "IndexPointAndThumbRaiseClosed", ANIM_URL, 30, false, 19, 20); MyAvatar.overrideRoleAnimation(handLiteral + "IndexPointAndThumbRaiseClosed", ANIM_URL, 30, false, 19, 20);
//turn off lasers and other interactions
Messages.sendLocalMessage("Hifi-Hand-Disabler", "none");
Messages.sendLocalMessage("Hifi-Hand-Disabler", handLiteral);
} }
@ -549,6 +560,7 @@
leftHand = handController("left"); leftHand = handController("left");
rightHand = handController("right"); rightHand = handController("right");
//Change to finger paint hand animation //Change to finger paint hand animation
updateHandAnimations(); updateHandAnimations();
@ -607,6 +619,17 @@
//var dim2 = Math.floor( Math.random()*40 + 5); //var dim2 = Math.floor( Math.random()*40 + 5);
leftBrush.changeTexture(message[1]); leftBrush.changeTexture(message[1]);
rightBrush.changeTexture(message[1]); rightBrush.changeTexture(message[1]);
if (message[1] === "content/brushes/paintbrush1.png") {
leftBrush.changeUVMode(true);
rightBrush.changeUVMode(true);
}else if (message[1] === "content/brushes/paintbrush3.png") {
leftBrush.changeUVMode(true);
rightBrush.changeUVMode(true);
}else{
leftBrush.changeUVMode(false);
rightBrush.changeUVMode(false);
}
return; return;
} }
if (message[0] === "undo"){ if (message[0] === "undo"){
@ -622,6 +645,8 @@
}); });
} }
function disableProcessing() { function disableProcessing() {
@ -630,6 +655,8 @@
Controller.disableMapping(CONTROLLER_MAPPING_NAME); Controller.disableMapping(CONTROLLER_MAPPING_NAME);
Messages.sendLocalMessage("Hifi-Hand-Disabler", "none");
leftBrush.tearDown(); leftBrush.tearDown();
leftBrush = null; leftBrush = null;
leftHand.tearDown(); leftHand.tearDown();