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

Added color status bar

Browse source
This commit is contained in:
ericrius1 2015-10-14 16:46:23 -07:00
parent 4c709cba35
commit 5082ac4583
3 changed files with 35 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
examples/painting/whiteboard/colorIndicatorEntityScript.js
View file

@ -21,20 +21,21 @@
ColorIndicator.prototype = {
changeColor: function() {
var newColor = Entities.getEntityProperties(this.whiteboard, "userData").currentColor;
Entities.editEntity(this.EntityID, {
var userData = JSON.parse(Entities.getEntityProperties(this.whiteboard, "userData").userData);
var newColor = userData.currentColor;
Entities.editEntity(this.entityID, {
color: newColor
});
},
preload: function(entityID) {
this.entityID = entityID;
var props = Entities.getEntityProperties(this.entityID, "userData");
var props = Entities.getEntityProperties(this.entityID, ["position", "userData"]);
this.position = props.position;
this.whiteboard = JSON.parse(props.userData).whiteboard;
},
};
};
// entity scripts always need to return a newly constructed object of our type
return new ColorIndicator();

2
examples/painting/whiteboard/whiteboardEntityScript.js
View file

@ -189,6 +189,8 @@
Overlays.editOverlay(this.laserPointer, {
color: this.strokeColor
});
Entities.callEntityMethod(this.colorIndicator, "changeColor");
},
eraseBoard: function() {

36
examples/painting/whiteboard/whiteboardSpawner.js
View file

@ -63,17 +63,29 @@ var colorIndicatorDimensions = {
z: 0.02
};
scriptURL = Script.resolvePath("colorIndicatorEntityScript.js");
var colorIndicatorPosition = Vec3.sum(center, {x: 0, y: whiteboardDimensions.y/2 + colorIndicatorDimensions.y/2, z: 0});
var colorIndicatorPosition = Vec3.sum(center, {
x: 0,
y: whiteboardDimensions.y / 2 + colorIndicatorDimensions.y / 2,
z: 0
});
var colorIndicatorBox = Entities.addEntity({
type: "Box",
color: colors[0],
rotation: rotation,
position: colorIndicatorPosition,
dimensions: colorIndicatorDimensions,
script: scriptURL
script: scriptURL,
userData: JSON.stringify({
whiteboard: whiteboard
})
});
Entities.editEntity(whiteboard, {userData: JSON.stringify({currentColor: colors[i], colorIndicator: colorIndicatorBox})} );
Entities.editEntity(whiteboard, {
userData: JSON.stringify({
currentColor: colors[0],
colorIndicator: colorIndicatorBox
})
});
//COLOR BOXES
var direction = Quat.getRight(rotation);
@ -84,7 +96,7 @@ var colorSquareDimensions = {
y: 0.1,
z: 0.05
};
colorBoxPosition.y += whiteboardDimensions.y / 2 + colorIndicatorDimensions.y + colorSquareDimensions.y / 2;
colorBoxPosition.y += whiteboardDimensions.y / 2 + colorIndicatorDimensions.y + colorSquareDimensions.y / 2;
var spaceBetweenColorBoxes = Vec3.multiply(direction, colorSquareDimensions.x * 2);
var scriptURL = Script.resolvePath("colorSelectorEntityScript.js");
for (var i = 0; i < colors.length; i++) {
@ -106,18 +118,26 @@ for (var i = 0; i < colors.length; i++) {
// BLACK BOX
var blackBoxDimensions = {x: .2, y: .2, z: 0.05};
colorBoxPosition = Vec3.subtract(center, Vec3.multiply(direction, whiteboardDimensions.x / 2 + blackBoxDimensions.x/2 - 0.01));
var blackBoxDimensions = {
x: .2,
y: .2,
z: 0.05
};
colorBoxPosition = Vec3.subtract(center, Vec3.multiply(direction, whiteboardDimensions.x / 2 + blackBoxDimensions.x / 2 - 0.01));
colorBoxPosition.y += 0.3;
var blackBox = Entities.addEntity({
type: 'Box',
position: colorBoxPosition,
dimensions: blackBoxDimensions,
rotation: rotation,
color: {red: 0, green: 0, blue: 0},
color: {
red: 0,
green: 0,
blue: 0
},
script: scriptURL,
userData: JSON.stringify({
whiteboard: whiteboard
whiteboard: whiteboard
})
});