Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-24 12:05:42 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
33190 commits 25 branches 0 tags 1.1 GiB
Commit graph

13496 commits

Author SHA1 Message Date
Thijs Wenker
4ab5e0af84 Merge branch 'master' of https://github.com/worklist/hifi into js-hmd-position-orientation 
Conflicts:
	interface/src/scripting/HMDScriptingInterface.h
 2015-10-07 14:48:06 +02:00
Brad Hefta-Gaub
05fd62ac51 Merge pull request #6009 from jherico/homer 
Enabling programmatic access to the IPD scale
 2015-10-07 01:43:10 -07:00
Brad Davis
eff5a4c395 Picking fixes in the HMD 2015-10-06 22:56:48 -07:00
Howard Stearns
1fc305ca6b Update HMD-derived avatar stuff during reset, update position under head, and remove unused vars. 2015-10-06 20:51:53 -07:00
Anthony J. Thibault
2dabe69341 When HMD is at rest, re-center the body under the avatar. 
This should help the case when a user avatar is stuck in an
uncomfortable pose for a long period of time.  If they stop
moving their head, the body should recenter itself and
appear more natural.

Added an AtRestDetector class.  That tracks the average and variance
of both position and rotation (quaternion logarithms), then
detects when the variance falls under a threshold.

Also, renamed variables with the straighting prefix to straightening.
 2015-10-06 20:37:51 -07:00
Brad Davis
028935f831 Removing deprecated function usage 2015-10-06 20:36:55 -07:00
Brad Hefta-Gaub
6e5847bb1c make Hand Input Mouse off by default 2015-10-06 19:58:25 -07:00
Brad Davis
bac69c73a8 Fixing bug in application compositor transform 2015-10-06 19:08:44 -07:00
Brad Davis
19fb4e92a6 Enabling programmatic access to the IPD scale 
Conflicts:
	interface/src/Application.cpp
	interface/src/avatar/MyAvatar.cpp
	interface/src/scripting/HMDScriptingInterface.cpp
	interface/src/scripting/HMDScriptingInterface.h
 2015-10-06 19:08:17 -07:00
Thijs Wenker
6e52fcb857 Merge branch 'master' of https://github.com/worklist/hifi into js-hmd-position-orientation 
Conflicts:
	interface/src/scripting/HMDScriptingInterface.h
 2015-10-07 03:11:24 +02:00
Brad Hefta-Gaub
02bb372c27 Merge pull request #6008 from AndrewMeadows/ik-targets-use-model-frame 
IK targets specified in the skeleton's model-frame
 2015-10-06 17:34:42 -07:00
Andrew Meadows
224fc55033 put IK targets in skeleton's model-frame 2015-10-06 16:49:29 -07:00
Atlante45
76e0006732 Remove forgotten cursorVisible 2015-10-06 15:58:35 -07:00
Howard Stearns
db955d894f Align avatar body to head on reset. 2015-10-06 14:52:53 -07:00
Atlante45
8a7871e15b rebase fix 2015-10-06 14:13:28 -07:00
Atlante45
ed13c02075 Fix rebase 2015-10-06 13:57:51 -07:00
Atlante45
c745050dea Fix QObject::connect warning 2015-10-06 13:57:51 -07:00
Atlante45
7b25c9d417 More header cleanup 2015-10-06 13:57:50 -07:00
Atlante45
775994f9d0 Fix for 3DConnection 2015-10-06 13:57:49 -07:00
Atlante45
b63df98b8b More unused 2015-10-06 13:57:49 -07:00
Atlante45
17edd38cb9 Remove unused variables 2015-10-06 13:57:48 -07:00
Atlante45
39e0d0e1dc Put timers on the stack 2015-10-06 13:56:26 -07:00
Atlante45
e9b7125894 Misc cleanup 2015-10-06 13:56:26 -07:00
Atlante45
5e9425d9eb Fix view frustum preference 2015-10-06 13:56:25 -07:00
Atlante45
60ebd3a544 Remove unused members (Mostly mouse stuff) 2015-10-06 13:56:25 -07:00
Atlante45
35e2f8cd89 Removed _myAvatar from Application 2015-10-06 13:56:25 -07:00
Atlante45
2fc80e58b6 Fix warning 2015-10-06 13:56:24 -07:00
Atlante45
9827c90851 Rebase fixes 2015-10-06 13:56:24 -07:00
Atlante45
ba5c20b7a6 Header cleanup 2015-10-06 13:56:24 -07:00
Atlante45
9c7a480fda Remove shadowMatrices/Distances 2015-10-06 13:56:23 -07:00
Atlante45
8c653c70fb Remove fps throttle from Application 2015-10-06 13:56:23 -07:00
Atlante45
4ccc2bbcd0 Enclose entire functions in ifdef 2015-10-06 13:56:23 -07:00
Atlante45
dde11c5cd1 More unused 2015-10-06 13:56:23 -07:00
Atlante45
34bba28775 More header cleanup 2015-10-06 13:56:22 -07:00
Atlante45
f55f146d1b More code cleanup 2015-10-06 13:56:22 -07:00
Atlante45
38f23ef79e Remove Application friend 2015-10-06 13:56:22 -07:00
Atlante45
311edabe51 More header cleanup 2015-10-06 13:56:21 -07:00
Atlante45
765608d0ff More unused 2015-10-06 13:56:21 -07:00
Atlante45
7da55747f5 Simplify friends window 2015-10-06 13:56:21 -07:00
Atlante45
77a7814854 Move sendPingPackets 2015-10-06 13:56:20 -07:00
Atlante45
e74df484cc Remove unused methods 2015-10-06 13:56:20 -07:00
Atlante45
a5f31dba5f Fix startup timer 2015-10-06 13:56:20 -07:00
Atlante45
0aab013a0e Remove unused members 2015-10-06 13:56:20 -07:00
Atlante45
92e974929c Move tray icon to MainWindow 2015-10-06 13:56:19 -07:00
Atlante45
0f18db886c Remove 4 Application static methods 
- Replace by lambda
- Cleaned up global scope
 2015-10-06 13:56:19 -07:00
Atlante45
cf3b33a96b Replace Application::getInstance() with qApp 2015-10-06 13:56:19 -07:00
Thijs Wenker
4e8fc08458 made the changes as suggested by @hyperlogic 2015-10-06 20:48:51 +02:00
Thijs Wenker
3c6e9378c3 fixes merge issues 2015-10-06 20:20:37 +02:00
Thijs Wenker
953ff6caa7 Merge branch 'master' of https://github.com/worklist/hifi into js-hmd-position-orientation 
Conflicts:
	interface/src/Application.cpp
	interface/src/scripting/HMDScriptingInterface.h
	libraries/display-plugins/src/display-plugins/oculus/OculusHelpers.h
 2015-10-06 20:06:29 +02:00
Thijs Wenker
f6afb4cb02 Merge branch 'master' of https://github.com/worklist/hifi into js-hmd-position-orientation 
Conflicts:
	interface/src/scripting/HMDScriptingInterface.h
 2015-10-06 19:56:22 +02:00
Andrew Meadows
2c276bb13e Merge pull request #5986 from sethalves/kinematic-grab 
Kinematic grab
 2015-10-06 10:30:06 -07:00
Brad Davis
8090bc8e8d Revert "Enabling programmatic access to the IPD scale" 2015-10-06 10:16:42 -07:00
Seth Alves
8caa7abca6 assert that deltaTimeStep is always greater than zero 2015-10-06 09:35:54 -07:00
Seth Alves
5abaf38efd include setVelocity in returned arguments 2015-10-06 09:24:18 -07:00
Seth Alves
18b5b994b4 include setVelocity in returned arguments 2015-10-06 09:23:38 -07:00
Seth Alves
febdb52b26 Merge branch 'master' of github.com:highfidelity/hifi into kinematic-grab 2015-10-06 09:20:13 -07:00
Seth Alves
c3142ab90b include setVelocity in returned arguments 2015-10-06 09:20:07 -07:00
Seth Alves
91f5a6fec6 make setting of rigid-body velocity controlled by an action argument 2015-10-06 08:08:33 -07:00
Brad Hefta-Gaub
d95fe3ddb7 Merge pull request #5989 from jherico/homer 
Enabling programmatic access to the IPD scale
 2015-10-05 17:22:19 -07:00
Clément Brisset
5eda3095bb Merge pull request #5998 from birarda/qt-5.5 
suppress warnings for overriden methods in Xcode 7
 2015-10-05 17:00:43 -07:00
Thijs Wenker
dd59527763 Merge branch 'master' of https://github.com/worklist/hifi into js-hmd-position-orientation 2015-10-06 01:35:29 +02:00
Stephen Birarda
25a1f2dd11 add override to suppress warning for PluginContainerProxy 2015-10-05 15:53:37 -07:00
Stephen Birarda
a2c9d7a4b2 add overrides for Avatar classes in Interface 2015-10-05 15:52:47 -07:00
Anthony Thibault
2a406481d4 Merge pull request #5992 from howard-stearns/reset-on-calibration 
Reset (as though by apostrophe key) whenever we calibrate the hydra.
 2015-10-05 15:19:16 -07:00
Seth Alves
99be44f92d smooth out vibrating appearance for kinematic hold 2015-10-05 14:58:42 -07:00
Seth Alves
8f924f0be4 merge from upstream 2015-10-05 13:05:37 -07:00
Howard Stearns
844270e306 Reset (as though by apostrophe key) whenever we calibrate the hydra. 2015-10-05 12:44:22 -07:00
Andrew Meadows
1ead20683c Merge pull request #5976 from sethalves/fix-action-deletes 
Fix action deletion/addition when more than one interface are involved
 2015-10-05 12:31:01 -07:00
Seth Alves
993111d22f code review 2015-10-05 11:28:59 -07:00
Seth Alves
8c25f2e16c Merge branch 'master' of github.com:highfidelity/hifi into kinematic-grab 2015-10-05 09:09:01 -07:00
Brad Davis
725ed26ac2 Enabling programmatic access to the IPD scale 2015-10-04 16:55:49 -07:00
Thijs Wenker
8befade007 expose position and orientation of HMD to Javascript. 
- HMD.orientation
- HMD.position
 2015-10-04 15:08:35 +02:00
Seth Alves
6a770a870b set correct type in kinematic hold 2015-10-02 17:31:45 -07:00
Seth Alves
89c848d8c8 fix up kinematic hold 2015-10-02 17:14:53 -07:00
Howard Stearns
fdba55e56e Merge pull request #5973 from ctrlaltdavid/20698 
Fix Reload Content menu item not reloading FST files
 2015-10-02 16:43:11 -07:00
Seth Alves
cf8955a8c5 kinematic grab 2015-10-02 15:27:01 -07:00
Howard Stearns
f6665a4ac6 Merge pull request #5839 from sethalves/transmit-joint-translation 
WARNING protocol change: Transmit joint translation
 2015-10-02 13:37:56 -07:00
Anthony J. Thibault
c0be32d359 Fix for model offset when using Rig Animations. 2015-10-02 11:40:46 -07:00
Anthony J. Thibault
fc7b6dee84 Merge branch 'master' into transmit-joint-translation 2015-10-02 11:40:33 -07:00
Brad Hefta-Gaub
4c556dd43a Merge pull request #5962 from samcake/calvin 
Rendering the background elements after opaque and only work on the far pixels
 2015-10-02 11:38:45 -07:00
Brad Hefta-Gaub
c6c430ca76 Merge pull request #5977 from jherico/marge 
Fixing 2D overlay mouse interaction
 2015-10-02 11:11:04 -07:00
Anthony J. Thibault
a1b54945d6 Compute the model offset in the rig, using the bind pose of the hips. 2015-10-02 10:34:34 -07:00
Brad Davis
aa8979570c Working on 2D overlay mouse interaction 2015-10-02 00:35:37 -07:00
samcake
71ad6195f2 Merge branch 'master' of https://github.com/highfidelity/hifi into calvin 2015-10-01 19:25:25 -07:00
Anthony J. Thibault
fa864d29f9 Merge branch 'master' into transmit-joint-translation 2015-10-01 16:55:24 -07:00
Andrew Meadows
09ac01a5e7 remove cruft from old verlet avatar simulation 2015-10-01 13:44:50 -07:00
David Rowe
2fbb436bc5 Fix Reload Content menu item 2015-10-01 12:42:23 -07:00
Brad Hefta-Gaub
066e25bb4a Merge pull request #5965 from hyperlogic/tony/avatar-lean-bug-fixes 
Bug fix for deriveBodyFromHMDSensor calculations
 2015-09-30 16:54:59 -07:00
Anthony J. Thibault
d993d39718 Bug fix for deriveBodyFromHMDSensor calculations 
The calculation that determined where the body position relative to the HMD
was incorrect, one of the components was in the wrong coordinate frame.

Now use the skeleton's bind pose to compute the proper avatar offsets for the eyes, neck and hips.
Use these offsets to calculate where the hips should be given a specific hmd position and orientation.

Also, added a bug fix for Rig, which would cause a -1 index deference when an avatar was missing
certain named joints, such as, "LeftEye", "Neck" and "Head".
 2015-09-30 16:28:33 -07:00
samcake
6b86f21491 Merge branch 'master' of https://github.com/highfidelity/hifi into calvin 2015-09-30 15:54:39 -07:00
samcake
75e858cd13 Putting together the stencil buffer for opaque vs background and using it for the backgroud render items 2015-09-30 15:54:03 -07:00
Seth Alves
7c6846c260 add lifetime and tag arguments to actions 2015-09-30 13:09:41 -07:00
Brad Hefta-Gaub
76825c2be7 only show hand cursors when menu is enabled 2015-09-30 09:06:45 -07:00
Seth Alves
58d98d3ce4 Merge pull request #5932 from howard-stearns/default-animation-and-quieter 
Set default animation and quiet state logging
 2015-09-29 16:12:28 -07:00
Seth Alves
d554eb8db9 avatar collisions are off during a grab 2015-09-29 15:09:25 -07:00
Brad Hefta-Gaub
00c32fc7cd Merge pull request #5924 from jherico/marge 
Support for accessing IPD in scripts
 2015-09-29 14:24:53 -07:00
Seth Alves
d0a1e206ca Merge branch 'master' of github.com:highfidelity/hifi into transmit-joint-translation 2015-09-29 13:55:13 -07:00
Seth Alves
f7b34f63c1 try calling updateMotionBehaviorFromMenu 2015-09-29 13:40:54 -07:00
Howard Stearns
745a59af1c Default animation is anim graph. 
Remove state change logging from animation graph state machine.
 2015-09-29 12:48:57 -07:00
Eric Levin
e8e9957846 Merge pull request #5911 from ZappoMan/rayIntersectionWork 
adding surface normals to ray intersection
 2015-09-28 17:21:40 -07:00