History

clean up reticle scripting to be exposed through Reticle object (implemented int ApplicationCompositor)

Brad Hefta-Gaub committed 10 years ago

Commit a25581c1 parent 0d873c712 files · +92 −141Browse files

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

Unified · Split

interface/src/Application.cpp+14−12
@@ -806,14 +806,14 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer) : · 805 unmodified lines
806 } else if (action == controller::toInt(controller::Action::CYCLE_CAMERA)) {806 } else if (action == controller::toInt(controller::Action::CYCLE_CAMERA)) {
807 cycleCamera();807 cycleCamera();
808 } else if (action == controller::toInt(controller::Action::CONTEXT_MENU)) {808 } else if (action == controller::toInt(controller::Action::CONTEXT_MENU)) {
809 auto reticlePosition = _controllerScriptingInterface->getReticlePosition();809 auto reticlePosition = _compositor.getReticlePosition();
810 offscreenUi->toggleMenu(_glWidget->mapFromGlobal(QPoint(reticlePosition.x, reticlePosition.y)));810 offscreenUi->toggleMenu(_glWidget->mapFromGlobal(QPoint(reticlePosition.x, reticlePosition.y)));
811 } else if (action == controller::toInt(controller::Action::RETICLE_X)) {811 } else if (action == controller::toInt(controller::Action::RETICLE_X)) {
812 auto oldPos = _controllerScriptingInterface->getReticlePosition();812 auto oldPos = _compositor.getReticlePosition();
813 _controllerScriptingInterface->setReticlePosition({ oldPos.x + state, oldPos.y });813 _compositor.setReticlePosition({ oldPos.x + state, oldPos.y });
814 } else if (action == controller::toInt(controller::Action::RETICLE_Y)) {814 } else if (action == controller::toInt(controller::Action::RETICLE_Y)) {
815 auto oldPos = _controllerScriptingInterface->getReticlePosition();815 auto oldPos = _compositor.getReticlePosition();
816 _controllerScriptingInterface->setReticlePosition({ oldPos.x, oldPos.y + state });816 _compositor.setReticlePosition({ oldPos.x, oldPos.y + state });
817 }817 }
818 }818 }
819 });819 });
@@ -1254,6 +1254,7 @@ void Application::initializeUi() { · 434 unmodified lines
1254 rootContext->setContextProperty("HMD", DependencyManager::get<HMDScriptingInterface>().data());1254 rootContext->setContextProperty("HMD", DependencyManager::get<HMDScriptingInterface>().data());
1255 rootContext->setContextProperty("Scene", DependencyManager::get<SceneScriptingInterface>().data());1255 rootContext->setContextProperty("Scene", DependencyManager::get<SceneScriptingInterface>().data());
1256 rootContext->setContextProperty("Render", _renderEngine->getConfiguration().get());1256 rootContext->setContextProperty("Render", _renderEngine->getConfiguration().get());
1257 rootContext->setContextProperty("Reticle", _compositor.getReticleInterface());
1257 1258
1258 _glWidget->installEventFilter(offscreenUi.data());1259 _glWidget->installEventFilter(offscreenUi.data());
1259 offscreenUi->setMouseTranslator([=](const QPointF& pt) {1260 offscreenUi->setMouseTranslator([=](const QPointF& pt) {
@@ -2085,7 +2086,7 @@ void Application::keyPressEvent(QKeyEvent* event) { · 825 unmodified lines
2085void Application::keyReleaseEvent(QKeyEvent* event) {2086void Application::keyReleaseEvent(QKeyEvent* event) {
2086 if (event->key() == Qt::Key_Alt && _altPressed && hasFocus()) {2087 if (event->key() == Qt::Key_Alt && _altPressed && hasFocus()) {
2087 auto offscreenUi = DependencyManager::get<OffscreenUi>();2088 auto offscreenUi = DependencyManager::get<OffscreenUi>();
2088 auto reticlePosition = _controllerScriptingInterface->getReticlePosition();2089 auto reticlePosition = _compositor.getReticlePosition();
2089 offscreenUi->toggleMenu(_glWidget->mapFromGlobal(QPoint(reticlePosition.x, reticlePosition.y)));2090 offscreenUi->toggleMenu(_glWidget->mapFromGlobal(QPoint(reticlePosition.x, reticlePosition.y)));
2090 }2091 }
2091 2092
@@ -2542,7 +2543,7 @@ void Application::setLowVelocityFilter(bool lowVelocityFilter) { · 450 unmodified lines
2542 controller::InputDevice::setLowVelocityFilter(lowVelocityFilter);2543 controller::InputDevice::setLowVelocityFilter(lowVelocityFilter);
2543}2544}
2544 2545
2545ivec2 Application::getMouse() const {2546ivec2 Application::getMouse() {
2546 if (isHMDMode()) {2547 if (isHMDMode()) {
2547 return _compositor.screenToOverlay(getTrueMouse());2548 return _compositor.screenToOverlay(getTrueMouse());
2548 }2549 }
@@ -3566,7 +3567,7 @@ glm::vec3 Application::getSunDirection() { · 1017 unmodified lines
3566// FIXME, preprocessor guard this check to occur only in DEBUG builds3567// FIXME, preprocessor guard this check to occur only in DEBUG builds
3567static QThread * activeRenderingThread = nullptr;3568static QThread * activeRenderingThread = nullptr;
3568 3569
3569PickRay Application::computePickRay(float x, float y) const {3570PickRay Application::computePickRay(float x, float y) {
3570 vec2 pickPoint { x, y };3571 vec2 pickPoint { x, y };
3571 PickRay result;3572 PickRay result;
3572 if (isHMDMode()) {3573 if (isHMDMode()) {
@@ -4216,6 +4217,7 @@ void Application::registerScriptEngineWithApplicationServices(ScriptEngine* scri · 643 unmodified lines
4216 scriptEngine->registerGlobalObject("Render", _renderEngine->getConfiguration().get());4217 scriptEngine->registerGlobalObject("Render", _renderEngine->getConfiguration().get());
4217 4218
4218 scriptEngine->registerGlobalObject("ScriptDiscoveryService", DependencyManager::get<ScriptEngines>().data());4219 scriptEngine->registerGlobalObject("ScriptDiscoveryService", DependencyManager::get<ScriptEngines>().data());
4220 scriptEngine->registerGlobalObject("Reticle", _compositor.getReticleInterface());
4219}4221}
4220 4222
4221bool Application::canAcceptURL(const QString& urlString) const {4223bool Application::canAcceptURL(const QString& urlString) const {
@@ -4695,7 +4697,7 @@ QSize Application::getDeviceSize() const { · 473 unmodified lines
4695 return fromGlm(getActiveDisplayPlugin()->getRecommendedRenderSize());4697 return fromGlm(getActiveDisplayPlugin()->getRecommendedRenderSize());
4696}4698}
4697 4699
4698PickRay Application::computePickRay() const {4700PickRay Application::computePickRay() {
4699 return computePickRay(getTrueMouse().x, getTrueMouse().y);4701 return computePickRay(getTrueMouse().x, getTrueMouse().y);
4700}4702}
4701 4703
@@ -4703,9 +4705,9 @@ bool Application::isThrottleRendering() const { · 1 unmodified line
4703 return getActiveDisplayPlugin()->isThrottled();4705 return getActiveDisplayPlugin()->isThrottled();
4704}4706}
4705 4707
4706// FIXME -- consolidate users of getTrueMouse() controllerScriptingInterface->getReticlePosition()4708// FIXME -- consolidate users of getTrueMouse() _compositor.getReticlePosition()
4707ivec2 Application::getTrueMouse() const {4709ivec2 Application::getTrueMouse() {
4708 auto reticlePosition = _controllerScriptingInterface->getReticlePosition();4710 auto reticlePosition = _compositor.getReticlePosition();
4709 return toGlm(_glWidget->mapFromGlobal(QPoint(reticlePosition.x, reticlePosition.y)));4711 return toGlm(_glWidget->mapFromGlobal(QPoint(reticlePosition.x, reticlePosition.y)));
4710}4712}
4711 4713