Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 18:13:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Update controller tips and trigger highlight in tutorial

Browse source
This commit is contained in:
Ryan Huffman 2016-10-14 14:05:06 -07:00
parent eb541e09f9
commit 1f25ba8f1f
2 changed files with 37 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
scripts/system/controllers/viveControllerConfiguration.js
View file

@ -62,6 +62,7 @@ var TIP_TEXTURE_BASE_URL = BASE_URL + "meshes/controller/vive_tips.fbm/";
var viveModelURL = BASE_URL + "meshes/controller/vive_body.fbx"; var viveModelURL = BASE_URL + "meshes/controller/vive_body.fbx";
var viveTipsModelURL = BASE_URL + "meshes/controller/vive_tips.fbx"; var viveTipsModelURL = BASE_URL + "meshes/controller/vive_tips.fbx";
var viveTriggerModelURL = "meshes/controller/vive_trigger.fbx"
VIVE_CONTROLLER_CONFIGURATION_LEFT = { VIVE_CONTROLLER_CONFIGURATION_LEFT = {
name: "Vive", name: "Vive",
@ -86,7 +87,7 @@ VIVE_CONTROLLER_CONFIGURATION_LEFT = {
defaultTextureLayer: "blank", defaultTextureLayer: "blank",
textureLayers: { textureLayers: {
blank: { blank: {
defaultTextureURL: TIP_TEXTURE_BASE_URL + "Blank.png" defaultTextureURL: TIP_TEXTURE_BASE_URL + "/Blank.png"
}, },
trigger: { trigger: {
defaultTextureURL: TIP_TEXTURE_BASE_URL + "/Trigger.png" defaultTextureURL: TIP_TEXTURE_BASE_URL + "/Trigger.png"
@ -141,7 +142,18 @@ VIVE_CONTROLLER_CONFIGURATION_LEFT = {
minValue: 0.0, minValue: 0.0,
maxValue: 1.0, maxValue: 1.0,
axis: { x: -1, y: 0, z: 0 }, axis: { x: -1, y: 0, z: 0 },
maxAngle: 20 maxAngle: 25,
textureName: "Tex.black-trigger",
defaultTextureLayer: "normal",
textureLayers: {
normal: {
defaultTextureURL: viveTriggerModelURL + "/Trigger.fbm/black.jpg",
},
highlight: {
defaultTextureURL: viveTriggerModelURL + "/Trigger.fbm/yellow.jpg",
}
}
}, },
l_grip: { l_grip: {
@ -262,7 +274,18 @@ VIVE_CONTROLLER_CONFIGURATION_RIGHT = {
minValue: 0.0, minValue: 0.0,
maxValue: 1.0, maxValue: 1.0,
axis: { x: -1, y: 0, z: 0 }, axis: { x: -1, y: 0, z: 0 },
maxAngle: 25 maxAngle: 25,
textureName: "Tex.black-trigger",
defaultTextureLayer: "normal",
textureLayers: {
normal: {
defaultTextureURL: viveTriggerModelURL + "/Trigger.fbm/black.jpg",
},
highlight: {
defaultTextureURL: viveTriggerModelURL + "/Trigger.fbm/yellow.jpg",
}
}
}, },
l_grip: { l_grip: {

11
tutorial/tutorial.js
View file

@ -254,6 +254,7 @@ var stepDisableControllers = function(name) {
stepDisableControllers.prototype = { stepDisableControllers.prototype = {
start: function(onFinish) { start: function(onFinish) {
HMD.requestShowHandControllers(); HMD.requestShowHandControllers();
disableEverything(); disableEverything();
onFinish(); onFinish();
@ -277,6 +278,9 @@ function disableEverything() {
setControllerPartLayer('tips', 'blank'); setControllerPartLayer('tips', 'blank');
hideEntitiesWithTag('finish'); hideEntitiesWithTag('finish');
controllerDisplayManager = new ControllerDisplayManager();
setAwayEnabled(false); setAwayEnabled(false);
} }
@ -471,6 +475,7 @@ stepNearGrab.prototype = {
setControllerVisible("trigger", true); setControllerVisible("trigger", true);
setControllerPartLayer('tips', 'trigger'); setControllerPartLayer('tips', 'trigger');
setControllerPartLayer('trigger', 'highlight');
var tag = this.tag; var tag = this.tag;
// Spawn content set // Spawn content set
@ -513,6 +518,7 @@ stepNearGrab.prototype = {
this.finished = true; this.finished = true;
setControllerVisible("trigger", false); setControllerVisible("trigger", false);
setControllerPartLayer('tips', 'blank'); setControllerPartLayer('tips', 'blank');
setControllerPartLayer('trigger', 'normal');
hideEntitiesWithTag(this.tag, { visible: false}); hideEntitiesWithTag(this.tag, { visible: false});
deleteEntitiesWithTag(this.tempTag); deleteEntitiesWithTag(this.tempTag);
if (this.positionWatcher) { if (this.positionWatcher) {
@ -548,6 +554,7 @@ stepFarGrab.prototype = {
setControllerVisible("trigger", true); setControllerVisible("trigger", true);
setControllerPartLayer('tips', 'trigger'); setControllerPartLayer('tips', 'trigger');
setControllerPartLayer('trigger', 'highlight');
Messages.sendLocalMessage('Hifi-Grab-Disable', JSON.stringify({ Messages.sendLocalMessage('Hifi-Grab-Disable', JSON.stringify({
farGrabEnabled: true, farGrabEnabled: true,
})); }));
@ -591,6 +598,7 @@ stepFarGrab.prototype = {
this.finished = true; this.finished = true;
setControllerVisible("trigger", false); setControllerVisible("trigger", false);
setControllerPartLayer('tips', 'blank'); setControllerPartLayer('tips', 'blank');
setControllerPartLayer('trigger', 'normal');
hideEntitiesWithTag(this.tag, { visible: false}); hideEntitiesWithTag(this.tag, { visible: false});
hideEntitiesWithTag('bothGrab', { visible: false}); hideEntitiesWithTag('bothGrab', { visible: false});
deleteEntitiesWithTag(this.tempTag); deleteEntitiesWithTag(this.tempTag);
@ -650,6 +658,7 @@ stepEquip.prototype = {
start: function(onFinish) { start: function(onFinish) {
setControllerVisible("trigger", true); setControllerVisible("trigger", true);
setControllerPartLayer('tips', 'trigger'); setControllerPartLayer('tips', 'trigger');
setControllerPartLayer('trigger', 'highlight');
Messages.sendLocalMessage('Hifi-Grab-Disable', JSON.stringify({ Messages.sendLocalMessage('Hifi-Grab-Disable', JSON.stringify({
holdEnabled: true, holdEnabled: true,
})); }));
@ -723,6 +732,7 @@ stepEquip.prototype = {
this.currentPart = this.PART3; this.currentPart = this.PART3;
hideEntitiesWithTag(this.tagPart1); hideEntitiesWithTag(this.tagPart1);
showEntitiesWithTag(this.tagPart2); showEntitiesWithTag(this.tagPart2);
setControllerPartLayer('trigger', 'normal');
setControllerPartLayer('tips', 'grip'); setControllerPartLayer('tips', 'grip');
Messages.subscribe('Hifi-Object-Manipulation'); Messages.subscribe('Hifi-Object-Manipulation');
debug("Equip | Finished starting part 3"); debug("Equip | Finished starting part 3");
@ -750,6 +760,7 @@ stepEquip.prototype = {
setControllerVisible("trigger", false); setControllerVisible("trigger", false);
setControllerPartLayer('tips', 'blank'); setControllerPartLayer('tips', 'blank');
setControllerPartLayer('trigger', 'normal');
this.stopWatchingGun(); this.stopWatchingGun();
this.currentPart = this.COMPLETE; this.currentPart = this.COMPLETE;