Stephen Birarda
403f91c988
update resource references to use Qt resource system
2014-03-06 10:41:11 -08:00
Andrzej Kapolka
a7af3bc284
Merge branch 'master' of https://github.com/highfidelity/hifi
...
Conflicts:
interface/src/avatar/MyAvatar.cpp
2014-03-05 18:08:59 -08:00
Andrzej Kapolka
ad25455f86
Track hysteresis for next model separately, but just in case, don't use
...
recursion to fall back on hysteresis value. Closes #2209 .
2014-03-05 18:06:14 -08:00
Andrew Meadows
a1856ac18b
fix bad transform math for placing shapes
2014-03-05 11:57:07 -08:00
Andrew Meadows
7db5aaaf37
new collision pipeline for avatar shapes
2014-03-05 07:08:59 -08:00
Andrew Meadows
3d426a24f1
Fixing build warnings
2014-03-04 09:54:34 -08:00
Andrew Meadows
7ba5bc71ea
Merge branch 'master' of ssh://github.com/highfidelity/hifi into shapes
...
Conflicts:
interface/src/renderer/FBXReader.cpp
interface/src/renderer/Model.cpp
interface/src/renderer/Model.h
2014-03-04 09:01:24 -08:00
Andrew Meadows
4ef2067421
Use capsules for some joints and render them.
2014-03-03 17:49:24 -08:00
Andrew Meadows
1c0826d696
Add JointShapeInfo for joint shape calculations
2014-03-03 12:31:09 -08:00
Stephen Birarda
60eb588e96
remove some unecessary null pointer checks
2014-03-03 11:36:01 -08:00
Andrew Meadows
8ef657e5b2
Render avatar collision shapes in the right spot
2014-02-28 17:05:08 -08:00
Andrzej Kapolka
0bb3752121
Fixed seg fault, don't attempt to transfer joints between different models
...
(as opposed to different LODs).
2014-02-28 14:29:18 -08:00
Andrzej Kapolka
21a149348b
When switching models, retain old one until new one is loaded. Closes #2146 .
2014-02-28 13:57:25 -08:00
Andrzej Kapolka
73ec568b4b
Further work on request limiting.
2014-02-27 19:28:45 -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
e91d47174b
Removed unused function.
2014-02-27 12:37:17 -08:00
Andrzej Kapolka
cd2bd32210
Delay loading models until we know that we need them (i.e., that we're not
...
beyond billboard distance). Closes #2121 .
2014-02-27 12:30:46 -08:00
Andrzej Kapolka
f335bb8171
Preserve joint states when switching between LODs. Closes #2077 .
2014-02-26 13:40:09 -08:00
Andrzej Kapolka
8745ca3139
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-02-23 20:13:23 -08:00
Andrzej Kapolka
f5fece5eb5
Fix for Xcode warnings.
2014-02-23 20:11:46 -08:00
Andrzej Kapolka
ac02609bc2
The basic billboard behavior, closes #1864 .
2014-02-21 15:38:49 -08:00
Andrzej Kapolka
6b90a3994d
Working on avatar billboards.
2014-02-20 19:22:59 -08:00
Andrzej Kapolka
a8d0aa6d17
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-02-19 14:57:18 -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
Andrzej Kapolka
55e2ebd92f
More spanner bits.
2014-02-18 13:58:44 -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
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
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
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
10296577f4
More info when colliding with meshes + stubbery for poking avatar.
2014-02-10 09:02:29 -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
