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

markers resetting

Browse source
This commit is contained in:
ericrius1 2016-02-26 14:29:43 -08:00
parent e83c1f71a6
commit 48f03ba476
2 changed files with 24 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -24,7 +24,10 @@
_this = this; _this = this;
_this.MARKER_TEXTURE_URL = "https://s3-us-west-1.amazonaws.com/hifi-content/eric/textures/markerStroke.png"; _this.MARKER_TEXTURE_URL = "https://s3-us-west-1.amazonaws.com/hifi-content/eric/textures/markerStroke.png";
_this.strokeForwardOffset = 0.0001; _this.strokeForwardOffset = 0.0001;
_this.STROKE_WIDTH_RANGE = {min: 0.002, max: 0.01}; _this.STROKE_WIDTH_RANGE = {
min: 0.002,
max: 0.01
};
_this.MAX_MARKER_TO_BOARD_DISTANCE = 1.4; _this.MAX_MARKER_TO_BOARD_DISTANCE = 1.4;
_this.MIN_DISTANCE_BETWEEN_POINTS = 0.002; _this.MIN_DISTANCE_BETWEEN_POINTS = 0.002;
_this.MAX_DISTANCE_BETWEEN_POINTS = 0.1; _this.MAX_DISTANCE_BETWEEN_POINTS = 0.1;
@ -32,6 +35,7 @@
_this.PAINTING_TRIGGER_THRESHOLD = 0.2; _this.PAINTING_TRIGGER_THRESHOLD = 0.2;
_this.STROKE_NAME = "hifi-marker-stroke"; _this.STROKE_NAME = "hifi-marker-stroke";
_this.WHITEBOARD_SURFACE_NAME = "hifi-whiteboardDrawingSurface"; _this.WHITEBOARD_SURFACE_NAME = "hifi-whiteboardDrawingSurface";
_this.MARKER_RESET_WAIT_TIME = 3000;
}; };
MarkerTip.prototype = { MarkerTip.prototype = {
@ -60,6 +64,20 @@
Overlays.editOverlay(_this.laserPointer, { Overlays.editOverlay(_this.laserPointer, {
visible: false visible: false
}); });
// Once user releases marker, wait a bit then put marker back to its original position and rotation
Script.setTimeout(function() {
var userData = getEntityUserData(_this.entityID);
Entities.editEntity(_this.entityID, {
position: userData.originalPosition,
rotation: userData.originalRotation,
velocity: {
x: 0,
y: -0.01,
z: 0
}
});
}, _this.MARKER_RESET_WAIT_TIME);
}, },
@ -75,7 +93,7 @@
if (intersection.intersects && Vec3.distance(intersection.intersection, markerProps.position) < _this.MAX_MARKER_TO_BOARD_DISTANCE) { if (intersection.intersects && Vec3.distance(intersection.intersection, markerProps.position) < _this.MAX_MARKER_TO_BOARD_DISTANCE) {
var whiteboardRotation = Entities.getEntityProperties(intersection.entityID, "rotation").rotation; var whiteboardRotation = Entities.getEntityProperties(intersection.entityID, "rotation").rotation;
_this.whiteboardNormal = Quat.getFront(whiteboardRotation); _this.whiteboardNormal = Quat.getFront(whiteboardRotation);
Overlays.editOverlay(_this.laserPointer, { Overlays.editOverlay(_this.laserPointer, {
visible: true, visible: true,
position: intersection.intersection, position: intersection.intersection,
@ -142,9 +160,9 @@
var strokeWidths = []; var strokeWidths = [];
for (var i = 0; i < _this.linePoints.length; i++) { for (var i = 0; i < _this.linePoints.length; i++) {
// Create a temp array of stroke widths for calligraphy effect - start and end should be less wide // Create a temp array of stroke widths for calligraphy effect - start and end should be less wide
var pointsFromCenter = Math.abs(_this.linePoints.length/2 - i); var pointsFromCenter = Math.abs(_this.linePoints.length / 2 - i);
print("EBL POINTS CENTER " + pointsFromCenter) print("EBL POINTS CENTER " + pointsFromCenter)
var pointWidth = map(pointsFromCenter, 0, this.linePoints.length/2, _this.STROKE_WIDTH_RANGE.max, this.STROKE_WIDTH_RANGE.min); var pointWidth = map(pointsFromCenter, 0, this.linePoints.length / 2, _this.STROKE_WIDTH_RANGE.max, this.STROKE_WIDTH_RANGE.min);
strokeWidths.push(pointWidth); strokeWidths.push(pointWidth);
} }

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

@ -202,6 +202,8 @@ function createMarker(modelURL, markerPosition, markerColor) {
name: "marker", name: "marker",
script: MARKER_SCRIPT_URL, script: MARKER_SCRIPT_URL,
userData: JSON.stringify({ userData: JSON.stringify({
originalPosition: markerPosition,
originalRotation: markerRotation,
markerColor: markerColor, markerColor: markerColor,
wearable: { wearable: {
joints: { joints: {