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

all three markers

Browse source
This commit is contained in:
ericrius1 2016-02-19 17:33:54 -08:00
parent 68e289b433
commit 6fe9730897
1 changed files with 16 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -15,7 +15,7 @@ Script.include("../../libraries/utils.js")
var orientation = Camera.getOrientation(); var orientation = Camera.getOrientation();
orientation = Quat.safeEulerAngles(orientation); orientation = Quat.safeEulerAngles(orientation);
var markerRotation = Quat.fromVec3Degrees({ var markerRotation = Quat.fromVec3Degrees({
x: orientation.x + 10, x: orientation.x + 10,
y: orientation.y - 90, y: orientation.y - 90,
z: orientation.z z: orientation.z
}) })
@ -48,6 +48,7 @@ var whiteboard = Entities.addEntity({
}); });
createMarkers(); createMarkers();
function createMarkers() { function createMarkers() {
var modelURLS = [ var modelURLS = [
"https://s3-us-west-1.amazonaws.com/hifi-content/eric/models/marker-blue.fbx", "https://s3-us-west-1.amazonaws.com/hifi-content/eric/models/marker-blue.fbx",
@ -64,22 +65,20 @@ function createMarkers() {
}); });
Script.setTimeout(function() {
markerPosition = Vec3.sum(markerPosition, Vec3.multiply(-0.2, Quat.getFront(markerRotation))); markerPosition = Vec3.sum(markerPosition, Vec3.multiply(-0.2, Quat.getFront(markerRotation)));
createMarker(modelURLS[1], markerPosition, { createMarker(modelURLS[1], markerPosition, {
red: 200, red: 200,
green: 10, green: 10,
blue: 10 blue: 10
}); });
}, 1000);
// markerPosition = Vec3.sum(markerPosition, Vec3.multiply(0.4, Quat.getFront(markerRotation))); markerPosition = Vec3.sum(markerPosition, Vec3.multiply(0.4, Quat.getFront(markerRotation)));
// createMarker(modelURLS[2], markerPosition, { createMarker(modelURLS[2], markerPosition, {
// red: 10, red: 10,
// green: 10, green: 10,
// blue: 10 blue: 10
// }); });
} }
@ -147,7 +146,7 @@ function createMarker(modelURL, markerPosition, markerColor) {
var modelURL = Entities.getEntityProperties(marker, "modelURL").modelURL; var modelURL = Entities.getEntityProperties(marker, "modelURL").modelURL;
print("EBL MARKER URL " + JSON.stringify(modelURL)) print("EBL MARKER URL " + JSON.stringify(modelURL))
print("EBL MARKER COLOR " + JSON.stringify(markerColor)) print("EBL MARKER COLOR " + JSON.stringify(markerColor))
Entities.callEntityMethod(marker, "setProperties", [JSON.stringify(data)]); Entities.callEntityMethod(marker, "setProperties", [JSON.stringify(data)]);
}, 1000) }, 1000)
@ -158,7 +157,7 @@ function createMarker(modelURL, markerPosition, markerColor) {
function cleanup() { function cleanup() {
Entities.deleteEntity(whiteboard); Entities.deleteEntity(whiteboard);
markers.forEach(function(marker){ markers.forEach(function(marker) {
Entities.deleteEntity(marker); Entities.deleteEntity(marker);
}); });
} }