History

BufferView <-> QVariant/QScriptValue conversion

update MeshProxy/SimpleMeshProxy and ScriptableModel ModelScriptingInterface / scriptable::ModelProvider integration update to RC-63 initial graphics-scripting refactoring graphics-scripting baseline commit wip commit Geometry -> MeshPart remove SimpleMeshProxy collapse graphics-utils -> graphics-scripting

humbletim committed 8 years ago

Commit 06afaa71 parent bc819c651 files · +2242 −600Browse files

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

Unified · Split

libraries/script-engine/src/ScriptEngine.cpp+0−6
@@ -73,8 +73,6 @@ · 72 unmodified lines
73#include "WebSocketClass.h"73#include "WebSocketClass.h"
74#include "RecordingScriptingInterface.h"74#include "RecordingScriptingInterface.h"
75#include "ScriptEngines.h"75#include "ScriptEngines.h"
76#include "ModelScriptingInterface.h"
77
78 76
79#include <Profile.h>77#include <Profile.h>
80 78
@@ -711,10 +709,6 @@ void ScriptEngine::init() { · 630 unmodified lines
711 709
712 registerGlobalObject("DebugDraw", &DebugDraw::getInstance());710 registerGlobalObject("DebugDraw", &DebugDraw::getInstance());
713 711
714 registerGlobalObject("Model", new ModelScriptingInterface(this));
715 qScriptRegisterMetaType(this, meshToScriptValue, meshFromScriptValue);
716 qScriptRegisterMetaType(this, meshesToScriptValue, meshesFromScriptValue);
717
718 registerGlobalObject("UserActivityLogger", DependencyManager::get<UserActivityLoggerScriptingInterface>().data());712 registerGlobalObject("UserActivityLogger", DependencyManager::get<UserActivityLoggerScriptingInterface>().data());
719}713}
720 714