Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-09 10:48:15 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
29180 commits 25 branches 0 tags 1.1 GiB
Commit graph

12571 commits

Author SHA1 Message Date
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
Atlante45
6ce710f237 Fix domain request denied reason read 2015-07-16 16:47:09 -07:00
ZappoMan
410e0a99ad hacking on more naked GL 2015-07-16 16:45:58 -07:00
Brad Davis
ae882c8347 Merge remote-tracking branch 'upstream/master' into plugins 
Conflicts:
	interface/src/Application.cpp
	interface/src/Application.h
	interface/src/Menu.cpp
	interface/src/Menu.h
	interface/src/avatar/SkeletonModel.cpp
	interface/src/devices/OculusManager.cpp
	interface/src/devices/TV3DManager.cpp
	interface/src/ui/ApplicationCompositor.cpp
	interface/src/ui/overlays/LocalModelsOverlay.cpp
 2015-07-16 16:37:55 -07:00
ZappoMan
069620b2d9 hacking on more naked GL 2015-07-16 16:36:48 -07:00
ZappoMan
09430b6596 hacking on more naked GL 2015-07-16 16:27:41 -07:00
ZappoMan
398075e45a hacking on more naked GL 2015-07-16 16:26:28 -07:00
Stephen Birarda
eb0ed438ec remove environment data packet 2015-07-16 16:23:57 -07:00
Anthony J. Thibault
157c20e57b goToLocation should work properly in standing HMD mode 2015-07-16 16:04:08 -07:00
Anthony J. Thibault
ef0a157111 Fixes for oculus rift support 
* should work in standing and 'seated' mode
* OculusBaseDisplayPlugin getModelView now only applies eye offset to match behavior from the OpenVRPlugin
 2015-07-16 16:04:08 -07:00
Brad Davis
89faf85ad9 Working on text rendering overlays 2015-07-16 15:56:01 -07:00
David Rowe
f5b02c1731 Remove dead code 
Camera mode cannot be mirror
 2015-07-16 14:06:42 -07:00
David Rowe
6c6e3eb758 Rename and refactor eye deflection slider 2015-07-16 14:05:34 -07:00
Atlante45
b4121eb464 Remove unnecessary move 2015-07-16 13:14:17 -07:00
David Rowe
9980233a0d Use estimated eye pitch and yaw from DDE to deflect eyes 2015-07-16 13:03:33 -07:00
Stephen Birarda
05dd49a4c5 seek back after track of octree packet 2015-07-16 13:02:20 -07:00
David Rowe
228e8d4fc0 Velocity filter eye pitch and yaw 2015-07-16 12:37:47 -07:00
bwent
854a098180 keep track of channel id's within addChannel function, pass in when updating 2015-07-16 12:28:43 -07:00
Stephen Birarda
3d6b246782 check version against version in OPP 2015-07-16 12:18:27 -07:00
Stephen Birarda
61f23f6a5e Merge branch 'master' of https://github.com/highfidelity/hifi into atp 2015-07-16 11:56:26 -07:00
Stephen Birarda
336967e580 fix edit packet sending from client 2015-07-16 11:17:49 -07:00
David Rowe
6b523ada2b Calculate eye pitch and yaw from DDE coefficients 2015-07-16 10:48:21 -07:00
Anthony J. Thibault
ce80bff7cb Merge branch 'sam/vive-hand-controllers' of github.com:hyperlogic/hifi into sam/vive-hand-controllers 2015-07-15 18:50:52 -07:00
Anthony J. Thibault
56e7af081e input plugin architecture, fixed sixense 2015-07-15 18:50:44 -07:00
David Rowe
ba733f730b Move towards saccade target at speed taking into account frame rate 2015-07-15 18:05:10 -07:00
David Rowe
8336b318e1 Scale saccade per target distance when calculating eye rotation 
So that saccades still show when looking into distance.
 2015-07-15 18:05:09 -07:00
Anthony J. Thibault
7a3f53910f fix compile error, oops 2015-07-15 17:50:47 -07:00
Anthony J. Thibault
442b701c9a refactor of myAvatar sensor matrix updating 
Much simpler and maintanable.

* updateFromHMDSensorMatrix is called at start of Application::update()
  It moves the avatar forward taking into account head motion in the room.
* all other avatar manipulation call setPosition and setOrientation
  normally
* Then at the end of Application::update() updateSensorToWorldMatrix is
  called.  This ensures that rendering will use the correct camera
  position w.r.t. the body.
 2015-07-15 17:38:12 -07:00
bwent
4c70c197e6 keep track of channel index with global variable 2015-07-15 17:19:57 -07:00
samcake
b7ac84e174 Merge pull request #5342 from ZappoMan/removeNakeGL 
remove some more dead code and naked gl
 2015-07-15 17:07:55 -07:00
Howard Stearns
01a3701b52 Merge pull request #5329 from SamGondelman/hydraFix 
Hydra hand and mouse fixes
 2015-07-15 19:03:04 -05:00
Kevin M. Thomas
671263909a Moved reload content item to nested Network menu item. 2015-07-15 19:47:37 -04:00
bwent
0654bb5e36 Pass by reference into initialize and update function, remove dead code 2015-07-15 16:40:55 -07:00
ZappoMan
d5a6e87a02 remove naked gl from Avatar::calculateDisplayNameTransform() 2015-07-15 16:34:23 -07:00
Kevin M. Thomas
b93ae7b527 Move reload content item to developer menu. 2015-07-15 19:25:18 -04:00
Stephen Birarda
6a02e6d001 resolve final conflict in Application 2015-07-15 16:23:23 -07:00
Stephen Birarda
05dde9d8f5 resolve conflicts on merge with upstream/master 2015-07-15 16:18:47 -07:00
bwent
c159068701 Make pointers member variables 2015-07-15 16:10:41 -07:00
ZappoMan
7795eaace6 remove more naked gl 2015-07-15 15:56:27 -07:00
ZappoMan
d1e511efcb more naked gl cleanup, deleting dead code, tweaking comments so they don't give false positives in searching for more naked gl 2015-07-15 15:52:12 -07:00
Atlante45
8aa2892fde Remove OctreePacketProcessor dtor 2015-07-15 15:35:13 -07:00
ZappoMan
2ad2c4d554 remove some dead code 2015-07-15 15:33:28 -07:00
Brad Hefta-Gaub
7d8f2e906b Merge pull request #5340 from cozza13/20617 
CR for Job #20617 - Change default Minimum Desktop FPS
 2015-07-15 14:59:43 -07:00
samcake
de7aed1abc Merge pull request #5338 from ZappoMan/removeGlowEffect 
Remove the glow effect.
 2015-07-15 14:50:15 -07:00
Brad Hefta-Gaub
ae6e7f05b6 Merge pull request #5341 from samcake/daft 
Remove the glGet( viewport ) from DeferredLightingEffect
 2015-07-15 14:26:08 -07:00
Niraj Venkat
0ee916fb6f Merge branch 'master' of https://github.com/highfidelity/hifi into avatar 2015-07-15 14:10:42 -07:00
Niraj Venkat
1b13f837bd Porting AO to new pipeline 2015-07-15 14:10:17 -07:00
Atlante45
039bdc8900 Check dependencyManager return value 2015-07-15 14:06:39 -07:00
ZappoMan
849b584596 more GlowEctomy 2015-07-15 13:16:38 -07:00
Chris Collins
ff288fdd5d While we work on FPS I have decreased the default LOD FPS 
While we work on FPS I have decreased the default LOD FPS. In a new
users preferences this will now show as 15 desktop and 30 HMD.
 2015-07-15 13:09:55 -07:00
Atlante45
aa517adb73 Fix Application inheritance formatting 2015-07-15 13:09:34 -07:00
ZappoMan
c17794849d more GlowEctomy 2015-07-15 12:58:15 -07:00
ZappoMan
819fa852b8 first pass at GlowEctomy 2015-07-15 12:47:59 -07:00
bwent
70e3e7caa4 Merge branch 'master' into audioStatsDialog 2015-07-15 12:29:33 -07:00
bwent
2c24251b52 Clean up from previous commit 2015-07-15 11:41:26 -07:00
Sam Gateau
48f23a6eaf Merge branch 'master' of https://github.com/highfidelity/hifi into daft 2015-07-15 11:29:41 -07:00
Stephen Birarda
8b5026a817 cleanup some warnings 2015-07-15 11:20:55 -07:00
bwent
5b0b7229ba Added a dialog box to display audio network statistics 2015-07-15 11:10:39 -07:00
ZappoMan
6b06987700 remove dead code for magnifier 2015-07-15 10:48:07 -07:00
Stephen Birarda
e127c5c06d rename Packet methods for clarity 2015-07-15 10:40:40 -07:00
Anthony J. Thibault
fb62fda2d2 started working on input plugin architecture 2015-07-15 10:26:48 -07:00
ZappoMan
0eeddddd6b removed naked GL from drawOnHUD overlays. 2015-07-15 09:46:58 -07:00
ZappoMan
53c3e3d731 fix CR feedback 2015-07-15 09:03:07 -07:00
David Rowe
fc0ae17a87 Mirror head when using face tracker in fullscreen mirror 
Mirror translation, yaw, and roll in the same manner as done for HMD
case, to mimic what you would expect to see in a mirror.
 2015-07-15 07:27:55 -07:00
David Rowe
0af62ca946 Convert tabs to spaces 2015-07-15 07:27:54 -07:00
samcake
9df26c8488 removing naked glViewport from DeferredLightingEffect by adding the current viewport in renderArgs 2015-07-15 00:24:43 -07:00
samcake
c9112966ba revert debug code 2015-07-14 22:00:32 -07:00
ZappoMan
e39ea72daf removed dead code 2015-07-14 21:25:49 -07:00
ZappoMan
5d43c98ebc fix image overlays to not use Naked GL 2015-07-14 20:56:36 -07:00
ZappoMan
8bb6616a25 remove nakedGL from skeleton IK constraint rendering 2015-07-14 18:47:35 -07:00
Sam Gateau
98a3141e11 Merge branch 'master' of https://github.com/highfidelity/hifi into punk 2015-07-14 18:38:21 -07:00
Anthony J. Thibault
9363ca2f97 Fix for camera matrix position when in Vive HMD. 2015-07-14 18:36:42 -07:00
Sam Gateau
440464f884 Trying to improve the GLBackendINtpu cahce a bit and thinking about moving to core profile 2015-07-14 18:35:11 -07:00
ZappoMan
5a927c4c90 remove dead code 2015-07-14 18:25:50 -07:00
Sam Gondelman
6a0df442f9 emulated mouse events don't get sent back to the keyboard (can't right click and drag with sixense, etc) 2015-07-14 17:59:59 -07:00
ZappoMan
f1b85aefa9 more dead code removal: NodeBounds 2015-07-14 17:59:20 -07:00
Sam Gondelman
f3cb25065f can't move when hydras at base, hands can deactivate individually 2015-07-14 17:36:22 -07:00
ZappoMan
23b89a6f7d remove naked gl/dead code from line and cube overlays 2015-07-14 17:04:07 -07:00
Atlante45
fbb6a94579 Merge branch 'receive_packets' of https://github.com/huffman/hifi into protocol 2015-07-14 16:36:28 -07:00
Philip Rosedale
17ec524253 Merge pull request #5324 from ZappoMan/fixLaggingTouch 
fix lagging touch events
 2015-07-14 16:28:00 -07:00
Ryan Huffman
c6ffda12f9 Merge branch 'atp' of github.com:birarda/hifi into receive_packets 2015-07-14 16:21:57 -07:00
Stephen Birarda
e596733c8b fix for stats grab from iterator 2015-07-14 16:21:34 -07:00
Ryan Huffman
ede9217483 Merge branch 'atp' of github.com:birarda/hifi into receive_packets 2015-07-14 16:15:01 -07:00
Stephen Birarda
e4849d29ec re-use iterator when checking _octreeServerSceneStats 2015-07-14 16:14:43 -07:00
ZappoMan
68f4fe6566 fix lagging touch events 2015-07-14 16:03:44 -07:00
Ryan Huffman
bd345cdccd Merge branch 'atp' of github.com:birarda/hifi into receive_packets 
Conflicts:
	libraries/networking/src/PacketReceiver.cpp
 2015-07-14 15:59:16 -07:00
Stephen Birarda
bbe5a3d682 remove commented out call to resetCounters 2015-07-14 15:51:32 -07:00
Stephen Birarda
fb7cb7ff53 add the option for PacketReceiver to drop packets 2015-07-14 15:49:54 -07:00
Philip Rosedale
221a92eeee Merge pull request #5322 from ctrlaltdavid/fix-eye-direction 
Fix eye directions so that they're correct when avatar leans backwards
 2015-07-14 15:38:56 -07:00
Stephen Birarda
789235b8c7 make NodeList deleter be deleteLater 2015-07-14 15:28:38 -07:00
Ryan Huffman
56b5c9acff Merge branch 'atp' of github.com:birarda/hifi into receive_packets 
Conflicts:
	assignment-client/src/entities/EntityServer.cpp
	domain-server/src/DomainServer.cpp
 2015-07-14 14:53:45 -07:00
Ryan Huffman
677ffb7068 Remove redundant lookup for packetType 2015-07-14 14:50:36 -07:00
Stephen Birarda
e2188415fe fix ref to qApp, connection to audioIO 2015-07-14 14:45:26 -07:00
Stephen Birarda
4dd3dd6386 swap m for comma in Menu 2015-07-14 14:44:04 -07:00
Stephen Birarda
23548a99bc move NACK packet disabling to EntityEditPacketSender 2015-07-14 14:43:01 -07:00
Stephen Birarda
8d4c945874 cleanup audioIO connections in Application 2015-07-14 14:34:39 -07:00
Stephen Birarda
1f4ac0f17c emit mutedByMixer signal for a noisy mute 2015-07-14 14:30:46 -07:00
Stephen Birarda
d617b71232 remove SharedNodePointer from some packet callbacks 2015-07-14 14:27:26 -07:00
Atlante45
bbb00b9d3a Merge branch 'protocol' of https://github.com/birarda/hifi into protocol 2015-07-14 14:11:41 -07:00
David Rowe
bfad3ee02a Fix eye directions so that they're correct when avatar leans backwards 2015-07-14 14:07:32 -07:00
Stephen Birarda
0637f589b5 add PacketListener to help unregister for packets 2015-07-14 13:52:38 -07:00
Anthony J. Thibault
aa66691a73 Merge branch 'sam/vive-hand-controllers' of github.com:hyperlogic/hifi into sam/vive-hand-controllers 2015-07-14 12:37:09 -07:00
Atlante45
a32f54da2f Cleanup 2015-07-14 12:36:18 -07:00
Atlante45
7bf45308b6 Merge branch 'master' of https://github.com/highfidelity/hifi into clear_cache_and_restart 2015-07-14 12:31:37 -07:00
Anthony J. Thibault
dbc18ce51f merge with plugins 2015-07-14 12:30:47 -07:00
Anthony J. Thibault
9209e0745e Added "Standing HMD Sensor Mode" checkbox to menu 
removed static bool isRoomTracking and instead moved into the View menu.
 2015-07-14 12:12:38 -07:00
Brad Hefta-Gaub
049419cec7 Merge pull request #5307 from howard-stearns/remove-octreeFades 
Remove old octreeFade code that wasn't working anyway
 2015-07-14 10:24:01 -07:00
Ryan Huffman
0edc909818 Merge branch 'protocol' of github.com:birarda/hifi into receive_packets 
Conflicts:
	assignment-client/src/audio/AudioMixer.cpp
	interface/src/Application.cpp
	libraries/networking/src/Packet.cpp
 2015-07-14 10:21:31 -07:00
Stephen Birarda
821c16cbc4 resolve conflicts on merge with uptream/master 2015-07-14 09:52:20 -07:00
Brad Davis
684d466b44 Merge pull request #5308 from venkatn93/avatar 
Avatars rendered correctly based on Scene.shouldRenderAvatars
 2015-07-14 09:06:49 -07:00
Niraj Venkat
ef3c6b25e0 More coding standard changes 2015-07-14 00:45:38 -07:00
Niraj Venkat
1f1a5f8e75 Coding standard and fixing pointers 2015-07-13 22:57:11 -07:00
Philip Rosedale
c81053fc83 Merge pull request #5318 from samcake/punk 
Fixing the ImageOverlay Bug
 2015-07-13 22:25:46 -07:00
Anthony J. Thibault
158c1c6aa8 Removed some debugging prints and drawing 2015-07-13 20:41:19 -07:00
Brad Davis
f8144e4ee2 Merge branch 'master' into plugins 2015-07-13 19:52:53 -07:00
Brad Davis
fee5f7cd0f Merge fixes 2015-07-13 19:07:44 -07:00
Clément Brisset
a432752c39 Merge pull request #5316 from ctrlaltdavid/20604 
QA for #20604 - Add an "is looking at me" indicator above avatars' heads
 2015-07-13 16:40:11 -07:00
Sam Gateau
f08c608195 Remove dead code 2015-07-13 16:33:04 -07:00
Sam Gateau
5555ccd225 Merge branch 'master' of https://github.com/highfidelity/hifi into punk 2015-07-13 16:19:09 -07:00
Sam Gateau
4743bbad80 Adding shaders to the lib for rendering simple textured quad and solve the ImageOverlay issue for edit.js 2015-07-13 16:18:39 -07:00
Clément Brisset
c99382ee74 Merge pull request #5287 from ctrlaltdavid/20607 
CR for Job #20607 - Interface upgrade message has bad formatting
 2015-07-13 16:07:17 -07:00
Clément Brisset
24eb4c8263 Merge pull request #5309 from sethalves/quiet-compiler 
quiet compiler
 2015-07-13 15:55:35 -07:00
Stephen Birarda
34f9b1881e fix registration of OctreePacketProcessor for set of types 2015-07-13 15:40:55 -07:00
Atlante45
c80df94b06 Update includes for moved files 2015-07-13 15:28:55 -07:00
Niraj Venkat
10e0a93ac0 Fix for avatar rendering not working on domain exit/entry 2015-07-13 15:22:00 -07:00
David Rowe
59f456a2f2 Add an "is looking at me" indicator above avatars' heads 
Menu item: Developer > Avatar > Show Who's Looking at Me
 2015-07-13 14:16:39 -07:00
Anthony J. Thibault
454aa9b983 Optimization for computation of sensorMat 
During setPosition/setOrientation we used the cached inverse of the body
matrix, instead of the somewhat convoluted previous code path.
 2015-07-13 14:01:12 -07:00
Anthony J. Thibault
57731e7bd8 More refactoring of MyAvatar HMD Sensor math. 
Moved compuation of avatar postion using head/body joints int a helper
method.  Also we compute this once per frame in setHMDSensorMatrix instead
of inside of every setPostion/setOrientation call.
 2015-07-13 13:36:55 -07:00
Stephen Birarda
ca1ff9b0f5 fix a couple of compile errors for avatar changes 2015-07-13 13:34:36 -07:00
Stephen Birarda
859122db5d update signature of callbacks for avatar packets 2015-07-13 13:32:46 -07:00
Stephen Birarda
d990420565 repairs to octree packet receiving in interface 2015-07-13 13:10:57 -07:00
Anthony J. Thibault
d07a02cef3 Refactor of MyAvatar and Application HMD sensor 
MyAvatar now uses a cached copy of the HMDSensor location,
instead of calling into Application for every access.
This allows us to simplify application to always return the
most recent pose, instead of a different one pre and post physics.

Added accessors to HMD Sensor in MyAvatar, besides being helpful,
it also an optimization to avoid extracting quaternions from the
HMD matrix on every access.
 2015-07-13 12:56:33 -07:00
Brad Davis
9eb15d3d55 Merge remote-tracking branch 'upstream/master' into plugins 
Conflicts:
	interface/src/Application.cpp
	interface/src/GLCanvas.cpp
	interface/src/devices/OculusManager.cpp
	interface/src/devices/OculusManager.h
	libraries/render-utils/src/DeferredLightingEffect.cpp
 2015-07-13 12:54:19 -07:00
Atlante45
957e6394a9 sendPacket function take Node& not a pointer 2015-07-13 11:57:20 -07:00
Stephen Birarda
264f39fa59 resolve conflicts on merge with upstream/master 2015-07-13 11:25:24 -07:00
Stephen Birarda
f3d5b8f7c6 add a missing semicolon 2015-07-13 11:18:20 -07:00
Stephen Birarda
3d62162812 cleanup octree networking code to use new API 2015-07-13 09:40:26 -07:00
Howard Stearns
d1952583ab Merge branch 'master' of https://github.com/highfidelity/hifi into remove-octreeFades 2015-07-13 07:24:08 -07:00
Seth Alves
fb23eb0faf Merge pull request #5301 from samcake/yellow 
Rename gpu::Batch::setUniformTexture into gpu::Batch::setResourceTexture
 2015-07-12 11:36:03 -07:00
Seth Alves
c17c9f1818 quiet compiler 2015-07-12 10:29:43 -07:00
Atlante45
80fe090a94 Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointers 2015-07-10 20:20:03 -07:00
Andrew Meadows
9ce9c541de fix activation of object when action changes 2015-07-10 18:45:40 -07:00
Anthony J. Thibault
ac9e1384c0 controllers render in right position, wrong rotation 2015-07-10 18:27:12 -07:00
Anthony J. Thibault
94918be949 another fix for viewing vive user in third person 2015-07-10 18:27:12 -07:00
Stephen Birarda
ffcd8e1613 update connection for packet version mismatch 2015-07-10 17:54:51 -07:00
Stephen Birarda
9ee62a8a38 fix for connection denied packet in Application 2015-07-10 17:52:51 -07:00
Niraj Venkat
f95bd3f7bd Fixing build error 2015-07-10 17:46:20 -07:00
Niraj Venkat
bbd7b2a65e Removed unused functions 2015-07-10 17:31:49 -07:00
Niraj Venkat
dacc6f66c0 Avatars rendered correctly based on Scene.shouldRenderAvatars 2015-07-10 17:26:56 -07:00
Howard Stearns
51be245159 Remove old octreeFade code that wasn't working anyway. 2015-07-10 16:55:45 -07:00
Atlante45
ec7e1df8c0 Move and rename menu item 2015-07-10 15:47:46 -07:00
Atlante45
a3848f08d2 Conditionnal fixes. 2015-07-10 15:36:17 -07:00
Sam Gateau
98f10e72ec fix the wrong function name that happened missing a merge 2015-07-10 15:20:49 -07:00
Ryan Huffman
dee117500b Remove process() from OctreePacketProcessor 2015-07-10 15:00:46 -07:00
Ryan Huffman
99aaefbd03 Fix and update signature of Application::handleDomainConnectionDeniedPacket 2015-07-10 15:00:29 -07:00
Ryan Huffman
6e53a5ad97 Update OctreePacketProcessor to use SharedNodePointer 2015-07-10 14:23:09 -07:00
Andrew Meadows
9cb7e86877 cleanup of AvatarActionHold deserialization 2015-07-10 12:34:12 -07:00
Atlante45
5cfa1605df Made Texture safe with resource refresh 2015-07-10 12:28:06 -07:00
Sam Gateau
2c05349b06 Merge branch 'master' of https://github.com/highfidelity/hifi into yellow 2015-07-10 11:10:07 -07:00
Sam Gateau
7fc9fd97ff Replacing setUniformTexture by setResourceTexture in order to differenciate the 2 types of binding points for the BUffers. 2015-07-10 11:03:12 -07:00
Atlante45
4702b39130 Merge branch 'master' of https://github.com/highfidelity/hifi into clear_cache_and_restart 2015-07-10 10:56:11 -07:00
Andrew Meadows
1759f0553d Merge pull request #5290 from BingShearer/CrashFixes 
Crash fixes
 2015-07-10 10:42:47 -07:00
Anthony J. Thibault
c69665e0fe fix for goToLocation 2015-07-10 09:43:33 -07:00
Anthony J. Thibault
51e24ea466 head model follows HMD for observers 2015-07-10 09:20:38 -07:00
Ryan Huffman
78ff6477bd Update OctreePacketProcessor to use QSharedPointer<NLPacket> 2015-07-10 08:45:21 -07:00
Brad Hefta-Gaub
33016e2797 Merge pull request #5293 from jherico/bart 
More profiling ranges and updated performance testing scripts
 2015-07-09 19:10:45 -07:00
Brad Hefta-Gaub
af20969eb9 Merge pull request #5298 from jherico/lisa 
Restore audio scope
 2015-07-09 19:03:29 -07:00
Anthony J. Thibault
653b0d7789 started working on rendering controllers 2015-07-09 19:03:11 -07:00
Brad Hefta-Gaub
74ef91550c Merge pull request #5296 from venkatn93/master 
Entities are now added/removed from rendering based on Scene.shouldRenderEntities
 2015-07-09 18:54:06 -07:00
Brad Davis
a92a7980d7 Restore audio scope 2015-07-09 17:49:25 -07:00
Andrew Meadows
270ea7af9e Merge pull request #5292 from sethalves/palm-rotation 
action changes to allow "hold" action to track palm rotation
 2015-07-09 17:44:28 -07:00
Niraj Venkat
007d662db1 Re-added for shouldRenderEntities 2015-07-09 17:40:14 -07:00
Niraj Venkat
706f85e4ce Fixes to comply with coding standard 2015-07-09 17:31:38 -07:00
Seth Alves
d0d0b2a143 Merge pull request #5295 from birarda/master 
potential fix for windows domain connect cycling
 2015-07-09 17:04:06 -07:00
Atlante45
bfeb095fb4 Merge branch 'master' of https://github.com/highfidelity/hifi into clear_cache_and_restart 2015-07-09 16:30:56 -07:00
Anthony J. Thibault
b6c0ae4bea Fix for flying in HMDMode with avatar collisons disabled 2015-07-09 16:29:43 -07:00
Niraj Venkat
adf5b95835 Changing formatting 2015-07-09 16:25:29 -07:00
Niraj Venkat
52095fd38d Fixing merge 2015-07-09 16:23:40 -07:00
Niraj Venkat
1dce5f80cc Entities are now added/removed from rendering based on Scene.shouldRenderEntities 2015-07-09 16:17:58 -07:00
Brad Davis
214405a0e5 Fixing typo 2015-07-09 16:06:27 -07:00
Ryan Huffman
2380fb23c3 Update OctreePacketProcessor to use NLPacket& 2015-07-09 16:05:52 -07:00
Stephen Birarda
efb89c281f fix creation of QTimer parented by NodeList 2015-07-09 16:02:29 -07:00
Stephen Birarda
a4f1145f06 fix QTimer connection to nodeList 2015-07-09 16:01:41 -07:00
Stephen Birarda
408ecb9735 move domain server check in timer to node thread 2015-07-09 15:59:32 -07:00
Brad Davis
446f800aee More profiling ranges and updated performance testing scripts 2015-07-09 15:43:30 -07:00
Ryan Huffman
6f9907a22d Stub in process() for OctreePacketProcessor 2015-07-09 15:31:45 -07:00
Ryan Huffman
8da50d342c Remove DatagramProcessor.h from Application 2015-07-09 15:31:01 -07:00
Ryan Huffman
5e65f422fa Move mute environment handling to Application 2015-07-09 15:30:25 -07:00
Bing Shearer
99c563602f Fixed Else case where _renderImage is true but the texture has 0 size, else case did not previously exist. 2015-07-09 15:25:37 -07:00
Seth Alves
2dc4922da3 bring over code from entity-level-locking branch 2015-07-09 15:23:05 -07:00
Seth Alves
5312beeaf4 if an action changes its own arguments, cause reserialisation 2015-07-09 14:50:31 -07:00
Seth Alves
a01fb6f1dc if an action changes its own arguments, cause reserialisation 2015-07-09 14:32:34 -07:00
Bing Shearer
85f6fdb8cf Fixed bug which would cause program to crash if there was no image associated with an overlay in windows build (see checkbox in sunLightExample) 2015-07-09 14:20:10 -07:00
Bing Shearer
25708678f6 Fixed shutdown procedure for Datagrams so that there is no crash on exit 2015-07-09 14:18:53 -07:00
Ryan Huffman
dd9dea7a97 Merge remote-tracking branch 'birarda/protocol' into receive_packets 
Conflicts:
	interface/src/DatagramProcessor.cpp
	interface/src/octree/OctreePacketProcessor.cpp
	libraries/entities/src/EntityEditPacketSender.cpp
	libraries/networking/src/LimitedNodeList.h
	libraries/networking/src/NLPacket.h
 2015-07-09 14:08:35 -07:00
Stephen Birarda
1b4e333c49 Merge pull request #3 from birarda/atp 
initial networking API changes for new protocol
 2015-07-09 16:51:37 -04:00
Seth Alves
050c472d6a Merge branch 'master' of github.com:highfidelity/hifi into palm-rotation 2015-07-09 13:39:37 -07:00
Brad Hefta-Gaub
489a8b4b3d Merge pull request #5285 from jherico/homer 
Move log file writing to a separate thread
 2015-07-09 12:22:13 -07:00
Seth Alves
d197bf2a85 use palm rotation data in hold action 2015-07-09 12:18:32 -07:00
Stephen Birarda
a363f42bb2 pass const NLPacket& for all sendUnreliablePacket calls 2015-07-09 11:42:18 -07:00
Seth Alves
08d63b7fd8 first attempt at palm rotation 2015-07-09 11:03:02 -07:00
Anthony J. Thibault
2ac6b6cd32 misc. changes 2015-07-09 09:57:12 -07:00
Brad Davis
2fff560ff9 Fixing log file viewer 2015-07-09 09:54:35 -07:00
Ryan Huffman
3b7ad982a4 Update OctreePacketProcessor to use packet callbacks 2015-07-09 09:23:50 -07:00
Brad Hefta-Gaub
fb07956689 Merge pull request #5284 from hyperlogic/ajt/mirror-view-fix 
fix for mirror rendering on windows
 2015-07-09 08:38:55 -07:00
Stephen Birarda
19c5f0b67c resolve conflicts on merge with upstream/master 2015-07-08 22:54:36 -07:00
Brad Davis
63dfd570f1 Adding priority support to GenericThread 2015-07-08 22:54:31 -07:00