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
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
Anthony J. Thibault
fb62fda2d2
started working on input plugin architecture
2015-07-15 10:26:48 -07:00
Anthony J. Thibault
9363ca2f97
Fix for camera matrix position when in Vive HMD.
2015-07-14 18:36:42 -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
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
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
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
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
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
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
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
Sam Gateau
98f10e72ec
fix the wrong function name that happened missing a merge
2015-07-10 15:20:49 -07:00
Andrew Meadows
9cb7e86877
cleanup of AvatarActionHold deserialization
2015-07-10 12:34:12 -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
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
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
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
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
