Andrew Meadows
4ef2067421
Use capsules for some joints and render them.
2014-03-03 17:49:24 -08:00
Andrew Meadows
1a8c10e132
Correcting a comment.
2014-03-03 17:35:52 -08:00
Andrew Meadows
1c0826d696
Add JointShapeInfo for joint shape calculations
2014-03-03 12:31:09 -08:00
Andrew Meadows
8ef657e5b2
Render avatar collision shapes in the right spot
2014-02-28 17:05:08 -08:00
Andrew Meadows
4d984b1054
cleanup
2014-02-28 16:55:16 -08:00
Andrew Meadows
702612506b
very basic bounding info for joint meshes
2014-02-28 16:42:12 -08:00
Andrew Meadows
b8c1bab4ae
Using pre-computed Model shapes for collisions
...
...instead of generating collision shapes on the fly
2014-02-27 17:52:35 -08:00
Andrew Meadows
50a5924574
Using shapes for collisions against Model
...
rather than building tapered capsule shapes on the fly
2014-02-27 17:33:36 -08:00
Andrew Meadows
9dc26ddfa7
First pass: add collision Shapes to Model
2014-02-27 15:50:16 -08:00
Andrzej Kapolka
f7fcbc234e
Fixes for Xcode warnings with no Visage, explanatory comments for Model's
...
base geometry pointer.
2014-02-19 11:47:40 -08:00
Andrew Meadows
c24cbdadc1
Merge branch 'master' of ssh://github.com/highfidelity/hifi into cleanup
...
Conflicts:
interface/src/avatar/MyAvatar.cpp
2014-02-19 10:00:51 -08:00
Andrew Meadows
85e05539ad
Adding comment about bug as a reminder to fix.
2014-02-19 08:59:17 -08:00
Andrzej Kapolka
636e3b1910
Working on blendshape integration.
2014-02-18 18:24:25 -08:00
Andrew Meadows
4848aa1d16
Merge branch 'master' of ssh://github.com/highfidelity/hifi into avatar-interaction
2014-02-17 09:14:06 -08:00
Andrew Meadows
335141049c
Cleaning up collision check API's and re-enabling collisions with particles.
2014-02-14 16:33:19 -08:00
Andrzej Kapolka
af0d395751
Added sanity check for zero vertices.
2014-02-14 13:11:16 -08:00
Andrzej Kapolka
76142c92f2
Adjust offset when skipping parts that don't match the translucency setting.
...
Closes #2001 .
2014-02-14 13:04:17 -08:00
Andrzej Kapolka
91fac4eebe
Merge branch 'master' of https://github.com/highfidelity/hifi
2014-02-13 17:38:23 -08:00
Andrzej Kapolka
1afd3ab712
Fixes for OS X warnings.
2014-02-13 17:07:57 -08:00
Andrzej Kapolka
5f38c328d5
Removed debugging code.
2014-02-13 16:25:04 -08:00
Andrzej Kapolka
078b15c02d
Add some hysteresis on the LOD switching to prevent rapid switching back
...
and forth.
2014-02-13 16:20:43 -08:00
Andrzej Kapolka
ff01470850
Wait until each LOD level is actually requested before we start loading;
...
before a level is loaded, try to use the closest already-loaded level.
2014-02-13 14:25:01 -08:00
Andrew Meadows
50d864901e
Improved comment about limitation of collision check.
2014-02-13 14:02:25 -08:00
Andrzej Kapolka
6a39290bf5
Basic LOD switching based on distance to camera.
2014-02-13 13:37:29 -08:00
Andrew Meadows
cc70e099bf
Merge branch 'avatar-interaction' of ssh://github.com/AndrewMeadows/hifi into avatar-interaction
2014-02-12 08:31:05 -08:00
Andrew Meadows
04bc05cfe6
Moving hand-avatar collision trigger calls into MyAvatar
...
Also renaming some methods in Model to be more descriptive.
2014-02-12 08:29:22 -08:00
Andrzej Kapolka
3b1b067418
Merge branch 'master' of https://github.com/highfidelity/hifi
2014-02-11 16:03:41 -08:00
Andrzej Kapolka
e29d6210bb
Merge pull request #1981 from AndrewMeadows/avatar-interaction
...
Avatar body-body collisions
2014-02-11 16:02:43 -08:00
Andrew Meadows
66dc4e17ad
Fixing formatting to be KR
2014-02-11 15:59:35 -08:00
Andrzej Kapolka
b6d77ec637
Switched from loading FBX and FST simultaneously to loading FST first, then
...
using its filename and texdir properties (as Faceshift does) to locate the
corresponding model. Also fixed a bug with the fallback models (they were
invisible after second failure).
2014-02-11 14:20:52 -08:00
Andrew Meadows
3b3359abce
Merge branch 'master' of ssh://github.com/highfidelity/hifi into avatar-interaction
2014-02-11 14:02:08 -08:00
Andrew Meadows
d0f9b78710
Adding avatar body-body collisions to prevent near-clipping.
2014-02-11 13:48:48 -08:00
Andrew Meadows
887fa0c938
Only resolve our hand collisions that would not move the other avatar.
...
This helps us only penetrate the moveable parts of other avatars.
2014-02-11 09:23:40 -08:00
Andrzej Kapolka
f9e9d62fe3
Merge branch 'master' of https://github.com/highfidelity/hifi
2014-02-10 19:02:58 -08:00
Andrzej Kapolka
2071da2c8a
Provide a means to specify a fallback for when we fail to load a model. Also
...
added missing associated resources for default model. Closes #1960 .
2014-02-10 18:50:36 -08:00
Andrzej Kapolka
bbb8e2a45f
Ignore the =1's that Faceshift appends to our custom data in the FST.
2014-02-10 17:41:57 -08:00
Andrew Meadows
4edc6cd88b
Merge branch 'master' of ssh://github.com/highfidelity/hifi into avatar-interaction
2014-02-10 15:42:56 -08:00
Andrew Meadows
e73c9f7095
It is now possible to "poke" moveable parts of the avatar skeleton.
2014-02-10 14:07:50 -08:00
Andrew Meadows
e2e02fc855
Removing bounding sphere measurement of hands -- not useful yet.
2014-02-10 14:04:32 -08:00
Andrew Meadows
10296577f4
More info when colliding with meshes + stubbery for poking avatar.
2014-02-10 09:02:29 -08:00
Andrzej Kapolka
9c3624d0d9
Fix for texture on jellyrob_blue_blender.fbx; apparently you can map textures,
...
as well as materials, by polygon. Closes #1844 .
2014-02-07 14:25:48 -08:00
Andrew Meadows
7a8186f1da
Adding ModelCollisionInfo struct to get more info about collisions against avatars.
...
Had to disable some collisions. Will go back and make them work again soon.
2014-02-07 10:48:30 -08:00
Andrew Meadows
082b7cf1a9
Merge branch 'master' of ssh://github.com/highfidelity/hifi into avatar-interaction
...
Conflicts:
interface/src/avatar/Avatar.cpp
interface/src/avatar/Avatar.h
interface/src/avatar/MyAvatar.cpp
2014-02-06 14:37:19 -08:00
Andrew Meadows
64ca66a2b7
Making renderCollisionProxies() public and measuring bounding volumes of hands.
2014-02-06 14:09:08 -08:00
ZappoMan
2f14b265a8
make sure SVO files with version details are supported
2014-02-04 20:24:08 -08:00
Andrzej Kapolka
2b4876181a
Different take on the transform fix.
2014-01-31 19:38:45 -08:00
Andrzej Kapolka
e1350f8e24
Trying out a transform tweak.
2014-01-31 19:00:24 -08:00
Andrzej Kapolka
ff2afca50e
Special handling for blendshapes in Blender exports. They're under the model,
...
like the geometry.
2014-01-31 15:24:54 -08:00
Andrzej Kapolka
78d9b79805
Another fix for Blender exports. Closes #1762 .
2014-01-30 13:24:30 -08:00
Andrzej Kapolka
181670f5d7
Fixes for parsing FBX text encoding.
2014-01-30 12:53:02 -08:00
