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

Cleanup tutorial

Browse source
This commit is contained in:
Ryan Huffman 2016-09-16 13:34:03 -07:00
parent c898b70dd7
commit c411722d52
3 changed files with 57 additions and 120 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
tutorial/controllerDisplay.js
View file

@ -30,17 +30,13 @@ createControllerDisplay = function(config) {
print("Setting layer...", partName, layerName); print("Setting layer...", partName, layerName);
if (partName in this.parts) { if (partName in this.parts) {
var part = this.parts[partName]; var part = this.parts[partName];
//print("FOnd", JSON.stringify(part)); if (part.textureLayers && layerName in part.textureLayers) {
if (layerName in part.textureLayers) {
//print("got it", layerName);
var layer = part.textureLayers[layerName]; var layer = part.textureLayers[layerName];
var textures = {}; var textures = {};
if (layer.defaultTextureURL) { if (layer.defaultTextureURL) {
//print("default texture");
textures[part.textureName] = layer.defaultTextureURL; textures[part.textureName] = layer.defaultTextureURL;
} }
for (var i = 0; i < this.partOverlays[partName].length; ++i) { for (var i = 0; i < this.partOverlays[partName].length; ++i) {
//print("updating", JSON.stringify(textures));
Overlays.editOverlay(this.partOverlays[partName][i], { Overlays.editOverlay(this.partOverlays[partName][i], {
textures: textures textures: textures
}); });

4
tutorial/spinner.js
View file

@ -25,8 +25,8 @@
}); });
var injector = Audio.playSound(spinnerSound, { var injector = Audio.playSound(spinnerSound, {
position: Entities.getEntityProperties(this.entityID, 'position').position, position: Entities.getEntityProperties(this.entityID, 'position').position,
volume: 0.7, volume: 1.0,
loop: true loop: false
}); });
print("HERE2"); print("HERE2");

167
tutorial/tutorial.js
View file

@ -300,6 +300,8 @@ var stepOrient = function(name) {
} }
stepOrient.prototype = { stepOrient.prototype = {
start: function(onFinish) { start: function(onFinish) {
this.active = true;
var tag = this.tag; var tag = this.tag;
var defaultTransform = { var defaultTransform = {
@ -334,20 +336,26 @@ stepOrient.prototype = {
if (MyAvatar.getLeftPalmPosition().y > (MyAvatar.getHeadPosition().y + 0.1)) { if (MyAvatar.getLeftPalmPosition().y > (MyAvatar.getHeadPosition().y + 0.1)) {
Script.clearInterval(this.checkIntervalID); Script.clearInterval(this.checkIntervalID);
this.checkIntervalID = null; this.checkIntervalID = null;
playSuccessSound();
location = "/tutorial"; location = "/tutorial";
Script.setTimeout(playSuccessSound, 150);
this.active = false;
onFinish(); onFinish();
} }
} }
this.checkIntervalID = Script.setInterval(checkForHandsAboveHead.bind(this), 500); this.checkIntervalID = Script.setInterval(checkForHandsAboveHead.bind(this), 500);
}, },
cleanup: function() { cleanup: function() {
if (this.active) {
location = "/tutorial";
this.active = false;
}
if (this.overlay) { if (this.overlay) {
this.overlay.destroy(); this.overlay.destroy();
this.overlay = null; this.overlay = null;
} }
if (this.checkIntervalID != null) { if (this.checkIntervalID) {
Script.clearInterval(this.checkIntervalID); Script.clearInterval(this.checkIntervalID);
this.checkIntervalID = null;
} }
editEntitiesWithTag(this.tag, { visible: false, collisionless: 1 }); editEntitiesWithTag(this.tag, { visible: false, collisionless: 1 });
deleteEntitiesWithTag(this.tempTag); deleteEntitiesWithTag(this.tempTag);
@ -383,12 +391,12 @@ stepRaiseAboveHead.prototype = {
}; };
// Spawn content set // Spawn content set
//spawnWithTag(HandsAboveHeadData, defaultTransform, tag);
print("raise hands...", this.tag); print("raise hands...", this.tag);
editEntitiesWithTag(this.tag, { visible: true }); editEntitiesWithTag(this.tag, { visible: true });
Script.setTimeout(function() { // Wait 2 seconds before starting to check for hands
this.waitTimeoutID = Script.setTimeout(function() {
this.checkIntervalID = null; this.checkIntervalID = null;
function checkForHandsAboveHead() { function checkForHandsAboveHead() {
print("Checking for hands above head..."); print("Checking for hands above head...");
@ -396,7 +404,6 @@ stepRaiseAboveHead.prototype = {
Script.clearInterval(this.checkIntervalID); Script.clearInterval(this.checkIntervalID);
this.checkIntervalID = null; this.checkIntervalID = null;
playSuccessSound(); playSuccessSound();
//location = "/tutorial";
onFinish(); onFinish();
} }
} }
@ -404,8 +411,13 @@ stepRaiseAboveHead.prototype = {
}.bind(this), 2000); }.bind(this), 2000);
}, },
cleanup: function() { cleanup: function() {
if (this.checkIntervalID != null) { if (this.checkIntervalID) {
Script.clearInterval(this.checkIntervalID); Script.clearInterval(this.checkIntervalID);
this.checkIntervalID = null
}
if (this.waitTimeoutID) {
Script.clearTimeout(this.waitTimeoutID);
this.waitTimeoutID = null;
} }
editEntitiesWithTag(this.tag, { visible: false, collisionless: 1 }); editEntitiesWithTag(this.tag, { visible: false, collisionless: 1 });
deleteEntitiesWithTag(this.tempTag); deleteEntitiesWithTag(this.tempTag);
@ -440,6 +452,10 @@ function setControllerPartLayer(part, layer) {
var stepNearGrab = function(name) { var stepNearGrab = function(name) {
this.tag = name; this.tag = name;
this.tempTag = name + "-temporary"; this.tempTag = name + "-temporary";
this.birdIDs = [];
Messages.subscribe("Entity-Exploded");
Messages.messageReceived.connect(this.onMessage.bind(this));
} }
stepNearGrab.prototype = { stepNearGrab.prototype = {
start: function(onFinish) { start: function(onFinish) {
@ -455,9 +471,6 @@ stepNearGrab.prototype = {
showEntitiesWithTag(this.tag, { visible: true }); showEntitiesWithTag(this.tag, { visible: true });
showEntitiesWithTag('bothGrab', { visible: true }); showEntitiesWithTag('bothGrab', { visible: true });
var basketColliderID = findEntity({ name: NEAR_BASKET_COLLIDER_NAME }, 10000);
var basketPosition = Entities.getEntityProperties(basketColliderID, 'position').position;
var boxSpawnID = findEntity({ name: NEAR_BOX_SPAWN_NAME }, 10000); var boxSpawnID = findEntity({ name: NEAR_BOX_SPAWN_NAME }, 10000);
if (!boxSpawnID) { if (!boxSpawnID) {
print("Error creating block, cannot find spawn"); print("Error creating block, cannot find spawn");
@ -473,17 +486,10 @@ stepNearGrab.prototype = {
// Enabled grab // Enabled grab
// Create table ? // Create table ?
// Create blocks and basket // Create blocks and basket
this.boxID = createBlock.bind(this)(); this.birdIDs = [];
this.boxID = createBlock.bind(this)(); this.birdIDs.push(createBlock.bind(this)());
this.boxID = createBlock.bind(this)(); this.birdIDs.push(createBlock.bind(this)());
print("Created", this.boxID); this.birdIDs.push(createBlock.bind(this)());
//function posChecker() {
//Vec3.distance(
//}
Messages.subscribe("Entity-Exploded");
Messages.messageReceived.connect(this.onMessage.bind(this));
// If block gets too far away or hasn't been touched for X seconds, create a new block and destroy the old block // If block gets too far away or hasn't been touched for X seconds, create a new block and destroy the old block
}, },
@ -493,12 +499,13 @@ stepNearGrab.prototype = {
} }
if (channel == "Entity-Exploded") { if (channel == "Entity-Exploded") {
print("TUTORIAL: Got entity-exploded message"); print("TUTORIAL: Got entity-exploded message");
playSuccessSound();
var data = parseJSON(message); var data = parseJSON(message);
//if (data.entityID == this.boxID) { if (this.birdIDs.indexOf(data.entityID) >= 0) {
playSuccessSound();
this.finished = true; this.finished = true;
this.onFinish(); this.onFinish();
//} }
} }
}, },
cleanup: function() { cleanup: function() {
@ -522,6 +529,11 @@ stepNearGrab.prototype = {
var stepFarGrab = function(name) { var stepFarGrab = function(name) {
this.tag = name; this.tag = name;
this.tempTag = name + "-temporary"; this.tempTag = name + "-temporary";
this.finished = true;
this.birdIDs = [];
Messages.subscribe("Entity-Exploded");
Messages.messageReceived.connect(this.onMessage.bind(this));
} }
stepFarGrab.prototype = { stepFarGrab.prototype = {
start: function(onFinish) { start: function(onFinish) {
@ -545,9 +557,6 @@ stepFarGrab.prototype = {
//spawnWithTag(Step1EntityData, transform, tag); //spawnWithTag(Step1EntityData, transform, tag);
showEntitiesWithTag(this.tag); showEntitiesWithTag(this.tag);
var basketColliderID = findEntity({ name: FAR_BASKET_COLLIDER_NAME }, 10000);
var basketPosition = Entities.getEntityProperties(basketColliderID, 'position').position;
function createBlock() { function createBlock() {
var boxSpawnID = findEntity({ name: FAR_BOX_SPAWN_NAME }, 10000); var boxSpawnID = findEntity({ name: FAR_BOX_SPAWN_NAME }, 10000);
if (!boxSpawnID) { if (!boxSpawnID) {
@ -559,30 +568,10 @@ stepFarGrab.prototype = {
return spawnWithTag([birdFirework1], null, this.tempTag)[0]; return spawnWithTag([birdFirework1], null, this.tempTag)[0];
} }
// Enabled grab this.birdIDs = [];
// Create table ? this.birdIDs.push(createBlock.bind(this)());
// Create blocks and basket this.birdIDs.push(createBlock.bind(this)());
this.boxID = createBlock.bind(this)(); this.birdIDs.push(createBlock.bind(this)());
this.boxID = createBlock.bind(this)();
this.boxID = createBlock.bind(this)();
print("Created", this.boxID);
Messages.subscribe("Entity-Exploded");
Messages.messageReceived.connect(this.onMessage.bind(this));
// When block collides with basket start step 2
//var checkCollidesTimer = null;
// function checkCollides() {
// print("CHECKING...");
// if (Vec3.distance(basketPosition, Entities.getEntityProperties(this.boxID, 'position').position) < 0.2) {
// Script.clearInterval(checkCollidesTimer);
// playSuccessSound();
// Script.setTimeout(onHit.bind(this), 1000);
// }
// }
// checkCollidesTimer = Script.setInterval(checkCollides.bind(this), 500);
// If block gets too far away or hasn't been touched for X seconds, create a new block and destroy the old block
}, },
onMessage: function(channel, message, seneder) { onMessage: function(channel, message, seneder) {
if (this.finished) { if (this.finished) {
@ -590,16 +579,15 @@ stepFarGrab.prototype = {
} }
if (channel == "Entity-Exploded") { if (channel == "Entity-Exploded") {
print("TUTORIAL: Got entity-exploded message"); print("TUTORIAL: Got entity-exploded message");
playSuccessSound();
var data = parseJSON(message); var data = parseJSON(message);
if (data.entityID == this.boxID) { if (this.birdIDs.indexOf(data.entityID) >= 0) {
playSuccessSound();
this.finished = true; this.finished = true;
this.onFinish(); this.onFinish();
} }
} }
}, },
cleanup: function() { cleanup: function() {
//Messages.messageReceived.disconnect(this.onMessage.bind(this));
this.finished = true; this.finished = true;
setControllerVisible("trigger", false); setControllerVisible("trigger", false);
setControllerPartLayer('tips', 'blank'); setControllerPartLayer('tips', 'blank');
@ -625,6 +613,9 @@ var stepEquip = function(name) {
this.PART1 = 0; this.PART1 = 0;
this.PART2 = 1; this.PART2 = 1;
this.COMPLETE = 2; this.COMPLETE = 2;
Messages.subscribe('Tutorial-Spinner');
Messages.messageReceived.connect(this.onMessage.bind(this));
} }
stepEquip.prototype = { stepEquip.prototype = {
start: function(onFinish) { start: function(onFinish) {
@ -636,30 +627,12 @@ stepEquip.prototype = {
var tag = this.tag; var tag = this.tag;
var defaultTransform = {
position: {
x: 0.0,
y: 0.0,
z: 0.75
},
rotation: {
x: 0,
y: 0,
z: 0,
w: 1
}
};
// Spawn content set // Spawn content set
//spawnWithTag(StepGunData, defaultTransform, tag);
showEntitiesWithTag(this.tag); showEntitiesWithTag(this.tag);
showEntitiesWithTag(this.tagPart1); showEntitiesWithTag(this.tagPart1);
this.currentPart = this.PART1; this.currentPart = this.PART1;
var basketColliderID = findEntity({ name: GUN_BASKET_COLLIDER_NAME }, 10000);
var basketPosition = Entities.getEntityProperties(basketColliderID, 'position').position;
function createGun() { function createGun() {
var boxSpawnID = findEntity({ name: GUN_SPAWN_NAME }, 10000); var boxSpawnID = findEntity({ name: GUN_SPAWN_NAME }, 10000);
if (!boxSpawnID) { if (!boxSpawnID) {
@ -669,14 +642,10 @@ stepEquip.prototype = {
var transform = {}; var transform = {};
GunData.position = Entities.getEntityProperties(boxSpawnID, 'position').position;
GunData.rotation = Entities.getEntityProperties(boxSpawnID, 'rotation').rotation;
transform.position = Entities.getEntityProperties(boxSpawnID, 'position').position; transform.position = Entities.getEntityProperties(boxSpawnID, 'position').position;
transform.rotation = Entities.getEntityProperties(boxSpawnID, 'rotation').rotation; transform.rotation = Entities.getEntityProperties(boxSpawnID, 'rotation').rotation;
this.spawnTransform = transform; this.spawnTransform = transform;
Vec3.print("spawn", GunData.position); return doCreateButaneLighter(transform).id;
print("Adding: ", JSON.stringify(GunData));
return doCreateButaneLighter(transform).id;//spawnWithTag([GunData], null, this.tempTag)[0];
} }
@ -687,30 +656,6 @@ stepEquip.prototype = {
this.startWatchingGun(); this.startWatchingGun();
print("Created", this.gunID); print("Created", this.gunID);
this.onFinish = onFinish; this.onFinish = onFinish;
Messages.subscribe('Tutorial-Spinner');
Messages.messageReceived.connect(this.onMessage.bind(this));
// function onHit() {
// }
//
// // When block collides with basket start step 2
// function checkCollides() {
// //print("CHECKING FOR PING PONG...");
// var ammoIDs = findEntities({ name: GUN_AMMO_NAME }, 15);
// for (var i = 0; i < ammoIDs.length; ++i) {
// if (Vec3.distance(basketPosition, Entities.getEntityProperties(ammoIDs[i], 'position').position) < 0.25) {
// Script.clearInterval(this.checkCollidesTimer);
// this.checkCollidesTimer = null;
// playSuccessSound();
// Script.setTimeout(onHit.bind(this), 1000);
// return;
// }
// }
// }
// this.checkCollidesTimer = Script.setInterval(checkCollides.bind(this), 100);
// If block gets too far away or hasn't been touched for X seconds, create a new block and destroy the old block
}, },
startWatchingGun: function() { startWatchingGun: function() {
if (!this.watcherIntervalID) { if (!this.watcherIntervalID) {
@ -733,7 +678,9 @@ stepEquip.prototype = {
if (this.currentPart == this.COMPLETE) { if (this.currentPart == this.COMPLETE) {
return; return;
} }
print("Got message", channel, message, sender, MyAvatar.sessionUUID); print("Got message", channel, message, sender, MyAvatar.sessionUUID);
if (channel == "Tutorial-Spinner") { if (channel == "Tutorial-Spinner") {
if (this.currentPart == this.PART1 && message == "wasLit") { if (this.currentPart == this.PART1 && message == "wasLit") {
Script.setTimeout(function() { Script.setTimeout(function() {
@ -742,38 +689,32 @@ stepEquip.prototype = {
showEntitiesWithTag(this.tagPart2); showEntitiesWithTag(this.tagPart2);
setControllerPartLayer('tips', 'grip'); setControllerPartLayer('tips', 'grip');
Messages.subscribe('Hifi-Object-Manipulation'); Messages.subscribe('Hifi-Object-Manipulation');
}.bind(this), 2000); }.bind(this), 9000);
} }
} else if (channel == "Hifi-Object-Manipulation") { } else if (channel == "Hifi-Object-Manipulation") {
if (this.currentPart == this.PART2) { if (this.currentPart == this.PART2) {
var data = parseJSON(message); var data = parseJSON(message);
print("Here", data.action, data.grabbedEntity, this.gunID);
if (data.action == 'release' && data.grabbedEntity == this.gunID) { if (data.action == 'release' && data.grabbedEntity == this.gunID) {
print("got release"); print("got release");
this.stopWatchingGun(); this.stopWatchingGun();
try {
Messages.messageReceived.disconnect(this.onMessage);
} catch(e) {
}
playSuccessSound(); playSuccessSound();
print("FINISHED");
Script.setTimeout(this.onFinish.bind(this), 1500); Script.setTimeout(this.onFinish.bind(this), 1500);
this.currentPart = this.COMPLETE; this.currentPart = this.COMPLETE;
//this.onFinish();
} }
} }
} }
}, },
cleanup: function() { cleanup: function() {
if (this.watcherIntervalID) {
Script.clearInterval(this.watcherIntervalID);
this.watcherIntervalID = null;
}
setControllerVisible("trigger", false); setControllerVisible("trigger", false);
setControllerPartLayer('tips', 'blank'); setControllerPartLayer('tips', 'blank');
this.stopWatchingGun(); this.stopWatchingGun();
this.currentPart = this.COMPLETE; this.currentPart = this.COMPLETE;
try {
Messages.messageReceived.disconnect(this.onMessage);
} catch(e) {
print("error disconnecting");
}
if (this.checkCollidesTimer) { if (this.checkCollidesTimer) {
Script.clearInterval(this.checkCollidesTimer); Script.clearInterval(this.checkCollidesTimer);
} }