Commit graph

83 commits

Author SHA1 Message Date
Zach Fox
63b0e70833 Prepare for marketplace submission 2017-07-12 14:19:08 -07:00
Zach Fox
bd4fe416b4 Cleanup; no magic numbers for default cam params 2017-07-12 12:08:36 -07:00
Zach Fox
9fe6fbd811 View frustums are strange. 2017-07-12 11:37:18 -07:00
Zach Fox
79cf242fc9 Make far clip plane distance equal to main camera's 2017-07-12 10:51:14 -07:00
Zach Fox
a27644ae4d Magic numbers 2017-07-11 15:52:12 -07:00
Zach Fox
51c22eb7db Also re-enable spectator camera after switching domains 2017-07-11 15:38:10 -07:00
Zach Fox
1001097f92 Fix button state 2017-07-11 15:29:00 -07:00
Zach Fox
b0639be8bd Use function pointers correctly 2017-07-11 15:23:50 -07:00
Zach Fox
c4a4623ba8 Workaround the bug where Avatar Entities can't get deleted after switching domains 2017-07-11 15:18:08 -07:00
Zach Fox
2e8bd3c9cb Make Spectator Camera icon active when Camera is on 2017-07-11 10:16:55 -07:00
Zach Fox
5823efce76 Cleanup 2017-07-10 15:51:27 -07:00
Zach Fox
4a74522884 Ensure tablet button shows up; protections for controller mapping 2017-07-10 15:16:16 -07:00
Zach Fox
78d12f27ed Merge pull request #10933 from zfox23/spectatorCamera_forceMonoPreview
Force Mono Preview when using Spectator Camera
2017-07-10 13:29:22 -07:00
Zach Fox
303a3d1e4c Force Mono Preview when using Spectator Camera 2017-07-10 13:27:45 -07:00
David Kelly
91ffb003fd Merge pull request #10908 from davidkelly/dk/hmdPreview
hmd preview
2017-07-10 11:14:28 -07:00
Zach Fox
f170449b88 Don't show SPECTATOR app in Desktop mode 2017-07-10 10:25:37 -07:00
David Kelly
1c9c36a8c8 Merge branch 'spectator-camera' of https://github.com/highfidelity/hifi into dk/hmdPreview 2017-07-10 10:22:31 -07:00
David Kelly
688b5dad8b allow switching display modes to work in desktop 2017-07-07 10:34:11 -07:00
David Kelly
93840bf936 hack to not switch display to hmdPreviewFrame texture (temporary) 2017-07-06 18:13:24 -07:00
Zach Fox
1afa2d3775 Spectator camera icon 2017-07-06 16:24:50 -07:00
David Kelly
b41c470064 first cut, still stereo 2017-07-06 15:59:24 -07:00
Zach Fox
aea5779ed6 When a display texture isn't set, show preview instructions 2017-07-05 14:46:58 -07:00
Zach Fox
36dfff78e2 Emit qDebug() error when trying to change position or orientation while attachedEntityId is defined 2017-06-30 15:13:31 -07:00
Zach Fox
9bd80ec2bf Improve naming and API 2017-06-30 14:07:00 -07:00
Zach Fox
947a3bf8a8 Pull in crash fix from other branch 2017-06-30 11:43:48 -07:00
Zach Fox
f78903eead Clarify setDisplayTexture cases, also fixing crash bug 2017-06-30 11:31:48 -07:00
Zach Fox
57692d263d Remove dead code 2017-06-30 10:12:47 -07:00
Zach Fox
8d89ea75f5 Initial commit 2017-06-30 10:12:46 -07:00
Zach Fox
218b32e9fb Fix cameraUpdateInterval 2017-06-28 15:12:57 -07:00
Zach Fox
9f8a6c63cc Fixup after merge 2017-06-28 14:44:26 -07:00
Zach Fox
604bb58987 Merge branch 'spectator-camera' of https://github.com/highfidelity/hifi into spectatorCamera_setInterval 2017-06-28 14:12:25 -07:00
Zach Fox
1bebe8aede Whoops! Missed an if() 2017-06-28 13:49:05 -07:00
Zach Fox
39ae28bfcf CR feedback 2017-06-28 12:54:40 -07:00
Zach Fox
3e7b1b5696 Slightly update registration point 2017-06-28 12:44:34 -07:00
Patrick Manalich
cb52122726 Merge branch 'spectator-camera' of https://github.com/highfidelity/hifi into spectator-camera_clean-up 2017-06-28 12:40:36 -07:00
Zach Fox
c54a7a713c New registration point; attempt to fix button interactions 2017-06-28 12:19:10 -07:00
Zach Fox
99ebd743e6 First steps 2017-06-28 12:16:03 -07:00
Patrick Manalich
9bcaa6d256 Revert "Messing around, howard please refer the commit before this one"
This reverts commit 1392297da9.
2017-06-28 12:10:16 -07:00
Patrick Manalich
252d100a5e Function updateOverlay() made so we don't repeat code 2017-06-28 11:31:40 -07:00
Patrick Manalich
fedbc28da4 Rotation quaternion fix 2017-06-28 10:47:34 -07:00
Patrick Manalich
617e927695 rotation changed to localRotation 2017-06-27 17:13:39 -07:00
Patrick Manalich
1392297da9 Messing around, howard please refer the commit before this one 2017-06-27 16:50:44 -07:00
Patrick Manalich
994117b524 Small comment change to clarify configurations 2017-06-27 15:08:37 -07:00
Patrick Manalich
6d0b853668 Comment structure changes for compacting 2017-06-27 14:34:01 -07:00
Patrick Manalich
1ce6be7d63 Additional commentation and setting z dimension to 0 2017-06-27 10:36:39 -07:00
Patrick Manalich
839a504d01 Revision after code review from zach 2017-06-26 17:05:35 -07:00
Patrick Manalich
75b449c778 Preview centered inside glass pane 2017-06-26 15:06:27 -07:00
Patrick Manalich
2ecf0ed061 Preview scaled correctly without backdrop 2017-06-26 15:06:27 -07:00
Patrick Manalich
4d6ba306ff Preview scaled correctly with backdrop 2017-06-26 15:06:27 -07:00
Patrick Manalich
495fa1d9ba Overlay updates with resize (vertical not adjusted) 2017-06-26 15:06:27 -07:00