Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-06-03 20:32:00 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
32578 commits 73 branches 59 tags 1.2 GiB
Commit graph

14173 commits

Author SHA1 Message Date
Howard Stearns
53e7d5fd7c Merge pull request #5975 from AndrewMeadows/cleanup-legacy-constraints 
remove cruft relating to old verlet avatar skeleton simulation
 2015-10-01 16:48:33 -07:00
Brad Hefta-Gaub
521aaa0998 Merge pull request #5974 from Atlante45/extra_debug 
Remove extra debug
 2015-10-01 14:42:45 -07:00
Howard Stearns
739545794f Merge pull request #5944 from AndrewMeadows/ik-repairs-007 
fix bug: IK attenuates fast underpose animations
 2015-10-01 14:27:21 -07:00
Andrew Meadows
09ac01a5e7 remove cruft from old verlet avatar simulation 2015-10-01 13:44:50 -07:00
Atlante45
b37bf2b1b6 Remove extra debug 2015-10-01 13:18:22 -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
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
Andrew Meadows
b192d0a9cd make neck IK target type same as head 2015-09-29 17:39:17 -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
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
Brad Davis
7b1c04512a Adding support for accessing IPD in scripts 2015-09-28 16:24:38 -07:00
Seth Alves
89ab1f626f Merge pull request #5921 from huffman/import-export-fix 
Import/Export entities fix
 2015-09-28 16:21:18 -07:00
Howard Stearns
2e05ede524 Merge pull request #5920 from hyperlogic/tony/oculus-judder-fix 
Fix for Oculus timewarp judder introduced by 20d784ba39
 2015-09-28 15:57:47 -07:00
Anthony J. Thibault
c51ce79205 Updated comment on MyAvatar::updateFromHMDSensorMatrix() 2015-09-28 15:30:21 -07:00
Ryan Huffman
1a9cd59339 Fix ClipboardScriptingInterface to call methods on main app thread 2015-09-28 15:05:48 -07:00
Ryan Huffman
dde1c8b42f Fix use of EntityTree in import/export operations 
The EntityTree needs to be references by a shared_ptr somewhere.
The EntityTree does not start with a root element by default, which some
operations rely on to work as expected.
 2015-09-28 15:05:48 -07:00
Anthony J. Thibault
e32eb38c3b Fix for Oculus timewarp judder introduced by 20d784ba39 
Moved myAvatar->updateFromHMDSensorMatrix from Application::update
back into Application::paintGL, so it occurs between
displayPlugin->preRender() and displayPlugin->display().

We should render with the most up-to-date camera position as possible,
and sample it at the same frequency as the display rate.
 2015-09-28 14:38:03 -07:00
Howard Stearns
e6b9cbacf7 Merge pull request #5910 from hyperlogic/tony/small-anim-debug-improvements 
Fix for Head when switching between HMD and Desktop mode
 2015-09-28 14:13:03 -07:00
Brad Hefta-Gaub
430cbcca7e first cut at adding surface normals to ray intersection 2015-09-27 21:57:50 -07:00
Anthony J. Thibault
5a24a020ca Fix for HMD rotation sticking between 2d & HMD mode 
The main fix for this was to set the JointState animation priority to 3.0
The secondary fix was only noticed when we changed the animation priority
Basically, the debugRendering was using the JointStates after they were
manipulated by SkeletonModel to 'relax' them toward thier default pose for
IK purposes.
 2015-09-27 17:44:54 -07:00
Thijs Wenker
14fc39ffa3 Added JS access to the variables 
Stats.audioPacketlossUpstream
Stats.audioPacketlossDownstream
Which contain a floating point with the value between 0.0f and 1.0f which is the percentage of packet loss.
 2015-09-26 02:36:01 +02:00
Howard Stearns
a820682816 Merge pull request #5901 from hyperlogic/tony/gangsta-lean 
Threshold based walking/leaning while in HMD.
 2015-09-25 15:51:39 -07:00
Anthony J. Thibault
402573dbf1 Remove unused local 2015-09-25 14:11:33 -07:00
Thijs Wenker
9ed1397a63 Merge branch 'master' of https://github.com/worklist/hifi into 20672 2015-09-25 21:09:38 +02:00
Anthony J. Thibault
fc9b270951 Merge branch 'master' into tony/gangsta-lean 2015-09-25 11:36:58 -07:00
Andrew Meadows
4f0bd08b62 Merge pull request #5900 from ZappoMan/batchOptimizations 
more work on batch optimzation
 2015-09-25 09:00:38 -07:00
Anthony J. Thibault
474c847ef1 Updated constants and units. 2015-09-24 18:00:59 -07:00
Anthony J. Thibault
20d784ba39 Threshold based walking while in HMD. 
This is a blend of the previous 'sitting' and 'standing' HMD modes.
Basically, when you move your head within a small range (20cm) your
avatar will lean appropriately, however when you cross that threshold
your body will move underneath you, re-centering your head above the body.

While this occurs the avatar should play the appropriate walking animations.
 2015-09-24 17:54:32 -07:00
Brad Hefta-Gaub
85b2322acc more work on batch optimzation 2015-09-24 17:11:14 -07:00
Howard Stearns
266c69fc70 Disable the old-school Rig::inverseKinematics during reset. 2015-09-24 15:33:52 -07:00
Howard Stearns
426ccabba7 Merge branch 'master' of https://github.com/highfidelity/hifi into apostrophe 2015-09-24 14:19:58 -07:00
Andrew Meadows
59da684eb9 make IKTarget::setType() a one-liner 2015-09-24 13:15:03 -07:00
Thijs Wenker
6d4e4af0a5 ability to see Stats in JavaScript + example script which outputs the stats to the console/logviewer 2015-09-24 22:02:22 +02:00
Andrew Meadows
17e3e9394f allow head translation for 3rd person screenie IK 2015-09-24 12:38:46 -07:00
Brad Hefta-Gaub
2eaeb26b2a fix GetVersionEx warning 2015-09-24 09:14:51 -07:00
Brad Hefta-Gaub
5e82b9c433 more warning fixes 2015-09-24 08:26:56 -07:00
Brad Hefta-Gaub
d14820d3ef Merge pull request #5880 from thoys/20668 
Worklist job #20668 - JS: Add option to listen audio from camera
 2015-09-23 20:40:32 -07:00
samcake
46e9c463fc Merge pull request #5885 from ZappoMan/batchOptimizations 
Batch optimizations
 2015-09-23 19:30:51 -07:00
Brad Hefta-Gaub
9a0e5b9870 address Sam's concerns 2015-09-23 17:37:48 -07:00
ZappoMan
65a079cb53 fix mac build 2015-09-23 16:48:34 -07:00
Anthony J. Thibault
6b47373bcb Fix for precision error in AnimPose(glm::mat4) constructor. 
Really the culprit is GLMHelpers extractRotation().
I have a separate unit test that demonstrates the bug.
 2015-09-23 15:38:56 -07:00
Brad Hefta-Gaub
ef25876c9a implement vector caching for gpu::Batch 2015-09-23 14:46:47 -07:00
Anthony J. Thibault
0d7eae2d64 Fix slight translation error when rendering debug animation skeleton. 2015-09-23 11:42:55 -07:00
Anthony J. Thibault
90a551214e Fix for AnimDebugDraw crash on shutdown. 2015-09-23 11:09:43 -07:00