History

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