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
22#include <AudioScriptingInterface.h>22#include <AudioScriptingInterface.h>
23#include <AvatarData.h>23#include <AvatarData.h>
24#include <AvatarHashMap.h>24#include <AvatarHashMap.h>
25#include <VoxelsScriptingInterface.h>25#include <LimitedNodeList.h>
26 26
27#include "AbstractControllerScriptingInterface.h"27#include "AbstractControllerScriptingInterface.h"
28#include "ArrayBufferClass.h"28#include "ArrayBufferClass.h"
@@ -31,7 +31,6 @@ · 2 unmodified lines
31#include "Vec3.h"31#include "Vec3.h"
32 32
33class EntityScriptingInterface;33class EntityScriptingInterface;
34class VoxelsScriptingInterface;
35 34
36const QString NO_SCRIPT("");35const QString NO_SCRIPT("");
37 36
@@ -44,9 +43,6 @@ public: · 6 unmodified lines
44 const QString& fileNameString = QString(""),43 const QString& fileNameString = QString(""),
45 AbstractControllerScriptingInterface* controllerScriptingInterface = NULL);44 AbstractControllerScriptingInterface* controllerScriptingInterface = NULL);
46 45
47 /// Access the VoxelsScriptingInterface in order to initialize it with a custom packet sender and jurisdiction listener
48 static VoxelsScriptingInterface* getVoxelsScriptingInterface() { return &_voxelsScriptingInterface; }
49
50 /// Access the EntityScriptingInterface in order to initialize it with a custom packet sender and jurisdiction listener46 /// Access the EntityScriptingInterface in order to initialize it with a custom packet sender and jurisdiction listener
51 static EntityScriptingInterface* getEntityScriptingInterface() { return &_entityScriptingInterface; }47 static EntityScriptingInterface* getEntityScriptingInterface() { return &_entityScriptingInterface; }
52 48
@@ -141,7 +137,6 @@ private: · 88 unmodified lines
141 QObject* setupTimerWithInterval(const QScriptValue& function, int intervalMS, bool isSingleShot);137 QObject* setupTimerWithInterval(const QScriptValue& function, int intervalMS, bool isSingleShot);
142 void stopTimer(QTimer* timer);138 void stopTimer(QTimer* timer);
143 139
144 static VoxelsScriptingInterface _voxelsScriptingInterface;
145 static EntityScriptingInterface _entityScriptingInterface;140 static EntityScriptingInterface _entityScriptingInterface;
146 141
147 AbstractControllerScriptingInterface* _controllerScriptingInterface;142 AbstractControllerScriptingInterface* _controllerScriptingInterface;