Ryan Huffman
198b6cfa88
Fix ray picking working intermittently
...
Ray picking relies on the Application's viewFrustum which was being set
to both the main camera and mirror camera for their respective pass
while rendering. This makes sure the viewFrustum only ever holds the
main camera. Application::_displayViewFrustum still gets updated to
the current camera while rendering.
2015-07-23 06:17:08 -07:00
Stephen Birarda
7cee5f3ce5
don't reset the idleTimer if the interval hasn't changed
2015-07-22 18:05:04 -07:00
Stephen Birarda
db5e8c72ee
force event processing up to a certain max time
2015-07-22 17:59:07 -07:00
David Rowe
11078d0d02
Get Developer > Avatar > Show Collision Bounding Shapes working again
...
Note: Currently doesn't display well because alpha isn't working.
2015-07-22 17:50:56 -07:00
David Rowe
3362358dcd
Remove unused postLighting variable from Avatar and MyAvatar
...
Fixes Leap and Hydra laser pointers not displaying.
Enables:
- Avatar billboard display
- Avatar collision bounding shape display
- Hand information display
2015-07-22 17:50:55 -07:00
David Rowe
b515b163fb
Remove dead code from Head
2015-07-22 17:50:54 -07:00
Stephen Birarda
785ae190ca
add back send posted touch events
2015-07-22 17:49:27 -07:00
ZappoMan
71eeecc7f6
Revert "Instrument the inter-idle time and tweaking the timeout setting"
...
This reverts commit 0c88972f09
2015-07-22 16:53:56 -07:00
SamGondelman
e27ba86f75
fixing merge issues with plugins
2015-07-22 14:57:59 -07:00
Ryan Huffman
9e2eb7fdbd
Fix face-camera functionality for BillboardOverlay
2015-07-22 14:49:20 -07:00
SamGondelman
505ef4c5cc
set up sixense/vive menu items with correct event forwarding
2015-07-22 11:36:31 -07:00
Sam Gateau
f70553ec95
Fixing merge
2015-07-22 11:31:46 -07:00
Anthony J. Thibault
700909d537
Fix for mirror rendering
...
RenderArgs _renderMode was not getting set properly in
renderRearViewMirror(). Previously this was set in PaintGL but was lost
during display plugins refactor.
2015-07-22 11:11:12 -07:00
Bradley Austin Davis
68cf3776f0
Make stars a little smaller
2015-07-22 13:44:37 -04:00
Sam Gateau
7ac2030862
Preparing for first pr
2015-07-22 10:43:50 -07:00
Niraj Venkat
adf7a1098d
Merge branch 'master' of https://github.com/highfidelity/hifi into avatar
2015-07-22 10:27:39 -07:00
Bradley Austin Davis
408bb082d7
Merge fixes, OSX compile fixes
2015-07-22 13:24:47 -04:00
David Rowe
9d33cfa965
Allow for look-at positions being not quite up to date as avatars move
...
So that looking-at-me indicators don't flicker on when they shouldn't.
2015-07-22 09:53:37 -07:00
David Rowe
e44cba500d
Guard against head model not being available yet
2015-07-22 09:52:49 -07:00
Bradley Austin Davis
114ab9e47f
Merge branch 'master' into plugins
2015-07-22 11:47:56 -04:00
Bradley Austin Davis
2f13488f11
Fixing FBO bug on resizing windows
2015-07-22 11:28:36 -04:00
Brad Hefta-Gaub
4e04f0d887
Merge pull request #5381 from jherico/bart
...
Fix deadlock when using textoverlay from main thread
2015-07-22 07:59:35 -07:00
Brad Hefta-Gaub
2bd2004bda
Merge pull request #5380 from jherico/maggie
...
Restoring starfield size and color variation
2015-07-22 07:58:15 -07:00
Bradley Austin Davis
65732d874c
Merge branch 'maggie' into marge
2015-07-22 09:07:50 -04:00
Bradley Austin Davis
c0048afbec
Merge branch 'bart' into marge
2015-07-22 09:07:45 -04:00
Bradley Austin Davis
190984657e
Merge branch 'homer' into marge
2015-07-22 09:07:33 -04:00
Bradley Austin Davis
a93e17d622
Fix domain connection status border
2015-07-22 08:27:51 -04:00
Bradley Austin Davis
9596452c32
Trying to fix oculus rendering
2015-07-22 08:07:44 -04:00
Bradley Austin Davis
ae539afafb
Fix deadlock when using textoverlay from main thread
2015-07-22 07:23:12 -04:00
David Rowe
87dbbdb2e8
Set an initial alpha in anticipation of sphere alpha working
2015-07-21 18:25:35 -07:00
David Rowe
55683e0cd5
Size looking-at-me eye spheres per avatar model dimensions
2015-07-21 18:24:47 -07:00
David Rowe
bed266dfe9
Fade looking-at-me eye spheres over half a second
2015-07-21 18:23:50 -07:00
David Rowe
9ac4e2f687
Render spheres over avatar eyes if they're looking at me
2015-07-21 18:22:27 -07:00
Bradley Austin Davis
bd5da87551
Merge remote-tracking branch 'upstream/master' into marge
2015-07-21 19:23:38 -04:00
Bradley Austin Davis
d6994c6dfd
Restoring star size and color variation
2015-07-21 19:22:10 -04:00
SamGondelman
e3bc4b3b89
working on plugin menu manipulation
2015-07-21 13:45:33 -07:00
Brad Hefta-Gaub
6dbe6bc375
Merge pull request #5332 from ctrlaltdavid/20612
...
Fix full-screen mirror not mirroring correctly with Faceshift or DDE
2015-07-21 13:32:56 -07:00
Niraj Venkat
e0634de403
Turn on/off debug AO from menu item
2015-07-21 12:14:09 -07:00
Sam Gateau
7b35048e52
Merge branch 'master' of https://github.com/highfidelity/hifi into daft
2015-07-21 11:18:15 -07:00
Sam Gateau
93afdf79a3
Removing the gl driver version report intiialization code out of applciation
2015-07-21 11:17:41 -07:00
Philip Rosedale
cf88bce082
Merge pull request #5367 from ctrlaltdavid/fix-speech-bubble-not-rendering
...
Fix Avatar > Blue Sphere While Speaking not rendering
2015-07-21 09:11:36 -07:00
Bradley Austin Davis
fda1cb6f7b
Merge remote-tracking branch 'upstream/master' into marge
2015-07-21 08:59:29 -07:00
Brad Davis
9016f437a8
Merge pull request #5371 from Atlante45/smart_pointers
...
Smart pointers fixes
2015-07-21 08:52:29 -07:00
Brad Davis
5b63863dca
Merge pull request #5378 from ZappoMan/warningFixes
...
coding standard fix
2015-07-21 08:52:17 -07:00
David Rowe
716211c6b7
Merge branch 'master' into fix-speech-bubble-not-rendering
2015-07-21 08:45:13 -07:00
ZappoMan
558f10640b
coding standard fix
2015-07-21 08:30:33 -07:00
Brad Davis
6d4c7cd4f2
Merge pull request #5374 from ZappoMan/warningFixes
...
Warning fixes and removing dead code
2015-07-21 07:23:40 -07:00
Brad Davis
9fd80d7954
Working on batch
2015-07-20 19:21:29 -07:00
Brad Davis
5744200f64
Merge remote-tracking branch 'upstream/master' into plugins
...
Conflicts:
interface/CMakeLists.txt
interface/src/Application.cpp
interface/src/Application.h
interface/src/avatar/MyAvatar.h
2015-07-20 19:21:02 -07:00
Brad Davis
51973674f5
Merge remote-tracking branch 'upstream/master' into marge
2015-07-20 17:26:36 -07:00
Brad Davis
c3a2b72c13
Breaking framebuffer ops out of texture cache
2015-07-20 17:26:26 -07:00
David Rowe
ac4b64c853
Merge branch 'master' into 20602
2015-07-20 17:14:52 -07:00
Sam Gateau
5bf85961d2
removing dead code
2015-07-20 17:13:02 -07:00
Sam Gateau
ad1771c738
removing dead code
2015-07-20 17:09:11 -07:00
Brad Davis
94d57a2e43
fixing missing glew init
2015-07-20 16:51:01 -07:00
Sam Gateau
9d9142c274
cleaning commented code supposedly dead now
2015-07-20 16:50:24 -07:00
SamGondelman
d985d0293a
correcting comments, removing dead code + back slash
2015-07-20 16:48:53 -07:00
Sam Gateau
6a0ca6e113
Merge branch 'master' of https://github.com/highfidelity/hifi into punk
2015-07-20 16:22:12 -07:00
Stephen Birarda
9fb8b55359
repairs to early return for sendNackPackets
2015-07-20 16:10:11 -07:00
ZappoMan
65a79cfefb
fix a bunch of warnings
2015-07-20 15:58:25 -07:00
Sam Gateau
b5090883a0
merge with latest network pr
2015-07-20 15:49:10 -07:00
David Rowe
a488a12151
Merge branch 'master' into 20602
2015-07-20 15:37:43 -07:00
Sam Gateau
59666f664a
merging my changes to remove cruff from application to AUstin;s latest
2015-07-20 15:37:17 -07:00
Anthony J. Thibault
17220542d8
Merge branch 'sam/vive-hand-controllers' of github.com:hyperlogic/hifi into sam/vive-hand-controllers
...
Conflicts:
examples/example/games/sword.js
2015-07-20 15:22:19 -07:00
Anthony J. Thibault
80dea6831c
Merge branch 'plugins' of github.com:highfidelity/hifi into sam/vive-hand-controllers
...
Conflicts:
interface/src/Application.cpp
libraries/input-plugins/src/input-plugins/SixenseManager.cpp
2015-07-20 15:18:23 -07:00
ZappoMan
648d0f6d43
fix a bunch of warnings
2015-07-20 15:12:27 -07:00
Niraj Venkat
eaf75c01b9
Merge branch 'master' of https://github.com/highfidelity/hifi into avatar
...
Conflicts:
libraries/render-utils/src/AmbientOcclusionEffect.cpp
libraries/render-utils/src/AmbientOcclusionEffect.h
2015-07-20 14:55:27 -07:00
Niraj Venkat
85c9ee0feb
Merge branch 'master' of https://github.com/highfidelity/hifi into avatar
...
Conflicts:
libraries/render-utils/src/AmbientOcclusionEffect.cpp
2015-07-20 14:53:19 -07:00
SamGondelman
4d3b08b5e3
modified sword.js to work with vive controllers
2015-07-20 14:52:49 -07:00
Atlante45
8d6ff2d9f9
Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointers
2015-07-20 14:50:44 -07:00
Brad Davis
c0859ffd4c
Removing some dead forward declarations
2015-07-20 14:33:10 -07:00
Andrew Meadows
7578a70c4c
Merge pull request #5359 from birarda/protocol
...
Network Protocol Refactor
2015-07-20 14:30:58 -07:00
Brad Davis
9fafc920ee
Merge branch 'homer' into plugins
...
Conflicts:
interface/src/Application.cpp
libraries/render-utils/src/AmbientOcclusionEffect.cpp
2015-07-20 13:53:15 -07:00
Atlante45
59acfc9f47
Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointers
2015-07-20 13:51:51 -07:00
Brad Davis
488a449cb1
Merge branch 'master' into homer
2015-07-20 13:34:21 -07:00
Brad Davis
359abd6474
Merge branch 'master' into plugins
...
Conflicts:
interface/CMakeLists.txt
interface/src/Application.cpp
interface/src/Application.h
interface/src/GLCanvas.cpp
interface/src/GLCanvas.h
interface/src/devices/OculusManager.cpp
interface/src/devices/OculusManager.h
interface/src/devices/TV3DManager.cpp
interface/src/ui/overlays/LocalModelsOverlay.cpp
libraries/render-utils/src/OffscreenGlCanvas.cpp
libraries/render-utils/src/OffscreenGlCanvas.h
libraries/render-utils/src/text/EffectType.h
2015-07-20 13:33:24 -07:00
Stephen Birarda
462ff97722
remove FlowLayout.cpp that was accidentally kept
2015-07-20 13:06:31 -07:00
Stephen Birarda
0177513285
resolve conflicts on merge with upstream/master
2015-07-20 12:29:38 -07:00
Sam Gateau
1a9f6e12a5
something not compiling but just before merge with upstream
2015-07-20 12:20:04 -07:00
Brad Hefta-Gaub
c41e20b90f
Merge pull request #5366 from jherico/marge
...
Naked GL removal work
2015-07-20 12:12:22 -07:00
Brad Davis
3d09e772f9
Merge branch 'marge' into homer
2015-07-20 12:09:51 -07:00
Brad Davis
23b058e4eb
Removing starfield tilt and reducing grid alpha
2015-07-20 11:40:12 -07:00
Brad Davis
dcaaeec593
Removing AO effect (temporarily) and wireframe mode
2015-07-20 10:55:11 -07:00
SamGondelman
d88e484b00
hand information is in correct coordinate space, cleanup
2015-07-20 10:44:27 -07:00
Atlante45
fc2956342e
Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointers
2015-07-20 10:39:16 -07:00
David Rowe
73ffe5d9f6
Fix Avatar > Blue Sphere While Speaking not rendering
2015-07-20 10:25:59 -07:00
Brad Davis
de92e66635
Removing shadows code
2015-07-20 09:59:22 -07:00
Brad Davis
d4e637c5b8
Removing superfluous lighting and naked GL in mirror
2015-07-20 09:36:05 -07:00
Stephen Birarda
6b11495a20
resolve conflicts on merge with upstream master
2015-07-20 08:51:48 -07:00
Brad Davis
5159452335
Fixing invalid vector usage and strange picking crash
2015-07-19 23:03:46 -07:00
Brad Davis
4c3cfe1e82
Starfield jazz hands
2015-07-19 20:53:50 -07:00
Brad Davis
81543d9185
Removing unneeded undef
2015-07-19 19:06:21 -07:00
Brad Davis
f13152b2b4
Fixing reference to PI/2
2015-07-18 23:04:16 -07:00
Brad Davis
0da8b27fcf
Removing unused files
2015-07-18 22:53:43 -07:00
Brad Davis
5b494c23fd
More header cleanup
2015-07-18 22:38:26 -07:00
Brad Davis
35f7307f30
More header cleanup
2015-07-18 22:15:50 -07:00
Brad Davis
0056208565
Another whack at GL headers
2015-07-18 17:04:44 -07:00
Brad Davis
c446bb307d
Adding convenience return *this to many transform methods
2015-07-18 16:56:32 -07:00
Brad Davis
e4f6586c3c
Working on star rendering, removal of naked GL
2015-07-18 16:40:54 -07:00
Philip Rosedale
61c2b172d4
Merge pull request #5357 from ctrlaltdavid/scriptable-muting
...
Mute / un-mute face tracking when menu item is changed from script
2015-07-18 15:45:01 -07:00
David Rowe
47fdbedfb2
Fix FPS throttle default
2015-07-18 15:22:47 -07:00
David Rowe
7b11d02eb2
Default Throttle FPS to disabled
2015-07-18 14:18:08 -07:00
David Rowe
d0489bf2a0
Add menu item, Developer > Render > Throttle FPS If Not Focus
2015-07-18 14:18:06 -07:00
Brad Davis
b7fdfd8663
Working on lighting
2015-07-18 10:55:53 -07:00
Brad Davis
d68618e206
Removing GL headers from most files, and some naked GL from application.cpp
2015-07-18 00:46:09 -07:00
Atlante45
256c786e28
Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointers
2015-07-17 17:59:19 -07:00
Sam Gateau
a0590182ad
Merge branch 'master' of https://github.com/highfidelity/hifi into punk
2015-07-17 17:44:54 -07:00
ZappoMan
98c078d995
move audio scope to the back
2015-07-17 17:44:29 -07:00
Sam Gateau
96e18af77b
trying to remove the naked gl calls aroiund the rearViewMirror
2015-07-17 17:44:25 -07:00
ZappoMan
ecab2538d7
quick hack to fix overlay ordering
2015-07-17 17:27:15 -07:00
Anthony J. Thibault
01c740f415
cleaning up plugin architecture, fixed hand controllers
2015-07-17 17:19:49 -07:00
Stephen Birarda
f8c832e50b
resolve conflicts on merge with upstream master
2015-07-17 16:48:46 -07:00
ZappoMan
26e8090ec1
Merge branch 'master' of https://github.com/highfidelity/hifi into removeNakeGL
2015-07-17 16:48:42 -07:00
Brad Hefta-Gaub
3ea348b73b
Merge pull request #5349 from jherico/marge
...
Working on text rendering overlays
2015-07-17 16:47:48 -07:00
Niraj Venkat
0580c8477e
3-step groundwork for AO in the pipeline
2015-07-17 16:42:03 -07:00
ZappoMan
eb989fd725
fix the backround colors for text overlays, pending austins PR to really fix them
2015-07-17 16:38:05 -07:00
ZappoMan
695470b1c1
fix audio scope
2015-07-17 16:30:10 -07:00
ZappoMan
8692f51399
dead code cleanup
2015-07-17 16:15:02 -07:00
Stephen Birarda
1fd4a1f0c3
resolve conflicts on merge with upstream master
2015-07-17 16:07:45 -07:00
Stephen Birarda
54edc6f993
Merge branch 'master' of https://github.com/highfidelity/hifi into protocol
2015-07-17 16:04:45 -07:00
ZappoMan
c20c6e4b90
fix retina in an Austin approved manner
2015-07-17 16:01:32 -07:00
ZappoMan
03a44a1c80
fix retina
2015-07-17 15:45:42 -07:00
Atlante45
e3f7c33767
Fix index check in setJointRotation
2015-07-17 15:39:25 -07:00
ZappoMan
ccd2f98a76
one more try
2015-07-17 15:28:25 -07:00
Atlante45
3f4041595a
Fix compile error in connect
2015-07-17 15:26:04 -07:00
Brad Hefta-Gaub
2df75f8bff
Merge pull request #5337 from bwent/audioStatsDialog
...
Added a dialog box to display Audio Network Statistics
2015-07-17 14:45:51 -07:00
Bradley Austin Davis
3bfa8aae0b
Removing debug output
2015-07-17 14:34:24 -07:00
Brad Davis
914b47069b
Working on line height
2015-07-17 14:33:32 -07:00
Bradley Austin Davis
24643ca282
Working on line spacing
2015-07-17 14:19:39 -07:00
Brad Davis
6f998e5d28
Working on line spacing on mac
2015-07-17 13:32:31 -07:00
ZappoMan
4dadf60724
some tweaks from Sam
2015-07-17 12:50:20 -07:00
Bradley Austin Davis
c5e0298f8d
Working on mac sizing
2015-07-17 12:22:38 -07:00
David Rowe
550e9224c5
Mute / un-mute face tracking when menu item is changed from script
2015-07-17 11:45:15 -07:00
ZappoMan
33464dfd6c
cleanup dead code
2015-07-17 11:35:42 -07:00
Stephen Birarda
7a13c867ae
quit the ScriptEngine thread once the script is done
2015-07-17 11:18:14 -07:00
Anthony J. Thibault
5fe4d06562
fixed input devices menu exclusivity
2015-07-17 11:11:31 -07:00
Stephen Birarda
e5722098f6
resolve conflicts on merge with upstream/master
2015-07-17 11:06:01 -07:00
Ryan Huffman
9725184b24
Move dataSent signal from PacketReceiver to LimitedNodeList
2015-07-17 11:05:07 -07:00
Brad Davis
ea74aac1d6
Working on cleaning up diff
2015-07-17 11:02:32 -07:00
bwent
b22fd3f4a0
fixed lagging issues
2015-07-17 10:58:30 -07:00
Ryan Huffman
68564a79b0
Merge branch 'protocol' of github.com:Atlante45/hifi into protocol
2015-07-17 09:59:05 -07:00
ZappoMan
efa2001325
Merge branch 'master' of https://github.com/highfidelity/hifi into removeNakeGL
2015-07-17 09:25:37 -07:00
Stephen Birarda
7d60b86f52
kill the PacketLister (AKA Huffman 1 : PacketListener 0)
2015-07-17 09:07:39 -07:00
Brad Davis
7f6bb552a3
Working on cleaning up diff
2015-07-16 20:51:37 -07:00
Anthony J. Thibault
65b76869fa
Merge branch 'sam/vive-hand-controllers' of github.com:hyperlogic/hifi into sam/vive-hand-controllers
2015-07-16 18:47:55 -07:00
Anthony J. Thibault
e8da4b9586
merge with plugins, needs testing
2015-07-16 18:47:39 -07:00
Anthony J. Thibault
060f6c19a6
almost finished plugin architecture, general plugin improvements. menu actions don't work all the time, joint controllers need to be handled better, and activate/deactive aren't always called correctly
2015-07-16 18:16:59 -07:00
Stephen Birarda
ce6585ccc8
fix AC monitor and AM double register
2015-07-16 17:44:43 -07:00
Brad Davis
7e32bfb85e
Fixing mac/linux build
2015-07-16 17:35:05 -07:00
Atlante45
ceea5143e1
Avoid string copy
2015-07-16 16:55:37 -07:00
