Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-21 06:44:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #6056 from ericrius1/entityResetFix

Browse source 
Fixed syntax error in hiddenEntityResetScript
This commit is contained in:
James B. Pollack 2015-10-12 15:38:18 -07:00
commit 6265563084
2 changed files with 15 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
unpublishedScripts/hiddenEntityReset.js
View file

@ -52,7 +52,6 @@
};
MasterReset = function() {
var resetKey = "resetMe";
var GRABBABLE_DATA_KEY = "grabbableKey";
@ -407,11 +406,6 @@
type: 'Box',
position: startPosition,
dimensions: TARGET_DIMENSIONS,
color: {
red: 0,
green: 255,
blue: 0
},
rotation: rotation,
visible: false,
collisionsWillMove: false,
@ -658,6 +652,7 @@
green: 146,
blue: 24
},
isSpotlight: false,
userData: JSON.stringify({
resetMe: {
resetMe: true,
@ -685,6 +680,7 @@
green: 146,
blue: 24
},
isSpotlight: false,
userData: JSON.stringify({
resetMe: {
resetMe: true,
@ -734,7 +730,6 @@
var sconceLight3 = Entities.addEntity({
type: "Light",
position: {
@ -755,6 +750,7 @@
green: 146,
blue: 24
},
isSpotlight: false,
userData: JSON.stringify({
resetMe: {
resetMe: true,
@ -783,6 +779,7 @@
green: 146,
blue: 24
},
isSpotlight: false,
userData: JSON.stringify({
resetMe: {
resetMe: true,
@ -810,6 +807,7 @@
green: 146,
blue: 24
},
isSpotlight: false,
userData: JSON.stringify({
resetMe: {
resetMe: true,
@ -888,7 +886,7 @@
y: 1.13,
z: 0.2
},
rotation: rotation2,
rotation: rotation,
collisionsWillMove: true,
gravity: {
x: 0,
@ -1256,7 +1254,7 @@
y: 0.05,
z: 0.25
}
},];
}, ];
var modelURL, entity;
for (i = 0; i < blockTypes.length; i++) {
@ -1305,7 +1303,6 @@
Script.scriptEnding.connect(cleanup);
}
};
// entity scripts always need to return a newly constructed object of our type
return new ResetSwitch();
});
});

10
unpublishedScripts/masterReset.js
View file

@ -625,6 +625,7 @@ MasterReset = function() {
green: 146,
blue: 24
},
isSpotlight: false,
userData: JSON.stringify({
resetMe: {
resetMe: true,
@ -652,6 +653,7 @@ MasterReset = function() {
green: 146,
blue: 24
},
isSpotlight: false,
userData: JSON.stringify({
resetMe: {
resetMe: true,
@ -701,7 +703,6 @@ MasterReset = function() {
var sconceLight3 = Entities.addEntity({
type: "Light",
position: {
@ -722,6 +723,7 @@ MasterReset = function() {
green: 146,
blue: 24
},
isSpotlight: false,
userData: JSON.stringify({
resetMe: {
resetMe: true,
@ -750,6 +752,7 @@ MasterReset = function() {
green: 146,
blue: 24
},
isSpotlight: false,
userData: JSON.stringify({
resetMe: {
resetMe: true,
@ -777,6 +780,7 @@ MasterReset = function() {
green: 146,
blue: 24
},
isSpotlight: false,
userData: JSON.stringify({
resetMe: {
resetMe: true,
@ -1223,7 +1227,7 @@ MasterReset = function() {
y: 0.05,
z: 0.25
}
},];
}, ];
var modelURL, entity;
for (i = 0; i < blockTypes.length; i++) {
@ -1271,4 +1275,4 @@ MasterReset = function() {
Script.scriptEnding.connect(cleanup);
}
};
};