History

expose RayPickMask to JS, move everything to interface/src/raypick to prevent dependency issues, start working on RayPickManager::update (needs testing)

SamGondelman committed 9 years ago

Commit ea65a041 parent 3ac369d17 files · +285 −139Browse files

Showing the changes to interface/src/Application.cpp (1 of 17 files). Show all

Unified · Split

interface/src/Application.cpp+4−2
@@ -190,8 +190,8 @@ · 189 unmodified lines
190#include <src/scripting/LimitlessVoiceRecognitionScriptingInterface.h>190#include <src/scripting/LimitlessVoiceRecognitionScriptingInterface.h>
191#include <EntityScriptClient.h>191#include <EntityScriptClient.h>
192#include <ModelScriptingInterface.h>192#include <ModelScriptingInterface.h>
193#include "LaserPointerScriptingInterface.h"193#include <raypick/LaserPointerScriptingInterface.h>
194#include <RayPickManager.h>194#include <raypick/RayPickManager.h>
195 195
196// On Windows PC, NVidia Optimus laptop, we want to enable NVIDIA GPU196// On Windows PC, NVidia Optimus laptop, we want to enable NVIDIA GPU
197// FIXME seems to be broken.197// FIXME seems to be broken.
@@ -5821,6 +5821,8 @@ void Application::registerScriptEngineWithApplicationServices(ScriptEngine* scri · 5623 unmodified lines
5821 scriptEngine->registerGlobalObject("EntityScriptServerLog", entityScriptServerLog.data());5821 scriptEngine->registerGlobalObject("EntityScriptServerLog", entityScriptServerLog.data());
5822 scriptEngine->registerGlobalObject("AvatarInputs", AvatarInputs::getInstance());5822 scriptEngine->registerGlobalObject("AvatarInputs", AvatarInputs::getInstance());
5823 5823
5824 scriptEngine->registerGlobalObject("RayPick", &RayPickManager::getInstance());
5825
5824 qScriptRegisterMetaType(scriptEngine, OverlayIDtoScriptValue, OverlayIDfromScriptValue);5826 qScriptRegisterMetaType(scriptEngine, OverlayIDtoScriptValue, OverlayIDfromScriptValue);
5825 5827
5826 // connect this script engines printedMessage signal to the global ScriptEngines these various messages5828 // connect this script engines printedMessage signal to the global ScriptEngines these various messages