From 68642099b71e7902d2c0023a3be0082a8c1e5d0c Mon Sep 17 00:00:00 2001
From: ericrius1 <ericrius1>
Date: Fri, 1 Apr 2016 15:12:57 -0700
Subject: [PATCH] changed name of whiteboard stuff

---
 .../Home/whiteboard/eraserEntityScript.js            |  2 +-
 .../Home/whiteboard/markerEntityScript.js            | 12 ++----------
 .../DomainContent/Home/whiteboard/wrapper.js         |  9 +++++----
 3 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/unpublishedScripts/DomainContent/Home/whiteboard/eraserEntityScript.js b/unpublishedScripts/DomainContent/Home/whiteboard/eraserEntityScript.js
index 9489d160d4..1164d2d67d 100644
--- a/unpublishedScripts/DomainContent/Home/whiteboard/eraserEntityScript.js
+++ b/unpublishedScripts/DomainContent/Home/whiteboard/eraserEntityScript.js
@@ -22,7 +22,7 @@
         _this = this;
 
         _this.ERASER_TRIGGER_THRESHOLD = 0.2;
-        _this.STROKE_NAME = "hifi-marker-stroke";
+        _this.STROKE_NAME = "home_polyline_markerStroke";
         _this.ERASER_TO_STROKE_SEARCH_RADIUS = 0.7;
         _this.ERASER_RESET_WAIT_TIME = 3000;
     };
diff --git a/unpublishedScripts/DomainContent/Home/whiteboard/markerEntityScript.js b/unpublishedScripts/DomainContent/Home/whiteboard/markerEntityScript.js
index dd86b2a7d3..01245f0696 100644
--- a/unpublishedScripts/DomainContent/Home/whiteboard/markerEntityScript.js
+++ b/unpublishedScripts/DomainContent/Home/whiteboard/markerEntityScript.js
@@ -36,8 +36,8 @@
         _this.MAX_DISTANCE_BETWEEN_POINTS = 0.1;
         _this.strokes = [];
         _this.PAINTING_TRIGGER_THRESHOLD = 0.2;
-        _this.STROKE_NAME = "hifi-marker-stroke";
-        _this.WHITEBOARD_SURFACE_NAME = "hifi-whiteboardDrawingSurface";
+        _this.STROKE_NAME = "home_polyline_markerStroke";
+        _this.WHITEBOARD_SURFACE_NAME = "home_box_whiteboardDrawingSurface"
         _this.MARKER_RESET_WAIT_TIME = 3000;
     };
 
@@ -48,25 +48,17 @@
             _this.whiteboards = [];
             _this.equipped = true;
             _this.hand = params[0] == "left" ? 0 : 1;
-            print('before thing', id)
-            print('GET user data?' + typeof getEntityUserData)
             _this.markerColor = getEntityUserData(_this.entityID).markerColor;
-            print('after thing')
                 // search for whiteboards
             var markerPosition = Entities.getEntityProperties(_this.entityID, "position").position;
             var entities = Entities.findEntities(markerPosition, 10);
-            print('LOOKING FOR BOARDS')
             entities.forEach(function(entity) {
 
                 var entityName = Entities.getEntityProperties(entity, "name").name;
-                print('NAME ' + entityName)
                 if (entityName === _this.WHITEBOARD_SURFACE_NAME) {
-                    print('FOUND A WHITEBOARD!!')
                     _this.whiteboards.push(entity);
                 }
             });
-
-            print("intersectable entities " + JSON.stringify(_this.whiteboards))
         },
 
         releaseEquip: function() {
diff --git a/unpublishedScripts/DomainContent/Home/whiteboard/wrapper.js b/unpublishedScripts/DomainContent/Home/whiteboard/wrapper.js
index c6f259e718..68b8864854 100644
--- a/unpublishedScripts/DomainContent/Home/whiteboard/wrapper.js
+++ b/unpublishedScripts/DomainContent/Home/whiteboard/wrapper.js
@@ -29,7 +29,7 @@ Whiteboard = function(spawnPosition, spawnRotation) {
     var WHITEBOARD_COLLISION_HULL_URL = "atp:/whiteboard/whiteboardCollisionHull.obj";
     var whiteboard = Entities.addEntity({
         type: "Model",
-        name: "whiteboard",
+        name: "home_model_whiteboard",
         modelURL: WHITEBOARD_MODEL_URL,
         position: whiteboardPosition,
         rotation: whiteboardRotation,
@@ -57,9 +57,10 @@ Whiteboard = function(spawnPosition, spawnRotation) {
     whiteboardSurfacePosition = Vec3.sum(whiteboardSurfacePosition, Vec3.multiply(-0.02, Quat.getRight(whiteboardRotation)));
     var moveForwardDistance = 0.02;
     whiteboardFrontSurfacePosition = Vec3.sum(whiteboardSurfacePosition, Vec3.multiply(-moveForwardDistance, Quat.getFront(whiteboardRotation)));
+    var WHITEBOARD_SURFACE_NAME = "home_box_whiteboardDrawingSurface"; 
     var whiteboardSurfaceSettings = {
         type: "Box",
-        name: "hifi-whiteboardDrawingSurface",
+        name: WHITEBOARD_SURFACE_NAME,
         dimensions: {
             x: 1.82,
             y: 1.8,
@@ -99,6 +100,7 @@ Whiteboard = function(spawnPosition, spawnRotation) {
 
     var eraser = Entities.addEntity({
         type: "Model",
+        name: "home_model_whiteboardEraser",
         modelURL: ERASER_MODEL_URL,
         position: eraserPosition,
         script: ERASER_SCRIPT_URL,
@@ -191,7 +193,7 @@ Whiteboard = function(spawnPosition, spawnRotation) {
             modelURL: modelURL,
             rotation: markerRotation,
             shapeType: "box",
-            name: "marker",
+            name: "home_model_marker",
             dynamic: true,
             gravity: {
                 x: 0,
@@ -209,7 +211,6 @@ Whiteboard = function(spawnPosition, spawnRotation) {
                 y: 0.027,
                 z: 0.164
             },
-            name: "marker",
             script: MARKER_SCRIPT_URL,
             userData: JSON.stringify({
                 'hifiHomeKey': {