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

rotation works right now

Browse source
This commit is contained in:
ericrius1 2016-02-26 11:33:59 -08:00
parent c81f3256dd
commit 1542b9da12
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -24,7 +24,7 @@
_this = this;
_this.MARKER_TEXTURE_URL = "https://s3-us-west-1.amazonaws.com/hifi-content/eric/textures/markerStroke.png";
_this.strokeForwardOffset = 0.0001;
_this.STROKE_WIDTH = 0.003
_this.STROKE_WIDTH = 0.03
_this.MAX_MARKER_TO_BOARD_DISTANCE = 1.4;
_this.MIN_DISTANCE_BETWEEN_POINTS = 0.002;
_this.MAX_DISTANCE_BETWEEN_POINTS = 0.1;
@ -73,11 +73,11 @@
}
var intersection = Entities.findRayIntersectionBlocking(pickRay, true, _this.whiteboards);
if (intersection.intersects && Vec3.distance(intersection.intersection, markerProps.position) < _this.MAX_MARKER_TO_BOARD_DISTANCE) {
_this.whiteboardNormal = Quat.getRight(intersection.properties.rotation);
_this.whiteboardNormal = Quat.getFront(intersection.properties.rotation);
Overlays.editOverlay(_this.laserPointer, {
visible: true,
position: intersection.intersection,
rotation: intersection.properties.rotation
// rotation: intersection.properties.rotation
})
_this.triggerValue = Controller.getValue(TRIGGER_CONTROLS[_this.hand]);
if (_this.triggerValue > _this.PAINTING_TRIGGER_THRESHOLD) {

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

@ -69,7 +69,7 @@ var whiteboardDrawingSurface = Entities.addEntity({
},
position: whiteboardSurfacePosition,
rotation: whiteboardRotation,
// visible: false,
visible: false,
parentID: whiteboard
});
@ -166,7 +166,7 @@ function createMarkers() {
function createMarker(modelURL, markerPosition, markerColor) {
var MARKER_SCRIPT_URL = Script.resolvePath("markerEntityScript.js");
var MARKER_SCRIPT_URL = Script.resolvePath("markerEntityScript.js?v1" + Math.random());
var marker = Entities.addEntity({
type: "Model",
modelURL: modelURL,