History

Merge with master

Sam Gondelman committed 11 years ago

Commit 19ec0802 parents 778e19a 0bef506214 files · +6701 −6001Browse files

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

Unified · Split

interface/src/Application.h+37−28
@@ -62,12 +62,12 @@ · 61 unmodified lines
6262 #include "ui/ModelsBrowser.h"
6363 #include "ui/NodeBounds.h"
6464 #include "ui/OctreeStatsDialog.h"
65−#include "ui/RearMirrorTools.h"
6665 #include "ui/SnapshotShareDialog.h"
6766 #include "ui/LodToolsDialog.h"
6867 #include "ui/LogDialog.h"
6968 #include "ui/overlays/Overlays.h"
7069 #include "ui/ApplicationOverlay.h"
70+#include "ui/ApplicationCompositor.h"
7171 #include "ui/RunningScriptsWidget.h"
7272 #include "ui/ToolWindow.h"
7373 #include "ui/UserInputMapper.h"
@@ -221,15 +221,21 @@ public: · 147 unmodified lines
221221 const glm::vec3& getMouseRayOrigin() const { return _mouseRayOrigin; }
222222 const glm::vec3& getMouseRayDirection() const { return _mouseRayDirection; }
223223 bool mouseOnScreen() const;
224− int getMouseX() const;
225− int getMouseY() const;
226− glm::ivec2 getTrueMousePosition() const;
227− int getTrueMouseX() const;
228− int getTrueMouseY() const;
229− int getMouseDragStartedX() const;
230− int getMouseDragStartedY() const;
231− int getTrueMouseDragStartedX() const { return _mouseDragStartedX; }
232− int getTrueMouseDragStartedY() const { return _mouseDragStartedY; }
224+
225+ ivec2 getMouse() const;
226+ ivec2 getTrueMouse() const;
227+ ivec2 getMouseDragStarted() const;
228+ ivec2 getTrueMouseDragStarted() const;
229+
230+ // TODO get rid of these and use glm types directly
231+ int getMouseX() const { return getMouse().x; }
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; }
233239 bool getLastMouseMoveWasSimulated() const { return _lastMouseMoveWasSimulated; }
234240
235241 FaceTracker* getActiveFaceTracker();
@@ -238,6 +244,8 @@ public: · 2 unmodified lines
238244 QSystemTrayIcon* getTrayIcon() { return _trayIcon; }
239245 ApplicationOverlay& getApplicationOverlay() { return _applicationOverlay; }
240246 const ApplicationOverlay& getApplicationOverlay() const { return _applicationOverlay; }
247+ ApplicationCompositor& getApplicationCompositor() { return _compositor; }
248+ const ApplicationCompositor& getApplicationCompositor() const { return _compositor; }
241249 Overlays& getOverlays() { return _overlays; }
242250
243251 float getFps() const { return _fps; }
@@ -330,6 +338,9 @@ public: · 86 unmodified lines
330338 bool isHMDMode() const;
331339 glm::quat getHeadOrientation() const;
332340 glm::vec3 getHeadPosition() const;
341+ glm::mat4 getHeadPose() const;
342+ glm::mat4 getEyePose(int eye) const;
343+ glm::mat4 getEyeProjection(int eye) const;
333344
334345 QRect getDesirableApplicationGeometry();
335346 RunningScriptsWidget* getRunningScriptsWidget() { return _runningScriptsWidget; }
@@ -451,6 +462,8 @@ private slots: · 115 unmodified lines
451462 void setFullscreen(bool fullscreen);
452463 void setEnable3DTVMode(bool enable3DTVMode);
453464 void setEnableVRMode(bool enableVRMode);
465+
466+ void rotationModeChanged();
454467
455468 glm::vec2 getScaledScreenPoint(glm::vec2 projectedPoint);
456469
@@ -548,21 +561,17 @@ private: · 91 unmodified lines
548561
549562 OctreeQuery _octreeQuery; // NodeData derived class for querying octee cells from octree servers
550563
551− KeyboardMouseDevice _keyboardMouseDevice; // Default input device, the good old keyboard mouse and maybe touchpad
552−
553− UserInputMapper _userInputMapper; // User input mapper allowing to mapp different real devices to the action channels that the application has to offer
554−
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
564+ KeyboardMouseDevice _keyboardMouseDevice; // Default input device, the good old keyboard mouse and maybe touchpad
565+ 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)
567+ Camera _myCamera; // My view onto the world
558568 Camera _mirrorCamera; // Cammera for mirror view
559569 QRect _mirrorViewRect;
560− RearMirrorTools* _rearMirrorTools;
561570
562− Setting::Handle<bool> _firstRun;
563− Setting::Handle<QString> _previousScriptLocation;
564− Setting::Handle<QString> _scriptsLocationHandle;
565− Setting::Handle<float> _fieldOfView;
571+ Setting::Handle<bool> _firstRun;
572+ Setting::Handle<QString> _previousScriptLocation;
573+ Setting::Handle<QString> _scriptsLocationHandle;
574+ Setting::Handle<float> _fieldOfView;
566575
567576 Transform _viewTransform;
568577 glm::mat4 _untranslatedViewMatrix;
@@ -580,18 +589,17 @@ private: · 11 unmodified lines
580589 Environment _environment;
581590
582591 bool _cursorVisible;
583− int _mouseDragStartedX;
584− int _mouseDragStartedY;
592+ ivec2 _mouseDragStarted;
593+
585594 quint64 _lastMouseMove;
586595 bool _lastMouseMoveWasSimulated;
587596
588597 glm::vec3 _mouseRayOrigin;
589598 glm::vec3 _mouseRayDirection;
590599
591− float _touchAvgX;
592− float _touchAvgY;
593− float _touchDragStartedAvgX;
594− float _touchDragStartedAvgY;
600+ vec2 _touchAvg;
601+ vec2 _touchDragStartedAvg;
602+
595603 bool _isTouchPressed; // true if multitouch has been pressed (clear when finished)
596604
597605 bool _mousePressed; // true if mouse has been pressed (clear when finished)
@@ -669,6 +677,7 @@ private: · 71 unmodified lines
669677
670678 Overlays _overlays;
671679 ApplicationOverlay _applicationOverlay;
680+ ApplicationCompositor _compositor;
672681 };
673682
674683 #endif // hifi_Application_h