Provide basic conversions to/from SharedObjectPointer (still have to work out how to handle reference counting correctly).

Andrzej Kapolka committed 12 years ago

Commit 2d4134a1 parent a13d8553 files · +13 −2Browse files

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

Unified · Split

libraries/script-engine/src/ScriptEngine.cpp+2−0

@@ -20,6 +20,7 @@ · 19 unmodified lines
20	20	#include <AudioInjector.h>
21	21	#include <AudioRingBuffer.h>
22	22	#include <AvatarData.h>
	23	+#include <Bitstream.h>
23	24	#include <CollisionInfo.h>
24	25	#include <ModelsScriptingInterface.h>
25	26	#include <NetworkAccessManager.h>
@@ -229,6 +230,7 @@ void ScriptEngine::init() { · 203 unmodified lines
229	230	registerMenuItemProperties(&_engine);
230	231	registerAnimationTypes(&_engine);
231	232	registerAvatarTypes(&_engine);
	233	+ Bitstream::registerTypes(&_engine);
232	234
233	235	qScriptRegisterMetaType(&_engine, ParticlePropertiesToScriptValue, ParticlePropertiesFromScriptValue);
234	236	qScriptRegisterMetaType(&_engine, ParticleIDtoScriptValue, ParticleIDfromScriptValue);