From dde11c5cd1394fd934859de5aebe0bbac350cf6f Mon Sep 17 00:00:00 2001 From: Atlante45 Date: Thu, 24 Sep 2015 22:38:49 +0200 Subject: [PATCH] More unused --- interface/src/Application.cpp | 5 ----- interface/src/Application.h | 9 --------- interface/src/scripting/WindowScriptingInterface.cpp | 4 ---- interface/src/scripting/WindowScriptingInterface.h | 2 -- interface/src/ui/ApplicationCompositor.cpp | 2 +- 5 files changed, 1 insertion(+), 21 deletions(-) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index 8e7f2b6973..c6a8feb1a4 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -363,7 +363,6 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer) : _scaleMirror(1.0f), _rotateMirror(0.0f), _raiseMirror(0.0f), - _cursorVisible(true), _lastMouseMove(usecTimestampNow()), _lastMouseMoveWasSimulated(false), _isTouchPressed(false), @@ -2809,10 +2808,6 @@ void Application::updateCursor(float deltaTime) { lastMousePos = QCursor::pos(); } -void Application::setCursorVisible(bool visible) { - _cursorVisible = visible; -} - void Application::update(float deltaTime) { bool showWarnings = Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings); PerformanceWarning warn(showWarnings, "Application::update()"); diff --git a/interface/src/Application.h b/interface/src/Application.h index e9eacf7e36..98aa4b3013 100644 --- a/interface/src/Application.h +++ b/interface/src/Application.h @@ -163,7 +163,6 @@ public: EntityEditPacketSender* getEntityEditPacketSender() { return &_entityEditSender; } bool isMousePressed() const { return _mousePressed; } - bool isMouseHidden() const { return !_cursorVisible; } const glm::vec3& getMouseRayOrigin() const { return _mouseRayOrigin; } const glm::vec3& getMouseRayDirection() const { return _mouseRayDirection; } bool mouseOnScreen() const; @@ -397,12 +396,9 @@ private slots: void audioMuteToggled(); void faceTrackerMuteToggled(); - void setCursorVisible(bool visible); void activeChanged(Qt::ApplicationState state); private: - void resetCameras(Camera& camera, const glm::uvec2& size); - void initDisplay(); void init(); @@ -423,10 +419,6 @@ private: void updateDialogs(float deltaTime); void updateCursor(float deltaTime); - Avatar* findLookatTargetAvatar(glm::vec3& eyePosition, QUuid &nodeUUID); - - void renderLookatIndicator(glm::vec3 pointOfInterest); - void queryOctree(NodeType_t serverType, PacketType packetType, NodeToJurisdictionMap& jurisdictions); void loadViewFrustum(Camera& camera, ViewFrustum& viewFrustum); @@ -497,7 +489,6 @@ private: Environment _environment; - bool _cursorVisible; ivec2 _mouseDragStarted; quint64 _lastMouseMove; diff --git a/interface/src/scripting/WindowScriptingInterface.cpp b/interface/src/scripting/WindowScriptingInterface.cpp index a5c7087adc..46edbe7420 100644 --- a/interface/src/scripting/WindowScriptingInterface.cpp +++ b/interface/src/scripting/WindowScriptingInterface.cpp @@ -65,10 +65,6 @@ void WindowScriptingInterface::setCursorVisible(bool visible) { Q_ARG(bool, visible)); } -bool WindowScriptingInterface::isCursorVisible() const { - return !qApp->isMouseHidden(); -} - void WindowScriptingInterface::setCursorPosition(int x, int y) { QCursor::setPos(x, y); } diff --git a/interface/src/scripting/WindowScriptingInterface.h b/interface/src/scripting/WindowScriptingInterface.h index 9bc8a834bd..678a66102d 100644 --- a/interface/src/scripting/WindowScriptingInterface.h +++ b/interface/src/scripting/WindowScriptingInterface.h @@ -27,14 +27,12 @@ class WindowScriptingInterface : public QObject, public Dependency { Q_PROPERTY(int innerHeight READ getInnerHeight) Q_PROPERTY(int x READ getX) Q_PROPERTY(int y READ getY) - Q_PROPERTY(bool cursorVisible READ isCursorVisible WRITE setCursorVisible) public: WindowScriptingInterface(); int getInnerWidth(); int getInnerHeight(); int getX(); int getY(); - bool isCursorVisible() const; public slots: QScriptValue getCursorPositionX(); diff --git a/interface/src/ui/ApplicationCompositor.cpp b/interface/src/ui/ApplicationCompositor.cpp index 98c2efc8f3..5e88a90d71 100644 --- a/interface/src/ui/ApplicationCompositor.cpp +++ b/interface/src/ui/ApplicationCompositor.cpp @@ -425,7 +425,7 @@ bool ApplicationCompositor::calculateRayUICollisionPoint(const glm::vec3& positi //Renders optional pointers void ApplicationCompositor::renderPointers(gpu::Batch& batch) { - if (qApp->isHMDMode() && !qApp->getLastMouseMoveWasSimulated() && !qApp->isMouseHidden()) { + if (qApp->isHMDMode() && !qApp->getLastMouseMoveWasSimulated()) { //If we are in oculus, render reticle later auto trueMouse = qApp->getTrueMouse(); trueMouse /= qApp->getCanvasSize();