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

whitebrd

Browse source
This commit is contained in:
James B. Pollack 2016-03-17 10:36:35 -07:00
parent bdcc621996
commit 9933690ed6
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
unpublishedScripts/DomainContent/Home/reset.js
View file

@ -148,11 +148,13 @@
x: 1101.2123, x: 1101.2123,
y: 460.2328, y: 460.2328,
z: -65.8513 z: -65.8513
}, { },
{
x: 97.3683, x: 97.3683,
y: 179.0293, y: 179.0293,
z: 89.9698 z: 89.9698
}); }
);

4
unpublishedScripts/DomainContent/Home/whiteboard/wrapper.js
View file

@ -16,11 +16,11 @@ var MARKER_SCRIPT_URL = Script.resolvePath("markerEntityScript.js?" + Math.rando
Whiteboard = function(spawnPosition, spawnRotation) { Whiteboard = function(spawnPosition, spawnRotation) {
var orientation = Quat.fromPitchYawRollDegrees(spawnRotation.x,spawnRotation.y,spawnRotation.z); var orientation = Quat.fromPitchYawRollDegrees(spawnRotation.x, spawnRotation.y, spawnRotation.z);
var markers = []; var markers = [];
var whiteboardPosition = spawnPosition; var whiteboardPosition = spawnPosition;
var whiteboardRotation = orientation;
var WHITEBOARD_MODEL_URL = "https://s3-us-west-1.amazonaws.com/hifi-content/eric/models/Whiteboard-4.fbx"; var WHITEBOARD_MODEL_URL = "https://s3-us-west-1.amazonaws.com/hifi-content/eric/models/Whiteboard-4.fbx";
var WHITEBOARD_COLLISION_HULL_URL = "https://s3-us-west-1.amazonaws.com/hifi-content/eric/models/whiteboardCollisionHull.obj"; var WHITEBOARD_COLLISION_HULL_URL = "https://s3-us-west-1.amazonaws.com/hifi-content/eric/models/whiteboardCollisionHull.obj";
var whiteboard = Entities.addEntity({ var whiteboard = Entities.addEntity({