attempting duplicate script approach

This commit is contained in:
ericrius1 2015-10-07 15:58:47 -07:00
parent 3f3c91116b
commit 3c8b1b2a4e
4 changed files with 1173 additions and 35 deletions

View file

@ -14,8 +14,7 @@
var _this;
var masterResetScript = Script.resolvePath("masterReset.js");
print("masterResetScript PATH " + masterResetScript);
var masterResetScript = Script.resolvePath("masterResetFromEntity.js");
Script.include(masterResetScript);
ResetSwitch = function () {

View file

@ -3,6 +3,40 @@
/*global MasterReset */
var masterResetScript = Script.resolvePath("masterReset.js");
var hiddenEntityScriptURL = Script.resolvePath("hiddenEntityReset.js");
Script.include(masterResetScript);
function createHiddenMasterSwitch() {
var resetKey = "resetMe";
var masterSwitch = Entities.addEntity({
type: "Box",
name: "Master Switch",
script: hiddenEntityScriptURL,
dimensions: {
x: 0.2,
y: 0.2,
z: 0.2
},
color: {
red: 42,
green: 36,
blue: 30
},
position: {
x: 554,
y: 495.5,
z: 503.2
}
});
setEntityCustomData(resetKey, masterSwitch, {
resetMe: true
});
}
createHiddenMasterSwitch();
MasterReset();

View file

@ -14,7 +14,6 @@
var utilitiesScript = Script.resolvePath("../examples/libraries/utils.js");
Script.include(utilitiesScript);
var hiddenEntityScriptURL = Script.resolvePath("hiddenEntityReset.js");
var sprayPaintScriptURL = Script.resolvePath("../examples/toys/sprayPaintCan.js");
var catScriptURL = Script.resolvePath("../examples/toys/cat.js");
var flashlightScriptURL = Script.resolvePath('../examples/toys/flashlight/flashlight.js');
@ -23,12 +22,9 @@ var wandScriptURL = Script.resolvePath("../examples/toys/bubblewand/wand.js");
var dollScriptURL = Script.resolvePath("../examples/toys/doll/doll.js");
var lightsScriptURL = Script.resolvePath("../examples/toys/lightSwitch.js");
print("hiddenEntityScript PATH OUTER " + hiddenEntityScriptURL);
MasterReset = function () {
print("hiddenEntityScript PATH INNER " + hiddenEntityScriptURL);
var resetKey = "resetMe";
var GRABBABLE_DATA_KEY = "grabbableKey";
@ -130,35 +126,6 @@ MasterReset = function () {
function createHiddenMasterSwitch() {
var masterSwitch = Entities.addEntity({
type: "Box",
name: "Master Switch",
script: hiddenEntityScriptURL,
dimensions: {
x: 0.2,
y: 0.2,
z: 0.2
},
color: {
red: 42,
green: 36,
blue: 30
},
position: {
x: 554,
y: 495.5,
z: 503.2
}
});
setEntityCustomData(resetKey, masterSwitch, {
resetMe: true
});
}
function createFire() {

File diff suppressed because it is too large Load diff