Commit graph

56 commits

Author SHA1 Message Date
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
Patrick Manalich
057e883111 Changing window size while in monitor display 2017-06-26 15:06:27 -07:00
Zach Fox
e9ba223c09 Uncheck 'disable preview' when opening Spectator app 2017-06-19 13:40:50 -07:00
Zach Fox
378d8e80cf Remove random component of button mapping name 2017-06-16 10:08:58 -07:00
Zach Fox
e2c6993ae9 Fix bug found by Cain with his patch - thank you! 2017-06-16 10:08:58 -07:00
Zach Fox
3df414df36 Bugfixes and language changes 2017-06-16 10:08:58 -07:00
Zach Fox
65b910bcf6 Support Vive 2017-06-16 10:08:58 -07:00
Zach Fox
8cf9c8708d Allow user to click left thumbstick to switch 'MONITOR SHOWS' 2017-06-16 10:08:58 -07:00
Zach Fox
68662bb209 Bugfixes 2017-06-15 10:20:17 -07:00
Zach Fox
a795822919 Comments and disable camera when switching 2017-06-15 10:09:28 -07:00
Zach Fox
498ed4cbe8 showSpectatorInDesktop true for now 2017-06-15 10:09:28 -07:00
Zach Fox
0114962e75 Make the Spectator button only appear in HMD (with debug mode) 2017-06-15 10:09:28 -07:00
Zach Fox
03c61e2191 vFoV and clipping plane distances now come from config 2017-06-14 11:53:05 -07:00
Zach Fox
8962c7bf6a Viewfinder re-flip, add comments regarding why it's necessary 2017-06-13 13:06:03 -07:00
Zach Fox
7b6033f7bc Getting closer to a solution 2017-06-13 11:37:27 -07:00
Zach Fox
4acbb81413 Checkpoint 2017-06-13 10:22:48 -07:00
Zach Fox
8825e91775 emissive is true 2017-06-09 11:42:17 -07:00
Zach Fox
3f169e50fe selfie to spectatorCamera 2017-06-09 11:42:17 -07:00
Zach Fox
3d9904cde1 Correctly position actual camera and preview overlay 2017-06-09 11:42:17 -07:00
Zach Fox
fd50434d86 New camera model; Cleanup; Bashing head :against desk 2017-06-09 11:42:16 -07:00
Zach Fox
3884287c41 Use 'resource' protocol instead of 'http' 2017-06-09 11:39:28 -07:00
Zach Fox
5114fd8e1f Rename correctly? 2017-06-09 11:39:28 -07:00
Zach Fox
7aef4dab4c Variable renaming pass 2017-06-09 11:39:28 -07:00
howard-stearns
df8287d6ee reset display texture as needed when switching camera or hmd 2017-06-08 11:35:55 -07:00
howard-stearns
ce2053e3b8 control-0 toggles display, and display itself only toggles when camera is
on
2017-06-08 10:41:09 -07:00
howard-stearns
8db81ee5c9 wire up preview vs camera display in scripts 2017-06-07 16:19:36 -07:00
Zach Fox
cbeea7abc4 Make the camera an avatar entity 2017-06-06 16:37:25 -07:00
Zach Fox
a30b678ecb No more dynamic camera...for now. 2017-06-06 16:27:58 -07:00