ZappoMan
5e6e15db41
Merge pull request #1025 from ZappoMan/voxel_render_modes
...
two possible crash fixes
2013-10-08 11:21:10 -07:00
Andrzej Kapolka
4c2ccd92ef
Merge pull request #1027 from ey6es/master
...
Fixes for eyes rolling back in head, macaw head without mapping file.
2013-10-08 11:20:24 -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
ZappoMan
89a4ea6470
two possible crash fixes
2013-10-08 09:56:47 -07:00
Philip Rosedale
6b68f81fde
Merge pull request #1024 from ZappoMan/voxel_render_modes
...
Voxel Rendering Improvements - make it run at 60fps
2013-10-07 22:36:52 -07:00
ZappoMan
aa80ec3497
cleanup code for PR
2013-10-07 19:46:52 -07:00
ZappoMan
54364a235d
tighten up mutex locks to keep at 60 fps
2013-10-07 19:43:45 -07:00
ZappoMan
f6981feacf
added various render mode options, including voxels as points
2013-10-07 17:46:22 -07:00
ZappoMan
8baa863242
fixed PPS bugs in threaded version of PacketSender class
2013-10-07 17:34:41 -07:00
ZappoMan
c6981d1912
have animation server set an appropriate PPS based on it's voxel edit messages
2013-10-07 17:32:55 -07:00
ZappoMan
825d397e21
Merge pull request #1023 from ZappoMan/wider_view_frustum
...
added some timing debugging
2013-10-05 00:56:55 -07:00
ZappoMan
5f6fb3a3ae
added some timing debugging
2013-10-05 00:55:34 -07:00
ZappoMan
15c25d94c2
Merge pull request #1022 from ZappoMan/wider_view_frustum
...
added debugging
2013-10-04 22:49:59 -07:00
ZappoMan
3001917e10
added debugging
2013-10-04 22:49:05 -07:00
Philip Rosedale
3c5d7795e6
Merge pull request #1021 from ZappoMan/wider_view_frustum
...
make view frustum oversend and don't remove oversend in client
2013-10-04 22:08:56 -07:00
ZappoMan
6fce838e2e
remove comment
2013-10-04 21:38:47 -07:00
ZappoMan
0c70a05732
make view frustum oversend and don't remove oversend in client
2013-10-04 21:36:21 -07:00
Andrzej Kapolka
86a27c5f69
Merge pull request #1020 from ey6es/master
...
Fixes to support the FBX rig exports from Faceshift.
2013-10-04 17:57: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
Stephen Birarda
e3f830ec09
Merge pull request #1017 from ey6es/master
...
Use diffuse color, specular color, and shininess from FBX file.
2013-10-04 17:11:11 -07:00
Andrzej Kapolka
325ac73d0a
Apply color to ambient material property, too.
2013-10-04 17:04:50 -07:00
Andrzej Kapolka
98a999334a
Merge pull request #1018 from birarda/master
...
less aggresive assignment debugging
2013-10-04 14:26:56 -07:00
Andrzej Kapolka
5f26177560
Fix for URLs' not being sent: setting the scale calls createMohawk, which
...
reseeds the random number generator, breaking "shouldDo."
2013-10-04 13:42:03 -07:00
Stephen Birarda
b3171679b2
less aggressive debugging of waiting for assignment
2013-10-04 13:25:51 -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
Philip Rosedale
c99f1646db
Merge pull request #1015 from ZappoMan/voxel_render_pipeline_improvement
...
Fixes to delete/add voxel sometimes not rendering
2013-10-03 16:08:12 -07:00
ZappoMan
608c24e258
fix build buster
2013-10-03 15:58:15 -07:00
Andrzej Kapolka
c2e3682f6e
Merge pull request #1014 from ey6es/master
...
Fix for relative texture paths.
2013-10-03 15:48:25 -07:00
Andrzej Kapolka
2fc1af8c1a
Fix for relative texture paths.
2013-10-03 15:47:43 -07:00
ZappoMan
2450d64016
Merge branch 'master' of https://github.com/worklist/hifi into voxel_render_pipeline_improvement
2013-10-03 15:09:28 -07:00
Philip Rosedale
a140f4e309
Merge pull request #1013 from ey6es/master
...
Use Faceshift mapping files (FST) when present for their transform offsets and joint/blendshape mapping. Fixed crash on meshes with no texture coordinates.
2013-10-03 14:54:11 -07:00
Andrzej Kapolka
813fa1030b
Merge branch 'master' of https://github.com/worklist/hifi
2013-10-03 14:39:13 -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
ZappoMan
1c664b311d
fixed behavior of voxel delete and some cases of voxel add in fast pipeline mode
2013-10-03 14:15:13 -07:00
Andrzej Kapolka
5756733aef
Load mapping and use it for offset, joint mappings, blendshape mappings.
2013-10-03 14:03:01 -07:00
Stephen Birarda
a36ea50154
Merge pull request #1012 from ZappoMan/voxeleditsender_improvements
...
fix sendVoxelEditMessage() to honor jurisdictions, cleanup some threadin...
2013-10-03 10:37:09 -07:00
ZappoMan
84862310d1
fix sendVoxelEditMessage() to honor jurisdictions, cleanup some threading/nonthreading behavior in PacketSender
2013-10-03 10:25:00 -07:00
Philip Rosedale
e9a21e284a
Merge pull request #1011 from ZappoMan/voxeleditsender_improvements
...
VoxelEditPacketSender class improvements
2013-10-02 21:25:10 -07:00
ZappoMan
f937170b67
fixed PR feedback
2013-10-02 21:18:35 -07:00
ZappoMan
8a439fabed
Merge pull request #1008 from PhilipRosedale/master
...
Head-driven mouse works with Faceshift
2013-10-02 21:17:43 -07:00
ZappoMan
5a356340e0
call setProcessCallIntervalHint() in JS Agent, so the non-threaded voxel sender knows how often we plan to call it
2013-10-02 20:55:38 -07:00
ZappoMan
529bcc2b4a
fix build buster
2013-10-02 20:46:49 -07:00
ZappoMan
9d231a50b6
implement support for process interval hints and handling sending only some packets per call to process in non-threaded mode
2013-10-02 20:39:58 -07:00
ZappoMan
4271fc5d41
removed debug
2013-10-02 17:01:07 -07:00
ZappoMan
f94f535254
make sure sleep is never too long
2013-10-02 17:00:46 -07:00
ZappoMan
aac6d409d2
delete voxels locally on edit to match add behavior
2013-10-02 17:00:19 -07:00
ZappoMan
90c64ab25c
more work on handleing pending packets in VoxelEditPacketSender
2013-10-02 16:33:06 -07:00
