Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-05-29 00:51:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add support to tutorial for touch grip equip

Browse source
This commit is contained in:
Ryan Huffman 2016-12-20 16:00:41 -08:00
parent 0b2f60fb27
commit efb3e577d2
2 changed files with 21 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
tutorial/tutorial.js
View file

@ -535,11 +535,12 @@ stepNearGrab.prototype = {
this.finished = false; this.finished = false;
this.onFinish = onFinish; this.onFinish = onFinish;
setControllerPartLayer('tips', 'trigger');
if (this.controllerName === CONTROLLER_TOUCH) { if (this.controllerName === CONTROLLER_TOUCH) {
setControllerPartLayer('both_triggers', 'highlight'); setControllerPartLayer('tips', 'both_triggers');
setControllerPartLayer('trigger', 'highlight');
setControllerPartLayer('grip', 'highlight');
} else { } else {
setControllerPartLayer('tips', 'trigger');
setControllerPartLayer('trigger', 'highlight'); setControllerPartLayer('trigger', 'highlight');
} }
@ -581,8 +582,8 @@ stepNearGrab.prototype = {
debug("NearGrab | Cleanup"); debug("NearGrab | Cleanup");
this.finished = true; this.finished = true;
setControllerPartLayer('tips', 'blank'); setControllerPartLayer('tips', 'blank');
setControllerPartLayer('both_triggers', 'normal');
setControllerPartLayer('trigger', 'normal'); setControllerPartLayer('trigger', 'normal');
setControllerPartLayer('grip', 'normal');
hideEntitiesWithTags(this.tags); hideEntitiesWithTags(this.tags);
deleteEntitiesWithTag(this.tempTag); deleteEntitiesWithTag(this.tempTag);
if (this.positionWatcher) { if (this.positionWatcher) {

24
tutorial/tutorialEntityIDs.js
View file

@ -77,13 +77,20 @@ TUTORIAL_TAG_TO_ENTITY_IDS_MAP = {
"tag": "nearGrab" "tag": "nearGrab"
} }
}, },
"equip-part1-touch": {
"{470f0634-8be7-4b52-a8bd-5183d489fcb6}": {
"tag": "equip-part1-touch"
}
},
"equip-part1-vive": {
"{97ced5e7-fc81-40f9-a9e8-f85b4b30f24c}": {
"tag": "equip-part1-vive"
}
},
"equip-part1": { "equip-part1": {
"{d73822ca-0a34-4cf4-a530-3258ac459a14}": { "{d73822ca-0a34-4cf4-a530-3258ac459a14}": {
"tag": "equip-part1" "tag": "equip-part1"
}, },
"{97ced5e7-fc81-40f9-a9e8-f85b4b30f24c}": {
"tag": "equip-part1"
},
"{8572d991-5777-45df-97bf-7243d7b12f81}": { "{8572d991-5777-45df-97bf-7243d7b12f81}": {
"tag": "equip-part1" "tag": "equip-part1"
}, },
@ -109,16 +116,17 @@ TUTORIAL_TAG_TO_ENTITY_IDS_MAP = {
"equip-part2-vive": { "equip-part2-vive": {
"{b5d17eda-90ab-40cf-b973-efcecb2e992e}": { "{b5d17eda-90ab-40cf-b973-efcecb2e992e}": {
"tag": "equip-part2-vive" "tag": "equip-part2-vive"
},
"{6307cd16-dd1d-4988-a339-578178436b45}": {
"tag": "equip-part2-vive"
} }
}, },
"equip-part2-touch": { "equip-part2-touch": {
"{69195139-e020-4739-bb2c-50faebc6860a}": { "{69195139-e020-4739-bb2c-50faebc6860a}": {
"tag": "equip-part2-touch" "tag": "equip-part2-touch"
} },
}, "{9b0a99ae-221b-4e59-ba3c-d8e64a083774}": {
"equip-part2": { "tag": "equip-part2-touch"
"{6307cd16-dd1d-4988-a339-578178436b45}": {
"tag": "equip-part2"
} }
}, },
"bothGrab": { "bothGrab": {