first cut at renaming Models to Entities

ZappoMan committed 12 years ago

Commit ccc9eab1 parent f7820ce42 files · +1426 −1424Browse files

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

Unified · Split

libraries/script-engine/src/ScriptEngine.h+4−4

@@ -29,7 +29,7 @@ · 28 unmodified lines
29	#include "ScriptUUID.h"	29	#include "ScriptUUID.h"
30	#include "Vec3.h"	30	#include "Vec3.h"
31		31
32	class ModelsScriptingInterface;	32	class EntityScriptingInterface;
33	class ParticlesScriptingInterface;	33	class ParticlesScriptingInterface;
34	class VoxelsScriptingInterface;	34	class VoxelsScriptingInterface;
35		35
@@ -53,8 +53,8 @@ public: · 17 unmodified lines
53	/// Access the ParticlesScriptingInterface in order to initialize it with a custom packet sender and jurisdiction listener	53	/// Access the ParticlesScriptingInterface in order to initialize it with a custom packet sender and jurisdiction listener
54	static ParticlesScriptingInterface* getParticlesScriptingInterface() { return &_particlesScriptingInterface; }	54	static ParticlesScriptingInterface* getParticlesScriptingInterface() { return &_particlesScriptingInterface; }
55		55
56	/// Access the ModelsScriptingInterface in order to initialize it with a custom packet sender and jurisdiction listener	56	/// Access the EntityScriptingInterface in order to initialize it with a custom packet sender and jurisdiction listener
57	static ModelsScriptingInterface* getModelsScriptingInterface() { return &_modelsScriptingInterface; }	57	static EntityScriptingInterface* getEntityScriptingInterface() { return &_entityScriptingInterface; }
58		58
59	/// sets the script contents, will return false if failed, will fail if script is already running	59	/// sets the script contents, will return false if failed, will fail if script is already running
60	bool setScriptContents(const QString& scriptContents, const QString& fileNameString = QString(""));	60	bool setScriptContents(const QString& scriptContents, const QString& fileNameString = QString(""));
@@ -134,7 +134,7 @@ private: · 73 unmodified lines
134		134
135	static VoxelsScriptingInterface _voxelsScriptingInterface;	135	static VoxelsScriptingInterface _voxelsScriptingInterface;
136	static ParticlesScriptingInterface _particlesScriptingInterface;	136	static ParticlesScriptingInterface _particlesScriptingInterface;
137	static ModelsScriptingInterface _modelsScriptingInterface;	137	static EntityScriptingInterface _entityScriptingInterface;
138		138
139	AbstractControllerScriptingInterface* _controllerScriptingInterface;	139	AbstractControllerScriptingInterface* _controllerScriptingInterface;
140	AudioScriptingInterface _audioScriptingInterface;	140	AudioScriptingInterface _audioScriptingInterface;