Mirrors/overte-thingvellir
3
0
Fork 0
mirror of https://thingvellir.net/git/overte synced 2025-03-27 23:52:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update overlay for tutorial

Browse source
This commit is contained in:
Ryan Huffman 2016-09-15 17:49:03 -07:00
parent d9cec7f4c7
commit c84ccaaac0
3 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
tutorial/tutorial.js
View file

@ -221,7 +221,7 @@ stepDisableControllers.prototype = {
farGrabEnabled: false,
}));
setControllerPartLayer('touchpad', 'blank');
setControllerPartLayer('tips', 'grip');
setControllerPartLayer('tips', 'blank');
onFinish();
},
cleanup: function() {
@ -317,7 +317,7 @@ stepOrient.prototype = {
};
this.overlay = new StayInFrontOverlay("model", {
url: "http://hifi-content.s3.amazonaws.com/alan/dev/Prompt-Cards/raiseHands.fbx?11",
url: "http://hifi-content.s3.amazonaws.com/alan/dev/Prompt-Cards/welcome.fbx?11",
ignoreRayIntersection: true,
}, 2, { x: 0, y: 0.3, z: 0 });
@ -729,6 +729,7 @@ stepEquip.prototype = {
print("Got message", channel, message, sender, MyAvatar.sessionUUID);
if (channel == "Tutorial-Spinner") {
if (this.currentPart == this.PART1 && message == "wasLit") {
this.currentPart = this.PART2;
hideEntitiesWithTag(this.tagPart1);
showEntitiesWithTag(this.tagPart2);
setControllerPartLayer('tips', 'grip');
@ -983,7 +984,7 @@ function startTutorial() {
STEPS = [
new stepDisableControllers("step0"),
new stepOrient("orient"),
new stepWelcome("welcome"),
//new stepWelcome("welcome"),
new stepRaiseAboveHead("raiseHands"),
new stepNearGrab("nearGrab"),
new stepFarGrab("farGrab"),
@ -995,7 +996,7 @@ function startTutorial() {
for (var i = 0; i < STEPS.length; ++i) {
STEPS[i].cleanup();
}
//location = "/tutorial_begin";
location = "/tutorial_begin";
//location = "/tutorial";
MyAvatar.shouldRenderLocally = false;
startNextStep();

2
tutorial/viveControllerConfiguration.js
View file

@ -65,7 +65,7 @@ VIVE_CONTROLLER_CONFIGURATION = {
textureName: "Tex.Blank",
defaultTextureLayer: "trigger",
defaultTextureLayer: "blank",
textureLayers: {
blank: {
defaultTextureURL: viveTipsModelURL + "/Controller-Tips.fbm/Blank.png",

3
unpublishedScripts/DomainContent/Home/firePit/fire.js
View file

@ -78,6 +78,9 @@
_this.explodeWithColor();
_this.smokePuff();
Entities.deleteEntity(otherID)
Messages.sendMessage('Entity-Exploded', JSON.stringify({
entityID: otherID,
}));
}
}
}