From 1257fac0f53fafcb0ddf5f8489052be7f22a723f Mon Sep 17 00:00:00 2001
From: ericrius1 <ericrius1>
Date: Tue, 5 Apr 2016 15:08:32 -0700
Subject: [PATCH] removed s3 paths

---
 .../DomainContent/Home/whiteboard/wrapper.js  | 33 +++++--------------
 1 file changed, 9 insertions(+), 24 deletions(-)

diff --git a/unpublishedScripts/DomainContent/Home/whiteboard/wrapper.js b/unpublishedScripts/DomainContent/Home/whiteboard/wrapper.js
index 9a292cd4f6..5fbac2259c 100644
--- a/unpublishedScripts/DomainContent/Home/whiteboard/wrapper.js
+++ b/unpublishedScripts/DomainContent/Home/whiteboard/wrapper.js
@@ -26,12 +26,8 @@ Whiteboard = function(spawnPosition, spawnRotation) {
     var whiteboardPosition = spawnPosition;
     var whiteboardRotation = orientation;
    
-    // var WHITEBOARD_MODEL_URL = "atp:/whiteboard/Whiteboard-4.fbx";
-    // 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_MODEL_URL = "atp:/whiteboard/Whiteboard-4.fbx";
+    var WHITEBOARD_COLLISION_HULL_URL = "atp:/whiteboard/whiteboardCollisionHull.obj";
    
     var whiteboard = Entities.addEntity({
         type: "Model",
@@ -100,14 +96,11 @@ Whiteboard = function(spawnPosition, spawnRotation) {
 
 
 
-    // ************ ERAAAAAAASSSEERRRR ************************************************
-    // ********************************************************************************
+    // ************ ERASER ************************************************
     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));
     eraserPosition = Vec3.sum(eraserPosition, Vec3.multiply(-0.5, Quat.getRight(whiteboardRotation)));
     var eraserRotation = markerRotation;
@@ -170,24 +163,16 @@ Whiteboard = function(spawnPosition, spawnRotation) {
     }
 
 
- // ************************************************************************************************* 
- // ************************************************************************************************* 
  // ************************************************************************************************* 
 
     function createMarkers() {
-        // var modelURLS = [
-        //     "atp:/whiteboard/marker-blue.fbx",
-        //     "atp:/whiteboard/marker-red.fbx",
-        //     "atp:/whiteboard/marker-black.fbx",
-        // ];
-
-
-        // EBL REMOVE ME
         var modelURLS = [
-            "https://hifi-content.s3.amazonaws.com/eric/models/marker-black.fbx",
-            "https://hifi-content.s3.amazonaws.com/eric/models/marker-red.fbx",
-            "https://hifi-content.s3.amazonaws.com/eric/models/marker-blue.fbx",
+            "atp:/whiteboard/marker-blue.fbx",
+            "atp:/whiteboard/marker-red.fbx",
+            "atp:/whiteboard/marker-black.fbx",
         ];
+
+
         var markerPosition = Vec3.sum(spawnPosition, Vec3.multiply(Quat.getFront(whiteboardRotation), -0.1));
 
         createMarker(modelURLS[0], markerPosition, {