Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-08-08 03:27:23 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed bug where spawning one marker would destroy the other

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

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

@ -15,7 +15,7 @@
Script.include("../../libraries/utils.js");
var MAX_POINTS_PER_STROKE = 40;
var _this;
MarkerTip = function() {
_this = this;
_this.MARKER_TEXTURE_URL = "https://s3-us-west-1.amazonaws.com/hifi-content/eric/textures/markerStroke.png";
@ -49,12 +49,17 @@
origin: markerProps.position,
direction: Quat.getFront(markerProps.rotation)
}
print('MARKER ID'+_this.entityID)
print('MARKER POSITION'+JSON.stringify(markerProps.position))
var intersection = Entities.findRayIntersection(pickRay, true, [_this.whiteboard]);
print('WHITEBOARD AT CONTINUE:: '+_this.whiteboard);
print('DOES INTERSECT??'+intersection.intersects)
print('MARKER DISTANCE::'+Vec3.distance(intersection.intersection, markerProps.position))
print('MAX DISTANCE::'+_this.MAX_MARKER_TO_BOARD_DISTANCE)
if (intersection.intersects && Vec3.distance(intersection.intersection, markerProps.position) < _this.MAX_MARKER_TO_BOARD_DISTANCE) {
this.paint(intersection.intersection)
} else {
print('not painting because intersection')
_this.currentStroke = null;
_this.oldPosition = null;
}
@ -103,6 +108,7 @@
}
}
print("PAINT " + JSON.stringify(_this.markerColor));
_this.linePoints.push(localPoint);
_this.normals.push(_this.whiteboardNormal);
this.strokeWidths.push(_this.STROKE_WIDTH);
@ -127,9 +133,10 @@
setProperties: function(myId, data) {
var data = JSON.parse(data);
print("EBL SET PROPERTIES! ON " + JSON.stringify(data.markerColor)+ "id:"+ JSON.stringify(myId));
_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;
}

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

@ -10,6 +10,7 @@
// Distributed under the Apache License, Version 2.0.
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
Script.include("../../libraries/utils.js")
var orientation = Camera.getOrientation();
orientation = Quat.safeEulerAngles(orientation);
@ -62,19 +63,23 @@ function createMarkers() {
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
});
Script.setTimeout(function() {
markerPosition = Vec3.sum(markerPosition, Vec3.multiply(-0.2, Quat.getFront(markerRotation)));
createMarker(modelURLS[1], markerPosition, {
red: 200,
green: 10,
blue: 10
});
}, 1000);
// markerPosition = Vec3.sum(markerPosition, Vec3.multiply(0.4, Quat.getFront(markerRotation)));
// createMarker(modelURLS[2], markerPosition, {
// red: 10,
// green: 10,
// blue: 10
// });
}
@ -139,6 +144,10 @@ function createMarker(modelURL, markerPosition, markerColor) {
whiteboard: whiteboard,
markerColor: markerColor
}
var modelURL = Entities.getEntityProperties(marker, "modelURL").modelURL;
print("EBL MARKER URL " + JSON.stringify(modelURL))
print("EBL MARKER COLOR " + JSON.stringify(markerColor))
Entities.callEntityMethod(marker, "setProperties", [JSON.stringify(data)]);
}, 1000)