History

first major pass at voxelEctomy

ZappoMan committed 11 years ago

Commit 4ea9bbc1 parent 2a129b665 files · +43 −5956Browse files

Showing the changes to libraries/script-engine/src/ScriptEngine.h (1 of 65 files). Show all

Unified · Split

libraries/script-engine/src/ScriptEngine.h+1−6
@@ -22,7 +22,7 @@ · 21 unmodified lines
2222 #include <AudioScriptingInterface.h>
2323 #include <AvatarData.h>
2424 #include <AvatarHashMap.h>
25−#include <VoxelsScriptingInterface.h>
25+#include <LimitedNodeList.h>
2626
2727 #include "AbstractControllerScriptingInterface.h"
2828 #include "ArrayBufferClass.h"
@@ -31,7 +31,6 @@ · 2 unmodified lines
3131 #include "Vec3.h"
3232
3333 class EntityScriptingInterface;
34−class VoxelsScriptingInterface;
3534
3635 const QString NO_SCRIPT("");
3736
@@ -44,9 +43,6 @@ public: · 6 unmodified lines
4443 const QString& fileNameString = QString(""),
4544 AbstractControllerScriptingInterface* controllerScriptingInterface = NULL);
4645
47− /// Access the VoxelsScriptingInterface in order to initialize it with a custom packet sender and jurisdiction listener
48− static VoxelsScriptingInterface* getVoxelsScriptingInterface() { return &_voxelsScriptingInterface; }
49−
5046 /// Access the EntityScriptingInterface in order to initialize it with a custom packet sender and jurisdiction listener
5147 static EntityScriptingInterface* getEntityScriptingInterface() { return &_entityScriptingInterface; }
5248
@@ -141,7 +137,6 @@ private: · 88 unmodified lines
141137 QObject* setupTimerWithInterval(const QScriptValue& function, int intervalMS, bool isSingleShot);
142138 void stopTimer(QTimer* timer);
143139
144− static VoxelsScriptingInterface _voxelsScriptingInterface;
145140 static EntityScriptingInterface _entityScriptingInterface;
146141
147142 AbstractControllerScriptingInterface* _controllerScriptingInterface;