Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-25 07:14:11 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
27848 commits 71 branches 56 tags 1.2 GiB
Commit graph

27848 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Anthony J. Thibault
1083534d83 sdl2 build error fixed 2015-07-16 10:22:10 -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
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
14a300b4cf Fix oculus rendering 2015-07-13 19:07:59 -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
de4a0447f9 Merge pull request #5315 from sethalves/fix-pointer.js 
update pointer.js to use relative-to-entity line-point ends
 2015-07-13 16:26:38 -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
Clément Brisset
fb0dab3bca Merge pull request #5317 from ZappoMan/fixLingeringModels 
fix the lingering model parts sometimes left behind when switching domains
 2015-07-13 15:53:24 -07:00
ZappoMan
5676246d75 fix the lingering model parts sometimes left behind when switching domains 2015-07-13 15:26:52 -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
561b712b5b rendered controllers in right place, missing texture 2015-07-13 14:06:26 -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
d44bb1a0d8 update javascript to use relative-to-entity line-point ends 2015-07-13 11:42:29 -07:00
Andrew Meadows
a24fd13665 Merge pull request #5312 from sethalves/fix-hold-action-deserialize 
fix hold-action deserialization.
 2015-07-13 11:33:16 -07:00
Seth Alves
7a6cf40b54 quiet compiler 2015-07-13 07:39:11 -07:00
Seth Alves
5aca0c28ef quiet compiler 2015-07-13 07:37:59 -07:00
Brad Hefta-Gaub
db8d8a34bf Merge pull request #5310 from sethalves/improve-voxel.js 
allow voxels.js to work on an empty voxel-space
 2015-07-13 07:17:12 -07:00
Seth Alves
f011d5c7f7 remove commented code 2015-07-12 20:42:17 -07:00
Seth Alves
848e5bcebf this code can be called for hold actions if they end up in an svo save. revert a line from a previous commit 2015-07-12 13:43:21 -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
87152a4de2 Merge pull request #5302 from AndrewMeadows/astatine 
cleanup of ObjectActionSpring and AvatarActionHold
 2015-07-12 11:17:09 -07:00
Seth Alves
c56b2918a4 allow voxels.js to work on an empty voxel-space 2015-07-12 10:35:44 -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
Philip Rosedale
2480402515 Merge pull request #5305 from howard-stearns/sword-update 
Functional sword script
 2015-07-10 17:05:24 -07:00
Brad Hefta-Gaub
2439e4faab Merge pull request #5304 from jherico/homer 
Removing heap allocation from property flag parsing, adding some manual tests
 2015-07-10 17:04:50 -07:00
Brad Davis
eb9d52fbb3 Helps to actually commit the fix 2015-07-10 16:11:56 -07:00
Brad Davis
c1b72db18d Still trying to get jenkins builds to work 2015-07-10 16:00:51 -07:00
Howard Stearns
c340d336dc Functional sword script: 
Mouse and hydra.
Switchable hands.
Scores above buttons (2d) and above head in-world.
Adds avatar hit sound while sword is brandished.
 2015-07-10 15:43:56 -07:00
Brad Davis
3db3676fae Fixing compile failure 2015-07-10 15:26:22 -07:00
Sam Gateau
98f10e72ec fix the wrong function name that happened missing a merge 2015-07-10 15:20:49 -07:00
Brad Davis
2ce8dba819 Removing heap allocation from property flag parsing, adding some manual tests 2015-07-10 15:08:10 -07:00
Brad Davis
200cbd7e8d Merge pull request #5303 from ZappoMan/animationGlitch 
fix motor proteins in cell science
 2015-07-10 12:59:50 -07:00