From 9ae1ccee50016f4cb03590ff3f39d556f746bd01 Mon Sep 17 00:00:00 2001
From: ericrius1 <ericrius1>
Date: Fri, 19 Feb 2016 14:15:55 -0800
Subject: [PATCH] passing marker color accross

---
 examples/homeContent/whiteboardV2/markerEntityScript.js | 8 +++++---
 examples/homeContent/whiteboardV2/whiteboardSpawner.js  | 6 +++++-
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/examples/homeContent/whiteboardV2/markerEntityScript.js b/examples/homeContent/whiteboardV2/markerEntityScript.js
index 1bd7acf1d9..bc5304ea7f 100644
--- a/examples/homeContent/whiteboardV2/markerEntityScript.js
+++ b/examples/homeContent/whiteboardV2/markerEntityScript.js
@@ -72,7 +72,7 @@
                 },
                 position: position,
                 textures: _this.MARKER_TEXTURE_URL,
-                color: {red: 0, green: 10, blue: 200}
+                color: _this.markerColor
             });
 
             _this.linePoints = [];
@@ -127,10 +127,12 @@
             print("EBL PRELOAD");
         },
 
-        setWhiteboard: function(myId, data) {
-            _this.whiteboard = JSON.parse(data[0]);
+        setProperties: function(myId, data) {
+            var data = JSON.parse(data);
+            _this.whiteboard = data.whiteboard;
             var whiteboardProps = Entities.getEntityProperties(_this.whiteboard, ["rotation"]);
             _this.whiteboardNormal = Quat.getRight(whiteboardProps.rotation);
+            _this.markerColor = data.markerColor;
         }
     };
 
diff --git a/examples/homeContent/whiteboardV2/whiteboardSpawner.js b/examples/homeContent/whiteboardV2/whiteboardSpawner.js
index b5d1c07959..24b5d2a046 100644
--- a/examples/homeContent/whiteboardV2/whiteboardSpawner.js
+++ b/examples/homeContent/whiteboardV2/whiteboardSpawner.js
@@ -95,7 +95,11 @@ var marker = Entities.addEntity({
 });
 
 Script.setTimeout(function() {
-  Entities.callEntityMethod(marker, "setWhiteboard", [JSON.stringify(whiteboard)]);
+ var data = {
+    whiteboard: whiteboard,
+    markerColor: {red: 10, green: 10, blue: 200}
+ }
+  Entities.callEntityMethod(marker, "setProperties", [JSON.stringify(data)]);
 }, 1000)