History

Fixes for code review

ksuprynowicz committed 4 years ago

Commit 586bd7f1 parent e9bfdd416 files · +142 −117Browse files

Showing the changes to interface/src/raypick/PickScriptingInterface.cpp (1 of 16 files). Show all

Unified · Split

interface/src/raypick/PickScriptingInterface.cpp+12−0
@@ -31,6 +31,7 @@ · 30 unmodified lines
3131
3232 #include <ScriptEngine.h>
3333 #include <ScriptEngineCast.h>
34+#include <ScriptEngineLogging.h>
3435 #include <ScriptValueUtils.h>
3536
3637 STATIC_SCRIPT_TYPES_INITIALIZER(+[](ScriptManager* manager){
@@ -39,6 +40,17 @@ STATIC_SCRIPT_TYPES_INITIALIZER(+[](ScriptManager* manager){ · 2 unmodified lines
3940 PickScriptingInterface::registerMetaTypes(scriptEngine);
4041 });
4142
43+STATIC_SCRIPT_INITIALIZER(+[](ScriptManager* manager){
44+ auto scriptEngine = manager->engine().get();
45+
46+ auto pickScriptingInterface = DependencyManager::get<PickScriptingInterface>();
47+ if (pickScriptingInterface) {
48+ pickScriptingInterface->registerProperties(scriptEngine);
49+ } else {
50+ qWarning(scriptengine) << "Cannot register PickScriptingInterface properties with script engine, PickScriptingInterface instance not available";
51+ }
52+});
53+
4254 static const float WEB_TOUCH_Y_OFFSET = 0.105f; // how far forward (or back with a negative number) to slide stylus in hand
4355 static const glm::vec3 TIP_OFFSET = glm::vec3(0.0f, StylusPick::WEB_STYLUS_LENGTH - WEB_TOUCH_Y_OFFSET, 0.0f);
4456