Anthony J. Thibault
2b0ed55077
Merge branch 'master' into tony/anim-expressions
2015-12-15 10:35:19 -08:00
Atlante45
1d513cfbba
Merge branch 'master' of https://github.com/highfidelity/hifi into particle
2015-12-09 15:09:19 -08:00
Atlante45
bd23a4137e
Move toGlm to GLMHelpers
2015-12-03 15:01:17 -08:00
Anthony J. Thibault
710ce7e639
Merge branch 'master' into tony/anim-expressions
2015-12-03 09:56:28 -08:00
Anthony J. Thibault
14189ac909
Move Y_180 flip rotation out of Rig
...
This Y_180 flip is defined in skeletonModel not in the rig.
This is important if we wish to use the Rig for both Avatars (180 flip) and Entity models (no 180 flip).
We can hide this 180 flip from script, if we wish, by including it in all the accessors to and from
MyAvatar -> skeletalModel -> Rig.
Added Quaternions::Y_180 to GLMHelpers.
2015-11-23 19:31:27 -08:00
Anthony J. Thibault
54408a9c87
AnimVars are now in avatar/rig space
...
This makes it much simpler for code out side of the rig to manipulate AnimVars
* Removed mat4 type from AnimVars
* AnimVariantMap now has a _rigToGeometryTransform matrix
used to transform positions and rotations into the correct coordinate frame.
* Moved AnimPose code to extract a quat from a scaled matrix into GLMHelpers
2015-11-20 18:29:17 -08:00
Atlante45
118d05d824
Use a clearer function
2015-11-11 17:24:50 -08:00
Anthony J. Thibault
04d8a598da
First step toward evaluation
...
* added OpCodes
* added first parser rules
* removed mat4 support from AnimVariantMap
2015-11-04 16:56:34 -08:00
Anthony J. Thibault
5cd2786c1d
First pass at Rig timeScaling and blending between slow, walk and run.
2015-10-20 16:37:05 -07:00
Seth Alves
ddeed8b4ee
code review
2015-09-29 06:51:24 -07:00
Seth Alves
50dd8eba45
Relay joint translations across network. Apply animation's root-joint translation to avatar.
2015-09-26 11:40:39 -07:00
David Rowe
d063f3488d
Back out fromSpherical code addition
2015-09-24 19:14:26 -07:00
David Rowe
12e2cf3ce9
Emit in all directions from a point or the surface of a spheroid
2015-09-17 17:14:35 -07:00
Anthony J. Thibault
3716d5612b
Merge branch 'master' into ajt/new-anim-system
2015-09-03 19:20:06 -07:00
Brad Davis
8dc3905767
Add common vector constants to JS, add some missing quaternion functionality
2015-09-03 11:51:35 -07:00
Brad Davis
08e4fe2dc2
Revert "Add common vector constants to JS"
2015-08-28 16:26:56 -07:00
Brad Davis
2aa1976b5d
Add common vector constants to JS, add some missing quaternionin functionality
2015-08-28 13:05:39 -07:00
Anthony J. Thibault
b7a9b54628
Better AnimDebugDraw rendering
2015-08-26 16:42:08 -07:00
Anthony J. Thibault
46c1e008bc
Merge branch 'master' into ajt/new-anim-system
2015-08-26 10:37:39 -07:00
Brad Davis
d311e4f2ea
Fixing problems reported by static analysis tool
2015-08-25 19:18:55 -07:00
Anthony J. Thibault
fa5256eefd
Merge branch 'master' into ajt/new-anim-system
2015-08-24 14:32:28 -07:00
Brad Davis
ccc4a59992
Cleanup and PR comments
2015-08-08 13:54:37 -07:00
Anthony J. Thibault
b8bae7cc3f
Debug rendering of MyAvatar’s skeletonModel skeleton
2015-08-04 18:14:47 -07:00
Anthony J. Thibault
f5dee717a1
Added fbx loading via animation cache.
...
* added AnimPose::copyFromNetworkAnim() which
should, re-map bone ids to match the current
skeleton, and fill in missing bones with bind
pose frames.
* added ability to set a skeleton on a node.
I might need to add a recursive version of this.
* it compiles!
* tests run!
2015-08-04 18:14:46 -07:00
SamGondelman
a4cbb7f412
const references in glmhelpers
2015-07-20 17:30:23 -07:00
Anthony J. Thibault
5293effc2e
more work in progress vive room tracking
...
Found and disabled torso twist
use an old copy of the hmd pose before physics, and the most up to date
one after physics.
2015-07-07 00:12:48 -07:00
Anthony J. Thibault
834b75f4c4
work in progress room scale tracking work.
...
sensor to world matrix stored in MyAvatar
override setPosition and setOrientation to move sensor to world matrix.
2015-07-06 18:25:42 -07:00
Stephen Birarda
c6df573933
fix some OS X warnings, add description to tooltip
2015-06-26 10:50:31 -07:00
Brad Davis
48b27acc79
Merge remote-tracking branch 'upstream/master' into overlay
...
Conflicts:
interface/src/Application.cpp
interface/src/ui/ApplicationOverlay.cpp
2015-06-18 18:17:59 -07:00
Seth Alves
508ae276c6
enable -Wdouble-promotion
2015-06-16 18:23:10 -07:00
Brad Davis
ba13b7820c
Working on overlay refactor
2015-06-16 09:58:03 -07:00
Bradley Austin Davis
c31d36be59
Fixing scale resolution issues
2015-05-07 12:01:56 -07:00
Brad Davis
302aa9db47
Removing access to the gl widget and display managers
2015-05-02 00:49:52 -07:00
Atlante45
0b1d4fb1d6
Merge branch 'master' of https://github.com/highfidelity/hifi into zones
2015-04-23 21:16:11 +02:00
Atlante45
955723acf1
RenderableEntityItem uses collision hull in contains
2015-04-22 21:03:55 +02:00
Brad Davis
d14d5f3d29
Working on new-UI implementations of address bar and login
2015-04-15 00:36:04 -07:00
Stephen Birarda
219e78425b
resolve conflicts on merge with upstream master
2015-02-06 09:49:46 -08:00
Brad Davis
da05c26aad
Moving shaders to standard format, adding bounding box support and using it in text node
2015-02-04 21:32:05 -08:00
Brad Davis
1745ba9a7e
More OSX work, refactoring functions to shared, removing erroneuous Qt 5.4 dependency, fixing PrioVR text api usage
2015-02-04 12:42:27 -08:00
Atlante45
4eac6cd410
Moved IDENTITY_FRONT/UP/RIGHT to GLMHelpers
2015-01-23 13:19:03 -08:00
Stephen Birarda
0033dfe5af
use quat orientation to store locations and user locations
2014-09-16 09:57:21 -07:00
Stephen Birarda
0378fb3049
break glm helpers out of SharedUtil
2014-08-08 13:17:53 -07:00
