Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-07 16:30:42 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

need to figure out why only one marker working

Browse source
This commit is contained in:
ericrius1 2016-02-19 15:56:12 -08:00
parent 9ae1ccee50
commit 756b7e223d
2 changed files with 110 additions and 66 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -99,12 +99,10 @@
if (_this.linePoints.length > 0) {
var distance = Vec3.distance(localPoint, _this.linePoints[_this.linePoints.length-1]);
if (distance < _this.MIN_DISTANCE_BETWEEN_POINTS) {
print("EBL not enough distance")
return;
}
}
_this.linePoints.push(localPoint);
_this.normals.push(_this.whiteboardNormal);
this.strokeWidths.push(_this.STROKE_WIDTH);
@ -131,6 +129,7 @@
var data = JSON.parse(data);
_this.whiteboard = data.whiteboard;
var whiteboardProps = Entities.getEntityProperties(_this.whiteboard, ["rotation"]);
print("EBL: MARKER COLOR " + JSON.stringify(data.markerColor));
_this.whiteboardNormal = Quat.getRight(whiteboardProps.rotation);
_this.markerColor = data.markerColor;
}

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

@ -13,13 +13,19 @@
var orientation = Camera.getOrientation();
orientation = Quat.safeEulerAngles(orientation);
orientation.x = 0;
var whiteboardRotation = Quat.fromVec3Degrees({
x: orientation.x,
var markerRotation = Quat.fromVec3Degrees({
x: orientation.x + 10,
y: orientation.y - 90,
z: orientation.z
})
orientation.x = 0;
var whiteboardRotation = Quat.fromVec3Degrees({
x: 0,
y: orientation.y - 90,
z: 0
});
orientation = Quat.fromVec3Degrees(orientation);
var markers = [];
var whiteboardPosition = Vec3.sum(MyAvatar.position, Vec3.multiply(2, Quat.getFront(orientation)));
@ -40,73 +46,112 @@ var whiteboard = Entities.addEntity({
}
});
var markerPosition = Vec3.sum(MyAvatar.position, Vec3.multiply(1.9, Quat.getFront(orientation)));
var MARKER_MODEL_URL = "https://s3-us-west-1.amazonaws.com/hifi-content/eric/models/marker-blue.fbx";
var MARKER_SCRIPT_URL = Script.resolvePath("markerEntityScript.js?v1" + Math.random());
var marker = Entities.addEntity({
type: "Model",
modelURL: MARKER_MODEL_URL,
shapeType: "box",
dynamic: true,
gravity: {
x: 0,
y: -1,
z: 0
},
velocity: {
x: 0,
y: -0.1,
z: 0
},
position: markerPosition,
dimensions: {
x: 0.0270,
y: 0.0272,
z: 0.1641
},
name: "marker",
script: MARKER_SCRIPT_URL,
userData: JSON.stringify({
wearable: {
joints: {
RightHand: [{
x: 0.001109793782234192,
y: 0.13991504907608032,
z: 0.05035984516143799
}, {
x: -0.7360993027687073,
y: -0.04330085217952728,
z: -0.10863728821277618,
w: -0.6666942238807678
}],
LeftHand: [{
x: 0.007193896919488907,
y: 0.15147076547145844,
z: 0.06174466013908386
}, {
x: -0.4174973964691162,
y: 0.631147563457489,
z: -0.3890438377857208,
w: -0.52535080909729
}]
}
}
})
});
createMarkers();
function createMarkers() {
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-red.fbx",
"https://s3-us-west-1.amazonaws.com/hifi-content/eric/models/marker-black.fbx",
];
Script.setTimeout(function() {
var data = {
whiteboard: whiteboard,
markerColor: {red: 10, green: 10, blue: 200}
}
Entities.callEntityMethod(marker, "setProperties", [JSON.stringify(data)]);
}, 1000)
var markerPosition = Vec3.sum(MyAvatar.position, Vec3.multiply(1.9, Quat.getFront(orientation)));
createMarker(modelURLS[0], markerPosition, {
red: 10,
green: 10,
blue: 200
});
markerPosition = Vec3.sum(markerPosition, Vec3.multiply(-0.2, Quat.getFront(markerRotation)));
createMarker(modelURLS[1], markerPosition, {
red: 200,
green: 10,
blue: 10
});
markerPosition = Vec3.sum(markerPosition, Vec3.multiply(0.4, Quat.getFront(markerRotation)));
createMarker(modelURLS[2], markerPosition, {
red: 10,
green: 10,
blue: 10
});
}
function createMarker(modelURL, markerPosition, markerColor) {
var MARKER_SCRIPT_URL = Script.resolvePath("markerEntityScript.js?v1" + Math.random());
var marker = Entities.addEntity({
type: "Model",
modelURL: modelURL,
rotation: markerRotation,
shapeType: "box",
dynamic: true,
gravity: {
x: 0,
y: -1,
z: 0
},
velocity: {
x: 0,
y: -0.1,
z: 0
},
position: markerPosition,
dimensions: {
x: 0.0270,
y: 0.0272,
z: 0.1641
},
name: "marker",
script: MARKER_SCRIPT_URL,
userData: JSON.stringify({
wearable: {
joints: {
RightHand: [{
x: 0.001109793782234192,
y: 0.13991504907608032,
z: 0.05035984516143799
}, {
x: -0.7360993027687073,
y: -0.04330085217952728,
z: -0.10863728821277618,
w: -0.6666942238807678
}],
LeftHand: [{
x: 0.007193896919488907,
y: 0.15147076547145844,
z: 0.06174466013908386
}, {
x: -0.4174973964691162,
y: 0.631147563457489,
z: -0.3890438377857208,
w: -0.52535080909729
}]
}
}
})
});
markers.push(marker);
Script.setTimeout(function() {
var data = {
whiteboard: whiteboard,
markerColor: markerColor
}
Entities.callEntityMethod(marker, "setProperties", [JSON.stringify(data)]);
}, 1000)
}
function cleanup() {
Entities.deleteEntity(whiteboard);
Entities.deleteEntity(marker);
markers.forEach(function(marker){
Entities.deleteEntity(marker);
});
}
Script.scriptEnding.connect(cleanup);