Anthony J. Thibault
5d83976e2a
Added AnimBlendLinear + tests.
...
MyAvatar now does a sine wave blend between a walk
and a walk animation.
2015-08-04 18:14:50 -07:00
Anthony J. Thibault
559367db4a
Got to the bottom of the bind pose question.
...
When TRUST_BIND_TRANSFORM is defined in AnimSkeleton, the bind pose is taken
from the FBXJoint::bindTransform field, which is correct for all joints
bound to actual geometry. Basically it's not trust worthy for bones NOT bound to anything.
When TRUST_BIND_TRANSFORM is not defined, the bind pose is taken from the other
FBXJoint fields. Unfortunatly these poses are NOT the bind pose, but instead
are taken from the FBX files 'resting' pose. i.e. frame 0.
2015-08-04 18:14:49 -07:00
Anthony J. Thibault
d8a20340a0
Found and fix source of memory corruption.
...
std::vector.reserve() and raw access do not mix.
raw access will only work if you push_back elements onto the vector
first. However this worked fine on MacOSX, probably due to differences
in STL implementations.
Some code clean up and some commented out debugging lines.
Debug rendering of animaions of fight club model is not working.
Not sure what frame these transformations are in.
2015-08-04 18:14:49 -07:00
Anthony J. Thibault
69cc270802
removed scale for fight club model
2015-08-04 18:14:48 -07:00
Anthony J. Thibault
55da34f713
Better debug rendering of animations.
...
* added mat4 cast and mat4 ctors to AnimPose.
2015-08-04 18:14:48 -07:00
Anthony J. Thibault
df79463750
WIP, animNode rendering
2015-08-04 18:14:48 -07:00
Anthony J. Thibault
d1fdbe32d2
optimizations for debug rendering of AnimSkeleton
2015-08-04 18:14:47 -07:00
Anthony J. Thibault
b8bae7cc3f
Debug rendering of MyAvatar’s skeletonModel skeleton
2015-08-04 18:14:47 -07:00
Anthony J. Thibault
91ca13c66d
Added AnimDebugDraw to render-utils
2015-08-04 18:14:46 -07:00
Andrew Meadows
b00d47d62e
merge master into cleanup of legacy shapes
2015-08-03 11:19:29 -07:00
Andrew Meadows
acfc907704
Merge pull request #5438 from howard-stearns/rig
...
Rig: Bottleneck animation management through a Rig class
2015-08-03 11:14:21 -07:00
ZappoMan
b02f751830
diff redux
2015-08-01 16:53:35 -07:00
ZappoMan
b138c16c7f
use Austins QUAD to TRIANGLE_STRIP approach
2015-08-01 16:50:36 -07:00
ZappoMan
05a4a6aa9b
implement on-the-fly conversion of FBXMeshParts that are quads, into their triangle equivalents
2015-08-01 13:07:56 -07:00
ZappoMan
452225ddaf
removed QUADS from Font::drawString()
2015-08-01 11:51:07 -07:00
ZappoMan
1dd6c1117d
change GeometryCache::renderQuad() to use TRIANGLES as lower level render primitive
2015-08-01 11:29:28 -07:00
Howard Stearns
0dad1adf7d
Speculative guard against crashing.
2015-07-31 18:05:14 -07:00
Andrew Meadows
661a916ebd
merge rig into cleanup (removal of legacy shapes)
...
Conflicts:
interface/src/avatar/Avatar.h
tests/physics/src/ShapeColliderTests.cpp
tests/physics/src/ShapeColliderTests.h
2015-07-31 13:40:51 -07:00
Howard Stearns
b685378ab0
Merge branch 'master' of https://github.com/highfidelity/hifi into rig
2015-07-31 10:08:30 -07:00
samcake
fbf21cb089
FIxed the problem on Mac, by removing all of the gpuConfig includesgit status
...
q
:q
wq
2015-07-30 18:27:47 -07:00
Anthony J. Thibault
e52bf2e12d
Fix for head cauterization.
...
When rendering rigidly bound mesh clusters were not properly using
the cauterization matrix set.
2015-07-30 15:51:34 -07:00
Sam Gateau
14f4c9c6c0
REmove more of the unnecessary GLBacken .h and GPUCOnfig.h include, The gpu::Context is now completely agnostic of the True Backend
2015-07-30 15:07:36 -07:00
Anthony J. Thibault
7a10b31dd9
Clear translation on root joint.
...
Also, delete/rename all instances of updateJointState except for the one in Rig
and derived classes.
2015-07-30 15:04:27 -07:00
Sam Gateau
d84e2d31ea
Merge with master
2015-07-30 11:20:00 -07:00
Howard Stearns
06aa107762
Merge branch 'master' of https://github.com/highfidelity/hifi into rig
2015-07-30 09:57:02 -07:00
Brad Hefta-Gaub
96fdb32edc
Merge pull request #5461 from venkatn93/avatar
...
HBAO implementation
2015-07-30 08:46:55 -07:00
Brad Hefta-Gaub
b95e4e1e93
Merge pull request #5323 from MarcelEdward/20605
...
Removed the line where the directory is stripped off the RelativeFile
2015-07-30 07:30:01 -07:00
Niraj Venkat
291e0e21ae
HBAO final implementation
2015-07-29 18:47:27 -07:00
Sam Gateau
ab4b940d83
merge with upstream
2015-07-29 17:11:13 -07:00
Niraj Venkat
4f2630c561
Merge branch 'master' of https://github.com/highfidelity/hifi into avatar
2015-07-29 16:54:37 -07:00
Howard Stearns
d73f133daa
Merge branch 'master' of https://github.com/highfidelity/hifi into rig
2015-07-29 15:45:00 -07:00
Sam Gateau
8c96096a67
Merge branch 'master' of https://github.com/highfidelity/hifi into yellow
2015-07-29 14:04:20 -07:00
ericrius1
65e04337bf
removed synccache line
2015-07-29 11:15:20 -07:00
Niraj Venkat
d76cda396f
HBAO implementation ported from NVidia HLSL
2015-07-29 11:05:19 -07:00
Howard Stearns
a9f76324b5
Merge branch 'rig' of https://github.com/sethalves/hifi into sethalves-rig2
2015-07-29 10:49:27 -07:00
ericrius1
697cb4c9d0
fixed merge conflicts and refactored hit effect to catch up with refactored rendering engine
2015-07-29 10:02:06 -07:00
Andrew Meadows
2c66af67e9
Merge howard/rig into andrew/caesium
2015-07-29 09:04:32 -07:00
Andrew Meadows
0a5ada3c09
remove legacy shapes
2015-07-29 09:02:24 -07:00
Andrew Meadows
77a12eb50e
compile on linux with GLEW
2015-07-28 17:53:01 -07:00
Anthony J. Thibault
b06485c266
Remove cauterize code from Rig and move it back into Model.
...
* cauterize code is used as at render time and is not dependent on
the jointStates.
* MyAvatar now initialize the bone set used for cauterization and
makes the decision to perform cauterization or not in preRender.
2015-07-28 17:45:33 -07:00
ericrius1
469bace7ca
removed unnessary computations from hit effect fragment shader
2015-07-28 15:15:34 -07:00
Howard Stearns
4754615159
Fix NPC animations.
2015-07-28 12:34:10 -07:00
Howard Stearns
e7516aab02
Merge branch 'master' of https://github.com/highfidelity/hifi into rig
2015-07-28 11:17:35 -07:00
Sam Gateau
22e70ee691
merged master
2015-07-28 10:13:05 -07:00
Sam Gateau
baf7873ce1
Merge branch 'master' of https://github.com/highfidelity/hifi into punk
2015-07-27 17:40:19 -07:00
Seth Alves
6e5aca6da4
merge from upstream
2015-07-27 16:52:36 -07:00
Seth Alves
5ae15d46b4
add some javascript callable stuff back to MyAvatar
2015-07-27 16:42:54 -07:00
Howard Stearns
1bb734aec0
Kill warnings.
2015-07-27 15:26:03 -07:00
Sam Gateau
a5ad40bee9
INtroduce the resetStage command to clear up all cache and state in the gpu::Conference and make sure no more resource are linked
2015-07-27 14:07:28 -07:00
Howard Stearns
ef52c0703f
Merge pull request #8 from AndrewMeadows/cadmium
...
remove unused legacy Shapes from Model and friends
2015-07-27 13:20:41 -07:00
