Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-06-18 17:28:46 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
11865 commits 25 branches 0 tags 1.1 GiB
Commit graph

157 commits

Author SHA1 Message Date
Andrzej Kapolka
64932cc2a7 Merge branch 'master' of https://github.com/worklist/hifi into debone 2014-01-14 16:40:20 -08:00
Andrzej Kapolka
7e4fcb43f2 Merge branch 'master' of https://github.com/worklist/hifi into armstrong 2014-01-14 16:31:30 -08:00
Andrzej Kapolka
5d88953f12 First cut at stretching the arms out and aligning forearms with wrists. 
Closes #1423, #1504.
 2014-01-14 15:27:28 -08:00
Stephen Birarda
987c639e36 initial newline removal from all QDebug calls 2014-01-14 13:09:22 -08:00
Brad Hefta-Gaub
55babbf7b6 windows type mismatch warning fixes 2014-01-13 00:30:23 -08:00
Brad Hefta-Gaub
825c1c8876 fix windows warnings 2014-01-11 00:07:35 -08:00
Andrzej Kapolka
131af0cf16 I believe this should fix the "Joint/model not in model list" errors. 2014-01-10 12:26:11 -08:00
Andrzej Kapolka
9641ca1e66 More efficient (though perhaps overkill) blendshape mapping. 2013-12-09 15:37:09 -08:00
Andrzej Kapolka
a431268815 Somewhat inefficient take on allowing blendshapes coefficients to apply 
multiple blendshapes.
 2013-12-09 15:21:20 -08:00
Andrzej Kapolka
b90c5bdae8 Option to render collision proxies, more general avatar penetration test, fix 
for meshes with only one joint influence.
 2013-12-05 14:00:38 -08:00
Andrzej Kapolka
193f676fcb Merge branch 'master' of https://github.com/worklist/hifi 2013-12-05 10:18:50 -08:00
ZappoMan
9faef65ccc first cut at splitting out octree base classes 2013-12-03 17:32:02 -08:00
Andrzej Kapolka
2633223f4e Compute the bone radii from the vertices. It's more error-prone than I 
expected, but it more or less works.
 2013-12-02 18:07:29 -08:00
Andrzej Kapolka
f7458cf934 Fix for pupil dilation on Ryan's face. 2013-11-14 15:21:54 -08:00
Andrzej Kapolka
a36f9d52af Constraint fix, apply constraints to wrists. 2013-11-12 15:43:11 -08:00
Andrzej Kapolka
0eaaa89c9a Read the palm direction from the FST, use that to determine Leap rotations. 2013-11-08 15:38:20 -08:00
Andrzej Kapolka
49c9d41dd5 Read and enforce angle constraints (untested). 2013-11-08 14:49:38 -08:00
Andrzej Kapolka
a29dfe9c63 Yet another finger attempt. 2013-11-07 16:14:23 -08:00
Andrzej Kapolka
c3049d4378 Another shot at the fingers. Not attempting IK on the anymore. 2013-11-07 14:25:01 -08:00
Andrzej Kapolka
aec7dbca08 Attempting the fingers again. 2013-11-07 13:57:54 -08:00
Andrzej Kapolka
4360621daf Adjustments to wrist rotations. 2013-11-07 13:17:08 -08:00
Andrzej Kapolka
f0e72d8d0c Removed unused variable, debugging code. 2013-11-07 12:16:17 -08:00
Andrzej Kapolka
e6cd9a7368 Working on wiring up the fingers. 2013-11-07 12:12:48 -08:00
Andrzej Kapolka
1706c7c97a New IK method: will be easier to add constraints, adds "gravity" influence to 
sap potential energy.
 2013-11-06 15:51:26 -08:00
Andrzej Kapolka
966f75db9b Sanity check to prevent crash in Model::simulate. 2013-11-01 14:47:25 -07:00
Andrzej Kapolka
4a011e0624 Pull out the weight access. 2013-10-31 17:10:35 -07:00
Andrzej Kapolka
70485a0ba9 Fix for meshes with no texture coordinates. 2013-10-31 14:52:36 -07:00
Andrzej Kapolka
1a532be845 Smooth the normals. 2013-10-31 14:26:06 -07:00
Andrzej Kapolka
a15bff3857 Closer to mesh fix. 2013-10-31 13:49:06 -07:00
Andrzej Kapolka
bc796c63e3 Working on mesh fix. 2013-10-31 12:41:40 -07:00
Andrzej Kapolka
156b3dd2e6 Sign change. Forgot we flip the texture coordinates. 2013-10-30 11:55:22 -07:00
Andrzej Kapolka
06e050f1c1 Normal map support almost there. 2013-10-29 22:13:00 -07:00
Andrzej Kapolka
e45446a0ee Oops; I broke the voxel attachments. 2013-10-28 16:36:31 -07:00
Andrzej Kapolka
4f34d89c4a Added left hand/hand rotation setters in preparation for Leap integration. 2013-10-28 14:38:09 -07:00
Andrzej Kapolka
b56d47929b Extremely basic IK based on implementation of the cyclic coordinate descent 
algorithm.  Actually seems to work pretty well.
 2013-10-28 13:38:22 -07:00
Andrzej Kapolka
1e5ec3e84f Fix for models exported from Blender: remove type prefix from IDs. 2013-10-25 10:18:40 -07:00
Andrzej Kapolka
bae4a17605 Voxel attachments. 2013-10-24 13:59:04 -07:00
Andrzej Kapolka
a9df8a6b29 Partial fix for textures in exports from 3D Studio Max. 2013-10-23 15:56:09 -07:00
Andrzej Kapolka
41f73b5e9d Support for attaching models to joints. 2013-10-23 15:16:29 -07:00
Andrzej Kapolka
cd4b88acaa More rotation tweaks. 2013-10-22 13:39:51 -07:00
Andrzej Kapolka
a33c7ce20c More work on extracting rotations. 2013-10-22 12:54:32 -07:00
Andrzej Kapolka
b5f2dcfa55 Use the head position from the loaded skeleton, if available. 2013-10-21 16:58:01 -07:00
Andrzej Kapolka
349f7b363a More work on custom skeletons. 2013-10-21 16:14:38 -07:00
Andrzej Kapolka
49acca3587 Fixes to load my test model. 2013-10-21 11:20:27 -07:00
Andrzej Kapolka
871f97bd81 The Blender FBX has models that are also meshes. 2013-10-18 19:06:56 -07:00
Andrzej Kapolka
b294f5b13e Fix for weird links in Blender exports. 2013-10-18 18:43:07 -07:00
Andrzej Kapolka
b3384d0869 More fixes for text FBXs. 2013-10-18 18:23:08 -07:00
Andrzej Kapolka
a6a4ceebe4 Just check the last entry for the type. 2013-10-18 18:03:28 -07:00
Andrzej Kapolka
ec17b80b52 Adapt to the *other* kind of cluster. 2013-10-18 17:54:54 -07:00
Andrzej Kapolka
7e174093e4 Factoring the FBX model code out to a shared base class. 2013-10-18 17:26:03 -07:00
Andrzej Kapolka
b84a5679dd Fixed merge error. 2013-10-18 14:31:56 -07:00
Andrzej Kapolka
591cf98821 Merge branch 'master' of https://github.com/worklist/hifi into ossome 
Conflicts:
	interface/src/renderer/FBXReader.cpp
 2013-10-18 14:30:50 -07:00
Andrzej Kapolka
58b4139dbc Added support for RotationOffset, which the Lulu model uses. 2013-10-18 14:26:42 -07:00
Andrzej Kapolka
cd902c5e85 More work on importing the version of FBX exported by Blender. 2013-10-18 14:09:12 -07:00
Andrzej Kapolka
c8b2ed0213 More progress on reading skeletons. 2013-10-17 17:30:34 -07:00
Andrzej Kapolka
9ba3c3719f Working on skeleton loading, added support for FBX text format (exported by 
Blender).
 2013-10-17 15:45:57 -07:00
Andrzej Kapolka
8631cc3264 Try to apply the blendshape scale. 2013-10-15 16:29:28 -07:00
Andrzej Kapolka
b04ed72b83 I forgot that the children are in reverse order. 2013-10-15 16:17:56 -07:00
Andrzej Kapolka
ba25087b3e Support for multiple mesh "parts" (with different materials), fix for 
untextured meshes.
 2013-10-15 15:58:34 -07:00
Andrzej Kapolka
053c116481 Removed unused variable. 2013-10-15 11:57:42 -07:00
Andrzej Kapolka
d06acdd169 Per-pixel shading, material tweaks. 2013-10-15 11:50:29 -07:00
Andrzej Kapolka
db30e729d4 More work towards skinning. 2013-10-14 16:46:17 -07:00
Andrzej Kapolka
cec0ee0b22 Working on processing the cluster/skin information. 2013-10-11 17:51:29 -07:00
Andrzej Kapolka
60306af3e9 Default springiness, allow springiness on non-blended meshes. 2013-10-08 13:35:02 -07:00
Andrzej Kapolka
6a043145d3 Merge branch 'master' of https://github.com/worklist/hifi into springy 
Conflicts:
	interface/src/renderer/FBXReader.cpp
 2013-10-08 11:21:47 -07:00
Andrzej Kapolka
e3436eed91 Fixes for eyes rolling back in head, macaw head without mapping file. 2013-10-08 11:18:12 -07:00
Andrzej Kapolka
ce23b415e0 Fix for macaw head without mapping file. 2013-10-08 11:11:01 -07:00
Andrzej Kapolka
3448ceccd2 Progress towards a spring-mass model. 2013-10-07 17:25:46 -07:00
Andrzej Kapolka
a704a29864 Include a mapping for the names generated by the FBX export. 2013-10-04 17:56:36 -07:00
Andrzej Kapolka
08426fbd9c Handle index-to-direct normals (exported by the Faceshift rig FBX). 2013-10-04 17:49:18 -07:00
Andrzej Kapolka
b281facf45 Remove references to ambient, use the requested alpha. 2013-10-04 10:53:19 -07:00
Andrzej Kapolka
51c868fd28 Apply (some) FBX material properties to rendered meshes. 2013-10-03 18:12:58 -07:00
Andrzej Kapolka
2fc1af8c1a Fix for relative texture paths. 2013-10-03 15:47:43 -07:00
Andrzej Kapolka
b2b9e1e0bf Need to allow multiple blendshape mappings per shape index. 2013-10-03 14:35:58 -07:00
Andrzej Kapolka
cc5cc1a409 Fixed incorrect capitalization. 2013-10-03 14:16:28 -07:00
Andrzej Kapolka
5756733aef Load mapping and use it for offset, joint mappings, blendshape mappings. 2013-10-03 14:03:01 -07:00
Andrzej Kapolka
97cbef1d59 Avoid warnings on invalid URLs, delete reply when reference is deleted. 2013-10-02 10:23:04 -07:00
Andrzej Kapolka
40a3268d7c Fixed an OS X warning and a misplaced parenthesis. 2013-10-01 16:31:57 -07:00
Andrzej Kapolka
6ccd406a35 Experimenting with the pivot points. 2013-10-01 15:20:18 -07:00
Andrzej Kapolka
3c6fb2914f Use inheritance type flags. Getting closer to the correct transforms. 2013-10-01 15:03:29 -07:00
Andrzej Kapolka
3c3cf0b002 Basic geometry sharing/texture loading. 2013-10-01 10:50:09 -07:00
Andrzej Kapolka
d4c4cbc981 Get the neck joint and position blend face relative to that. 2013-09-30 13:15:59 -07:00
Andrzej Kapolka
d4203ff3d3 Pivot fix. 2013-09-30 12:01:27 -07:00
Andrzej Kapolka
1592aac177 Getting closer to the correct set of transforms. 2013-09-30 11:24:41 -07:00
Andrzej Kapolka
f8d26f207d Include the local transforms from the FBX file when rendering meshes. 2013-09-27 17:57:18 -07:00
Andrzej Kapolka
0ae614fa7b Fix to load Ryan's alien model (handle per-vertex normals). 2013-09-25 17:55:22 -07:00
Andrzej Kapolka
9a16d44a47 Render the eye textures. 2013-09-25 13:47:03 -07:00
Andrzej Kapolka
4567b8afdf Merge branch 'master' of https://github.com/worklist/hifi into blendface 2013-09-25 11:40:16 -07:00
Andrzej Kapolka
2c7bb1a3d9 Slight fix: make sure we set isEye on each mesh. 2013-09-25 11:38:00 -07:00
Andrzej Kapolka
85ab9b7576 Use the texture coordinates when rendering the eyes. 2013-09-25 11:35:02 -07:00
Andrzej Kapolka
7ff5167bb7 Read in the texture coordinates, too. 2013-09-25 11:02:56 -07:00
Andrzej Kapolka
71ec6f75e5 Move the eyeball meshes according to the lookat direction (not really visible 
yet since the eyeballs have no textures).
 2013-09-24 18:57:37 -07:00
Andrzej Kapolka
452eb9be47 Extract the pivot points from the limb nodes, make sure we extract the vector 
elements in the right order.
 2013-09-24 16:50:38 -07:00
Andrzej Kapolka
4666c736d8 Remove unused variable. 2013-09-24 14:24:57 -07:00
Andrzej Kapolka
1b9444cb39 As a temporary hack, render the mesh with the most blendshapes with the head 
color (other meshes white).
 2013-09-24 14:22:01 -07:00
Andrzej Kapolka
fd41a075ed Added support for multiple blended meshes. 2013-09-24 13:53:19 -07:00
Andrzej Kapolka
ad69a9547f Remove the pose bits, at least for now. 2013-09-24 11:12:59 -07:00
Andrzej Kapolka
aa6eb7b3d8 Render the "other" meshes as separate, static, white. 2013-09-23 16:34:28 -07:00
Andrzej Kapolka
9034eb1e72 Experimenting with the simplest method of including the other meshes. 2013-09-23 14:37:48 -07:00
Andrzej Kapolka
133ba3a00a Set normals based on indices, cache face models. 2013-09-20 17:40:15 -07:00