Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 00:56:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

passing marker color accross

Browse source
This commit is contained in:
ericrius1 2016-02-19 14:15:55 -08:00
parent 40176b0424
commit 9ae1ccee50
2 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
examples/homeContent/whiteboardV2/markerEntityScript.js
View file

@ -72,7 +72,7 @@
}, },
position: position, position: position,
textures: _this.MARKER_TEXTURE_URL, textures: _this.MARKER_TEXTURE_URL,
color: {red: 0, green: 10, blue: 200} color: _this.markerColor
}); });
_this.linePoints = []; _this.linePoints = [];
@ -127,10 +127,12 @@
print("EBL PRELOAD"); print("EBL PRELOAD");
}, },
setWhiteboard: function(myId, data) { setProperties: function(myId, data) {
_this.whiteboard = JSON.parse(data[0]); var data = JSON.parse(data);
_this.whiteboard = data.whiteboard;
var whiteboardProps = Entities.getEntityProperties(_this.whiteboard, ["rotation"]); var whiteboardProps = Entities.getEntityProperties(_this.whiteboard, ["rotation"]);
_this.whiteboardNormal = Quat.getRight(whiteboardProps.rotation); _this.whiteboardNormal = Quat.getRight(whiteboardProps.rotation);
_this.markerColor = data.markerColor;
} }
}; };

6
examples/homeContent/whiteboardV2/whiteboardSpawner.js
View file

@ -95,7 +95,11 @@ var marker = Entities.addEntity({
}); });
Script.setTimeout(function() { Script.setTimeout(function() {
Entities.callEntityMethod(marker, "setWhiteboard", [JSON.stringify(whiteboard)]); var data = {
whiteboard: whiteboard,
markerColor: {red: 10, green: 10, blue: 200}
}
Entities.callEntityMethod(marker, "setProperties", [JSON.stringify(data)]);
}, 1000) }, 1000)