From cb6d9a4312fcad37625c4bce7ed66e9632c42215 Mon Sep 17 00:00:00 2001
From: Andrew Meadows <andrew@highfidelity.io>
Date: Wed, 26 Nov 2014 12:14:17 -0800
Subject: [PATCH] EntityServer gets a simuation

---
 assignment-client/src/entities/EntityServer.cpp | 10 +++++++++-
 assignment-client/src/entities/EntityServer.h   |  1 +
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/assignment-client/src/entities/EntityServer.cpp b/assignment-client/src/entities/EntityServer.cpp
index 2b7d6873cc..f3c52f5895 100644
--- a/assignment-client/src/entities/EntityServer.cpp
+++ b/assignment-client/src/entities/EntityServer.cpp
@@ -11,6 +11,7 @@
 
 #include <QTimer>
 #include <EntityTree.h>
+#include <SimpleEntitySimulation.h>
 
 #include "EntityServer.h"
 #include "EntityServerConsts.h"
@@ -20,7 +21,8 @@ const char* MODEL_SERVER_NAME = "Entity";
 const char* MODEL_SERVER_LOGGING_TARGET_NAME = "entity-server";
 const char* LOCAL_MODELS_PERSIST_FILE = "resources/models.svo";
 
-EntityServer::EntityServer(const QByteArray& packet) : OctreeServer(packet) {
+EntityServer::EntityServer(const QByteArray& packet) 
+    :   OctreeServer(packet), _entitySimulation(NULL) {
     // nothing special to do here...
 }
 
@@ -36,6 +38,12 @@ OctreeQueryNode* EntityServer::createOctreeQueryNode() {
 Octree* EntityServer::createTree() {
     EntityTree* tree = new EntityTree(true);
     tree->addNewlyCreatedHook(this);
+    if (!_entitySimulation) {
+        SimpleEntitySimulation* simpleSimulation = new SimpleEntitySimulation();
+        simpleSimulation->setEntityTree(tree);
+        tree->setSimulation(simpleSimulation);
+        _entitySimulation = simpleSimulation;
+    }
     return tree;
 }
 
diff --git a/assignment-client/src/entities/EntityServer.h b/assignment-client/src/entities/EntityServer.h
index 563efed288..14fd26b775 100644
--- a/assignment-client/src/entities/EntityServer.h
+++ b/assignment-client/src/entities/EntityServer.h
@@ -47,6 +47,7 @@ public slots:
     void pruneDeletedEntities();
 
 private:
+    EntitySimulation* _entitySimulation;
 };
 
 #endif // hifi_EntityServer_h