mirror of
https://github.com/overte-org/overte.git
synced 2025-08-06 02:19:58 +02:00
removed s3 paths
This commit is contained in:
parent
bd4e3b3460
commit
1257fac0f5
1 changed files with 9 additions and 24 deletions
|
@ -26,12 +26,8 @@ Whiteboard = function(spawnPosition, spawnRotation) {
|
||||||
var whiteboardPosition = spawnPosition;
|
var whiteboardPosition = spawnPosition;
|
||||||
var whiteboardRotation = orientation;
|
var whiteboardRotation = orientation;
|
||||||
|
|
||||||
// var WHITEBOARD_MODEL_URL = "atp:/whiteboard/Whiteboard-4.fbx";
|
var WHITEBOARD_MODEL_URL = "atp:/whiteboard/Whiteboard-4.fbx";
|
||||||
// var WHITEBOARD_COLLISION_HULL_URL = "atp:/whiteboard/whiteboardCollisionHull.obj";
|
var WHITEBOARD_COLLISION_HULL_URL = "atp:/whiteboard/whiteboardCollisionHull.obj";
|
||||||
|
|
||||||
// EBL REMOVE ME
|
|
||||||
var WHITEBOARD_MODEL_URL = "https://hifi-content.s3.amazonaws.com/eric/models/Whiteboard-4.fbx";
|
|
||||||
var WHITEBOARD_COLLISION_HULL_URL = "https://hifi-content.s3.amazonaws.com/eric/models/whiteboardCollisionHull.obj";
|
|
||||||
|
|
||||||
var whiteboard = Entities.addEntity({
|
var whiteboard = Entities.addEntity({
|
||||||
type: "Model",
|
type: "Model",
|
||||||
|
@ -100,14 +96,11 @@ Whiteboard = function(spawnPosition, spawnRotation) {
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
// ************ ERAAAAAAASSSEERRRR ************************************************
|
// ************ ERASER ************************************************
|
||||||
// ********************************************************************************
|
|
||||||
var ERASER_MODEL_URL = "atp:/whiteboard/eraser-2.fbx";
|
var ERASER_MODEL_URL = "atp:/whiteboard/eraser-2.fbx";
|
||||||
|
|
||||||
// EBL REMOVE ME
|
|
||||||
var ERASER_MODEL_URL = "https://s3.amazonaws.com/hifi-public/eric/models/eraser.fbx";
|
|
||||||
|
|
||||||
|
|
||||||
var eraserPosition = Vec3.sum(spawnPosition, Vec3.multiply(Quat.getFront(whiteboardRotation), -0.1));
|
var eraserPosition = Vec3.sum(spawnPosition, Vec3.multiply(Quat.getFront(whiteboardRotation), -0.1));
|
||||||
eraserPosition = Vec3.sum(eraserPosition, Vec3.multiply(-0.5, Quat.getRight(whiteboardRotation)));
|
eraserPosition = Vec3.sum(eraserPosition, Vec3.multiply(-0.5, Quat.getRight(whiteboardRotation)));
|
||||||
var eraserRotation = markerRotation;
|
var eraserRotation = markerRotation;
|
||||||
|
@ -170,24 +163,16 @@ Whiteboard = function(spawnPosition, spawnRotation) {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// *************************************************************************************************
|
|
||||||
// *************************************************************************************************
|
|
||||||
// *************************************************************************************************
|
// *************************************************************************************************
|
||||||
|
|
||||||
function createMarkers() {
|
function createMarkers() {
|
||||||
// var modelURLS = [
|
|
||||||
// "atp:/whiteboard/marker-blue.fbx",
|
|
||||||
// "atp:/whiteboard/marker-red.fbx",
|
|
||||||
// "atp:/whiteboard/marker-black.fbx",
|
|
||||||
// ];
|
|
||||||
|
|
||||||
|
|
||||||
// EBL REMOVE ME
|
|
||||||
var modelURLS = [
|
var modelURLS = [
|
||||||
"https://hifi-content.s3.amazonaws.com/eric/models/marker-black.fbx",
|
"atp:/whiteboard/marker-blue.fbx",
|
||||||
"https://hifi-content.s3.amazonaws.com/eric/models/marker-red.fbx",
|
"atp:/whiteboard/marker-red.fbx",
|
||||||
"https://hifi-content.s3.amazonaws.com/eric/models/marker-blue.fbx",
|
"atp:/whiteboard/marker-black.fbx",
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|
||||||
var markerPosition = Vec3.sum(spawnPosition, Vec3.multiply(Quat.getFront(whiteboardRotation), -0.1));
|
var markerPosition = Vec3.sum(spawnPosition, Vec3.multiply(Quat.getFront(whiteboardRotation), -0.1));
|
||||||
|
|
||||||
createMarker(modelURLS[0], markerPosition, {
|
createMarker(modelURLS[0], markerPosition, {
|
||||||
|
|
Loading…
Reference in a new issue