From 75f35c58586ecd54a379ce00a0e10441c2a3d094 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Thu, 17 Apr 2014 17:55:16 -0700
Subject: [PATCH] optionally add an AvatarHashMap instance to the ScriptEngine

---
 assignment-client/src/Agent.cpp              | 1 +
 libraries/script-engine/src/ScriptEngine.cpp | 8 ++++++++
 libraries/script-engine/src/ScriptEngine.h   | 2 ++
 3 files changed, 11 insertions(+)

diff --git a/assignment-client/src/Agent.cpp b/assignment-client/src/Agent.cpp
index 7f4e811c32..6b8dbde79f 100644
--- a/assignment-client/src/Agent.cpp
+++ b/assignment-client/src/Agent.cpp
@@ -202,6 +202,7 @@ void Agent::run() {
     
     // give this AvatarData object to the script engine
     _scriptEngine.setAvatarData(&scriptedAvatar, "Avatar");
+    _scriptEngine.setAvatarHashMap(&_avatarHashMap, "AvatarHash");
     
     // register ourselves to the script engine
     _scriptEngine.registerGlobalObject("Agent", this);
diff --git a/libraries/script-engine/src/ScriptEngine.cpp b/libraries/script-engine/src/ScriptEngine.cpp
index 950ba899de..684c55fbb0 100644
--- a/libraries/script-engine/src/ScriptEngine.cpp
+++ b/libraries/script-engine/src/ScriptEngine.cpp
@@ -156,6 +156,14 @@ void ScriptEngine::setAvatarData(AvatarData* avatarData, const QString& objectNa
     registerGlobalObject(objectName, _avatarData);
 }
 
+void ScriptEngine::setAvatarHashMap(AvatarHashMap* avatarHashMap, const QString& objectName) {
+    // remove the old Avatar property, if it exists
+    _engine.globalObject().setProperty(objectName, QScriptValue());
+    
+    // give the script engine the new avatar hash map
+    registerGlobalObject(objectName, avatarHashMap);
+}
+
 bool ScriptEngine::setScriptContents(const QString& scriptContents, const QString& fileNameString) {
     if (_isRunning) {
         return false;
diff --git a/libraries/script-engine/src/ScriptEngine.h b/libraries/script-engine/src/ScriptEngine.h
index 73747cd3e1..941c6bbe27 100644
--- a/libraries/script-engine/src/ScriptEngine.h
+++ b/libraries/script-engine/src/ScriptEngine.h
@@ -22,6 +22,7 @@
 #include <VoxelsScriptingInterface.h>
 
 #include <AvatarData.h>
+#include <AvatarHashMap.h>
 
 #include "AnimationCache.h"
 #include "AbstractControllerScriptingInterface.h"
@@ -63,6 +64,7 @@ public:
     bool isAvatar() const { return _isAvatar; }
 
     void setAvatarData(AvatarData* avatarData, const QString& objectName);
+    void setAvatarHashMap(AvatarHashMap* avatarHashMap, const QString& objectName);
 
     bool isListeningToAudioStream() const { return _isListeningToAudioStream; }
     void setIsListeningToAudioStream(bool isListeningToAudioStream) { _isListeningToAudioStream = isListeningToAudioStream; }