Showing the changes to interface/src/Application.h (1 of 214 files). Show all
Unified · Split
| @@ -62,12 +62,12 @@ · 61 unmodified lines | |||
| 62 | #include "ui/ModelsBrowser.h" | 62 | #include "ui/ModelsBrowser.h" |
| 63 | #include "ui/NodeBounds.h" | 63 | #include "ui/NodeBounds.h" |
| 64 | #include "ui/OctreeStatsDialog.h" | 64 | #include "ui/OctreeStatsDialog.h" |
| 65 | #include "ui/RearMirrorTools.h" | ||
| 66 | #include "ui/SnapshotShareDialog.h" | 65 | #include "ui/SnapshotShareDialog.h" |
| 67 | #include "ui/LodToolsDialog.h" | 66 | #include "ui/LodToolsDialog.h" |
| 68 | #include "ui/LogDialog.h" | 67 | #include "ui/LogDialog.h" |
| 69 | #include "ui/overlays/Overlays.h" | 68 | #include "ui/overlays/Overlays.h" |
| 70 | #include "ui/ApplicationOverlay.h" | 69 | #include "ui/ApplicationOverlay.h" |
| 70 | #include "ui/ApplicationCompositor.h" | ||
| 71 | #include "ui/RunningScriptsWidget.h" | 71 | #include "ui/RunningScriptsWidget.h" |
| 72 | #include "ui/ToolWindow.h" | 72 | #include "ui/ToolWindow.h" |
| 73 | #include "ui/UserInputMapper.h" | 73 | #include "ui/UserInputMapper.h" |
| @@ -221,15 +221,21 @@ public: · 147 unmodified lines | |||
| 221 | const glm::vec3& getMouseRayOrigin() const { return _mouseRayOrigin; } | 221 | const glm::vec3& getMouseRayOrigin() const { return _mouseRayOrigin; } |
| 222 | const glm::vec3& getMouseRayDirection() const { return _mouseRayDirection; } | 222 | const glm::vec3& getMouseRayDirection() const { return _mouseRayDirection; } |
| 223 | bool mouseOnScreen() const; | 223 | bool mouseOnScreen() const; |
| 224 | int getMouseX() const; | 224 | |
| 225 | int getMouseY() const; | 225 | ivec2 getMouse() const; |
| 226 | glm::ivec2 getTrueMousePosition() const; | 226 | ivec2 getTrueMouse() const; |
| 227 | int getTrueMouseX() const; | 227 | ivec2 getMouseDragStarted() const; |
| 228 | int getTrueMouseY() const; | 228 | ivec2 getTrueMouseDragStarted() const; |
| 229 | int getMouseDragStartedX() const; | 229 | |
| 230 | int getMouseDragStartedY() const; | 230 | // TODO get rid of these and use glm types directly |
| 231 | int getTrueMouseDragStartedX() const { return _mouseDragStartedX; } | 231 | int getMouseX() const { return getMouse().x; } |
| 232 | int getTrueMouseDragStartedY() const { return _mouseDragStartedY; } | 232 | int getMouseY() const { return getMouse().y; } |
| 233 | int getTrueMouseX() const { return getTrueMouse().x; } | ||
| 234 | int getTrueMouseY() const { return getTrueMouse().y; } | ||
| 235 | int getMouseDragStartedX() const { return getMouseDragStarted().x; } | ||
| 236 | int getMouseDragStartedY() const { return getMouseDragStarted().y; } | ||
| 237 | int getTrueMouseDragStartedX() const { return getTrueMouseDragStarted().x; } | ||
| 238 | int getTrueMouseDragStartedY() const { return getTrueMouseDragStarted().y; } | ||
| 233 | bool getLastMouseMoveWasSimulated() const { return _lastMouseMoveWasSimulated; } | 239 | bool getLastMouseMoveWasSimulated() const { return _lastMouseMoveWasSimulated; } |
| 234 | 240 | ||
| 235 | FaceTracker* getActiveFaceTracker(); | 241 | FaceTracker* getActiveFaceTracker(); |
| @@ -238,6 +244,8 @@ public: · 2 unmodified lines | |||
| 238 | QSystemTrayIcon* getTrayIcon() { return _trayIcon; } | 244 | QSystemTrayIcon* getTrayIcon() { return _trayIcon; } |
| 239 | ApplicationOverlay& getApplicationOverlay() { return _applicationOverlay; } | 245 | ApplicationOverlay& getApplicationOverlay() { return _applicationOverlay; } |
| 240 | const ApplicationOverlay& getApplicationOverlay() const { return _applicationOverlay; } | 246 | const ApplicationOverlay& getApplicationOverlay() const { return _applicationOverlay; } |
| 247 | ApplicationCompositor& getApplicationCompositor() { return _compositor; } | ||
| 248 | const ApplicationCompositor& getApplicationCompositor() const { return _compositor; } | ||
| 241 | Overlays& getOverlays() { return _overlays; } | 249 | Overlays& getOverlays() { return _overlays; } |
| 242 | 250 | ||
| 243 | float getFps() const { return _fps; } | 251 | float getFps() const { return _fps; } |
| @@ -330,6 +338,9 @@ public: · 86 unmodified lines | |||
| 330 | bool isHMDMode() const; | 338 | bool isHMDMode() const; |
| 331 | glm::quat getHeadOrientation() const; | 339 | glm::quat getHeadOrientation() const; |
| 332 | glm::vec3 getHeadPosition() const; | 340 | glm::vec3 getHeadPosition() const; |
| 341 | glm::mat4 getHeadPose() const; | ||
| 342 | glm::mat4 getEyePose(int eye) const; | ||
| 343 | glm::mat4 getEyeProjection(int eye) const; | ||
| 333 | 344 | ||
| 334 | QRect getDesirableApplicationGeometry(); | 345 | QRect getDesirableApplicationGeometry(); |
| 335 | RunningScriptsWidget* getRunningScriptsWidget() { return _runningScriptsWidget; } | 346 | RunningScriptsWidget* getRunningScriptsWidget() { return _runningScriptsWidget; } |
| @@ -451,6 +462,8 @@ private slots: · 115 unmodified lines | |||
| 451 | void setFullscreen(bool fullscreen); | 462 | void setFullscreen(bool fullscreen); |
| 452 | void setEnable3DTVMode(bool enable3DTVMode); | 463 | void setEnable3DTVMode(bool enable3DTVMode); |
| 453 | void setEnableVRMode(bool enableVRMode); | 464 | void setEnableVRMode(bool enableVRMode); |
| 465 | |||
| 466 | void rotationModeChanged(); | ||
| 454 | 467 | ||
| 455 | glm::vec2 getScaledScreenPoint(glm::vec2 projectedPoint); | 468 | glm::vec2 getScaledScreenPoint(glm::vec2 projectedPoint); |
| 456 | 469 | ||
| @@ -548,21 +561,17 @@ private: · 91 unmodified lines | |||
| 548 | 561 | ||
| 549 | OctreeQuery _octreeQuery; // NodeData derived class for querying octee cells from octree servers | 562 | OctreeQuery _octreeQuery; // NodeData derived class for querying octee cells from octree servers |
| 550 | 563 | ||
| 551 | KeyboardMouseDevice _keyboardMouseDevice; // Default input device, the good old keyboard mouse and maybe touchpad | 564 | KeyboardMouseDevice _keyboardMouseDevice; // Default input device, the good old keyboard mouse and maybe touchpad |
| 552 | 565 | UserInputMapper _userInputMapper; // User input mapper allowing to mapp different real devices to the action channels that the application has to offer | |
| 553 | UserInputMapper _userInputMapper; // User input mapper allowing to mapp different real devices to the action channels that the application has to offer | 566 | MyAvatar* _myAvatar; // TODO: move this and relevant code to AvatarManager (or MyAvatar as the case may be) |
| 554 | 567 | Camera _myCamera; // My view onto the world | |
| 555 | MyAvatar* _myAvatar; // TODO: move this and relevant code to AvatarManager (or MyAvatar as the case may be) | ||
| 556 | |||
| 557 | Camera _myCamera; // My view onto the world | ||
| 558 | Camera _mirrorCamera; // Cammera for mirror view | 568 | Camera _mirrorCamera; // Cammera for mirror view |
| 559 | QRect _mirrorViewRect; | 569 | QRect _mirrorViewRect; |
| 560 | RearMirrorTools* _rearMirrorTools; | ||
| 561 | 570 | ||
| 562 | Setting::Handle<bool> _firstRun; | 571 | Setting::Handle<bool> _firstRun; |
| 563 | Setting::Handle<QString> _previousScriptLocation; | 572 | Setting::Handle<QString> _previousScriptLocation; |
| 564 | Setting::Handle<QString> _scriptsLocationHandle; | 573 | Setting::Handle<QString> _scriptsLocationHandle; |
| 565 | Setting::Handle<float> _fieldOfView; | 574 | Setting::Handle<float> _fieldOfView; |
| 566 | 575 | ||
| 567 | Transform _viewTransform; | 576 | Transform _viewTransform; |
| 568 | glm::mat4 _untranslatedViewMatrix; | 577 | glm::mat4 _untranslatedViewMatrix; |
| @@ -580,18 +589,17 @@ private: · 11 unmodified lines | |||
| 580 | Environment _environment; | 589 | Environment _environment; |
| 581 | 590 | ||
| 582 | bool _cursorVisible; | 591 | bool _cursorVisible; |
| 583 | int _mouseDragStartedX; | 592 | ivec2 _mouseDragStarted; |
| 584 | int _mouseDragStartedY; | 593 | |
| 585 | quint64 _lastMouseMove; | 594 | quint64 _lastMouseMove; |
| 586 | bool _lastMouseMoveWasSimulated; | 595 | bool _lastMouseMoveWasSimulated; |
| 587 | 596 | ||
| 588 | glm::vec3 _mouseRayOrigin; | 597 | glm::vec3 _mouseRayOrigin; |
| 589 | glm::vec3 _mouseRayDirection; | 598 | glm::vec3 _mouseRayDirection; |
| 590 | 599 | ||
| 591 | float _touchAvgX; | 600 | vec2 _touchAvg; |
| 592 | float _touchAvgY; | 601 | vec2 _touchDragStartedAvg; |
| 593 | float _touchDragStartedAvgX; | 602 | |
| 594 | float _touchDragStartedAvgY; | ||
| 595 | bool _isTouchPressed; // true if multitouch has been pressed (clear when finished) | 603 | bool _isTouchPressed; // true if multitouch has been pressed (clear when finished) |
| 596 | 604 | ||
| 597 | bool _mousePressed; // true if mouse has been pressed (clear when finished) | 605 | bool _mousePressed; // true if mouse has been pressed (clear when finished) |
| @@ -669,6 +677,7 @@ private: · 71 unmodified lines | |||
| 669 | 677 | ||
| 670 | Overlays _overlays; | 678 | Overlays _overlays; |
| 671 | ApplicationOverlay _applicationOverlay; | 679 | ApplicationOverlay _applicationOverlay; |
| 680 | ApplicationCompositor _compositor; | ||
| 672 | }; | 681 | }; |
| 673 | 682 | ||
| 674 | #endif // hifi_Application_h | 683 | #endif // hifi_Application_h |