History

CR fedback and cleanup

humbletim committed 8 years ago

Commit be8d79f1 parent 5791ca436 files · +890 −645Browse files

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

Unified · Split

libraries/script-engine/src/ScriptEngine.cpp+6−0
@@ -73,6 +73,8 @@ · 72 unmodified lines
7373 #include "WebSocketClass.h"
7474 #include "RecordingScriptingInterface.h"
7575 #include "ScriptEngines.h"
76+#include "ModelScriptingInterface.h"
77+
7678
7779 #include <Profile.h>
7880
@@ -709,6 +711,10 @@ void ScriptEngine::init() { · 630 unmodified lines
709711
710712 registerGlobalObject("DebugDraw", &DebugDraw::getInstance());
711713
714+ registerGlobalObject("Model", new ModelScriptingInterface(this));
715+ qScriptRegisterMetaType(this, meshToScriptValue, meshFromScriptValue);
716+ qScriptRegisterMetaType(this, meshesToScriptValue, meshesFromScriptValue);
717+
712718 registerGlobalObject("UserActivityLogger", DependencyManager::get<UserActivityLoggerScriptingInterface>().data());
713719 }
714720

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t