Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-22 23:24:56 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
6921 commits 25 branches 0 tags 1.1 GiB
Commit graph

3554 commits

Author SHA1 Message Date
Andrzej Kapolka
0a54c2f1e9 Tweaking the growing heads. 2013-10-09 11:52:56 -07:00
Philip Rosedale
8dc84fc841 Merge branch 'master' of https://github.com/worklist/hifi 2013-10-09 11:44:56 -07:00
Stephen Birarda
478214f9da fix Profile include from DataServerClient 2013-10-09 11:14:26 -07:00
Andrzej Kapolka
a679517596 Fix for jaundiced eyes. 2013-10-09 11:10:51 -07:00
Stephen Birarda
268a64d3d5 change data-server hostname to hifi global data-server 2013-10-09 10:27:02 -07:00
Stephen Birarda
f09888dd1b Merge branch 'master' of github.com:worklist/hifi into nameserver 2013-10-09 10:21:25 -07:00
Andrzej Kapolka
1b4daa8eb9 No glow on own avatar, only on others when farther than five units away. 2013-10-09 10:17:41 -07:00
Philip Rosedale
906f3c8c60 got basic cloud working 2013-10-08 23:15:29 -07:00
Philip Rosedale
afd553330a Merge branch 'master' of https://github.com/worklist/hifi 2013-10-08 22:24:34 -07:00
Philip Rosedale
ce2e31ddd5 reconnecting particle cloud 2013-10-08 22:21:55 -07:00
Philip Rosedale
69277ec8ba Added back field and cloud files 2013-10-08 21:49:13 -07:00
Stephen Birarda
9c6cdcc70b complete setting of user model from data-server 2013-10-08 15:39:04 -07:00
Andrzej Kapolka
87bdd2fb1a When in mirror mode and using a blend face, try to position the camera so as 
to look directly into the face's eyes.
 2013-10-08 15:09:56 -07:00
Stephen Birarda
233c1599bd leverage existing URL update rate for interim face model update solution 2013-10-08 14:25:53 -07:00
Andrzej Kapolka
3cca3dc894 Reset fix. 2013-10-08 14:06:04 -07:00
Stephen Birarda
10f29dfe90 ask the data-server for a face mesh on UUID change 2013-10-08 14:02:57 -07:00
Stephen Birarda
15ddd9989b ovverride UUID setter in Avatar for DataServerClient get request 2013-10-08 13:59:28 -07:00
Andrzej Kapolka
15f7b70269 Let's actually use the transform we constructed. 2013-10-08 13:54:54 -07:00
Stephen Birarda
b17e12460c shift get/set of face model URL to Profile class 2013-10-08 13:52:04 -07:00
Stephen Birarda
8bac70e4a5 pass UUID from data-server to avatar-mixer 2013-10-08 13:43:31 -07:00
Andrzej Kapolka
60306af3e9 Default springiness, allow springiness on non-blended meshes. 2013-10-08 13:35:02 -07:00
Stephen Birarda
6bd71da84e pack the UUID with the avatar data 2013-10-08 13:31:39 -07:00
Stephen Birarda
97966592e1 Merge branch 'master' of github.com:worklist/hifi into nameserver 2013-10-08 13:19:55 -07:00
Stephen Birarda
f5912f07a8 make sure username is not empty before requesting faceMesh 2013-10-08 12:45:18 -07:00
Stephen Birarda
d843285db7 save profile to settings, fix UUID storage 2013-10-08 12:40:09 -07:00
Stephen Birarda
ae59ce22b7 send an empty key when making a UUID request 2013-10-08 12:22:02 -07:00
Stephen Birarda
85edb93710 add a Profile class to hold user data from data-server 2013-10-08 12:13:45 -07:00
Stephen Birarda
56b71eb61a re-send data-server GET requests if they are unmatched 2013-10-08 11:33:14 -07:00
Andrzej Kapolka
506f667083 More springy, more damp. Removed unused variable. 2013-10-08 11:26:15 -07:00
Andrzej Kapolka
acaf7d4f88 Merge branch 'master' of https://github.com/worklist/hifi into springy 2013-10-08 11:22:03 -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
ZappoMan
5e6e15db41 Merge pull request #1025 from ZappoMan/voxel_render_modes 
two possible crash fixes
 2013-10-08 11:21:10 -07:00
Stephen Birarda
892614470e Merge branch 'master' of github.com:worklist/hifi into nameserver 2013-10-08 11:19:32 -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
b22334730d Fix for eyes rolling back in head. 2013-10-08 11:01:31 -07:00
Andrzej Kapolka
184e0f4439 Merge branch 'master' of https://github.com/worklist/hifi into springy 2013-10-08 10:34:53 -07:00
ZappoMan
89a4ea6470 two possible crash fixes 2013-10-08 09:56:47 -07:00
stojce
a795a5b88f #19435 - Remove 'Perlin Face' option from menus and code 2013-10-08 18:23:51 +02: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
Andrzej Kapolka
b0bc122a48 Got some actual damped oscillation going. 2013-10-07 18:02:03 -07:00
Stephen Birarda
7964f360ab add method to DataServerClient to resend unmatched packets 2013-10-07 17:52:21 -07:00
ZappoMan
f6981feacf added various render mode options, including voxels as points 2013-10-07 17:46:22 -07:00
Andrzej Kapolka
3448ceccd2 Progress towards a spring-mass model. 2013-10-07 17:25:46 -07:00
Stephen Birarda
26d5e2cfec clear the face model URL if the username is changed in preferences 2013-10-07 17:24:07 -07:00
Stephen Birarda
4b62026c25 shore up receipt of face mesh URL from data-server 2013-10-07 17:06:38 -07:00
Stephen Birarda
b33843fddc ask for a mesh if username is present on login or is changed 2013-10-07 13:52:46 -07:00
Stephen Birarda
e9e77d8276 set username instead of UUID in Interface preferences 2013-10-07 13:35:16 -07:00
Stephen Birarda
f36fd47ef7 store username and not UUID for MyAvatar 2013-10-07 12:17:47 -07:00
stojce
16d10775dc #19434 restore window position on start 
- store position and size on app end
- restore position and size on app start
 2013-10-07 21:04:36 +02:00
Stephen Birarda
98f435ccc2 link mesh URL and UUID in prefs to data server client 2013-10-07 12:03:04 -07:00
Stephen Birarda
fea3ca8229 pack string representation of UUID for data server communication 2013-10-07 10:58:26 -07:00
Stephen Birarda
5a7d21f529 add UUID helper class to get UUID string without braces 2013-10-07 10:56:23 -07:00
Stephen Birarda
13232a4c0b stubbing of mechanism to confirm packets sent to data server 2013-10-07 10:45:54 -07:00
Stephen Birarda
4cc9f29c83 initial stub of data server client code in Interface 2013-10-07 09:55:08 -07:00
stojce
61b213804a #19426 - Add a mute control to the interface 
- OpenGL overlay icon
- mute control
- icons
 2013-10-05 13:18:35 +02:00
ZappoMan
5f6fb3a3ae added some timing debugging 2013-10-05 00:55:34 -07:00
ZappoMan
3001917e10 added debugging 2013-10-04 22:49:05 -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
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
325ac73d0a Apply color to ambient material property, too. 2013-10-04 17:04:50 -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
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
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
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
Philip Rosedale
e9a21e284a Merge pull request #1011 from ZappoMan/voxeleditsender_improvements 
VoxelEditPacketSender class improvements
 2013-10-02 21:25:10 -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
aac6d409d2 delete voxels locally on edit to match add behavior 2013-10-02 17:00:19 -07:00
Andrzej Kapolka
1994f9cc91 Missed a spot. 2013-10-02 15:10:35 -07:00
Andrzej Kapolka
97762b21c4 Change order of transformations so that head offset is consistent with scale. 2013-10-02 15:03:33 -07:00
ZappoMan
51fa5f4f47 Merge branch 'master' of https://github.com/worklist/hifi into voxeleditsender_improvements 2013-10-02 15:02:33 -07:00
ZappoMan
cc0009976b first cut and handling buffering of edit packets when voxel servers are unknown 2013-10-02 15:02:23 -07:00
Andrzej Kapolka
c98dec8a65 Dilate our network-downloaded textures. 2013-10-02 11:59:14 -07:00
PhilipRosedale
26618f45f8 use clamp instead of min, max 2013-10-02 10:50:41 -07:00
PhilipRosedale
6d2585a732 faceshift drives head mouse, improved reticle 2013-10-02 10:46:31 -07:00
Andrzej Kapolka
d87fe204e0 Merge branch 'master' of https://github.com/worklist/hifi 2013-10-02 10:23:43 -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
PhilipRosedale
99c866dba4 Merge branch 'master' of https://github.com/worklist/hifi 2013-10-01 16:10:30 -07:00
PhilipRosedale
7dd1a7525e starting to add faceshift head mouse 2013-10-01 16:10:22 -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
Philip Rosedale
cebd8e5f4b Merge pull request #997 from birarda/assignment 
file of static assignments for DS
 2013-10-01 13:47:10 -07:00
Philip Rosedale
64151975f2 Merge pull request #1002 from ZappoMan/voxel_render_pipeline_improvement 
Voxel render pipeline improvement
 2013-10-01 13:13:11 -07:00
ZappoMan
1aa7855166 cleanup 2013-10-01 12:43:30 -07:00
ZappoMan
8ceee2ec1e more cleanup of faster voxel pipeline 2013-10-01 11:51:25 -07:00
Philip Rosedale
4cd3abfb86 Merge pull request #1000 from birarda/master 
some deletions and cleanup
 2013-10-01 11:44:28 -07:00
Andrzej Kapolka
3c3cf0b002 Basic geometry sharing/texture loading. 2013-10-01 10:50:09 -07:00
ZappoMan
793a14e25a first cut at new faster voxel pipeline 2013-10-01 10:37:14 -07:00
ZappoMan
0f74d4bda9 change nodeDeleted() to voxelDeleted() to improve readability 2013-09-30 15:50:31 -07:00
Stephen Birarda
43eed32e1d end is important, put it back 2013-09-30 15:42:07 -07:00
Stephen Birarda
ca68846c1b some deletions and cleanup based on Xcode analysis 2013-09-30 15:36:23 -07:00
ZappoMan
865bb7555f fix hang on preference dialog box 2013-09-30 15:27:02 -07:00
Stephen Birarda
617b905385 Merge pull request #996 from ey6es/master 
Transformation rejiggery to support Ryan's alien model.
 2013-09-30 14:34:26 -07:00
Andrzej Kapolka
71d68796f3 Remove whitespace. 2013-09-30 13:27:10 -07:00
Andrzej Kapolka
5dc7b64c03 Merge branch 'master' of https://github.com/worklist/hifi 2013-09-30 13:22:59 -07:00
Andrzej Kapolka
40d195595f Include the neck pivot when we get the eye locations. 2013-09-30 13:20:28 -07:00
Andrzej Kapolka
d4c4cbc981 Get the neck joint and position blend face relative to that. 2013-09-30 13:15:59 -07:00
Philip Rosedale
a22b3d28bf Merge branch 'master' of https://github.com/worklist/hifi 2013-09-30 12:44:07 -07:00
Philip Rosedale
f30ff1704a Fix to make touch-look MUCH smoother for flying around 2013-09-30 12:43:25 -07:00
Andrzej Kapolka
d4203ff3d3 Pivot fix. 2013-09-30 12:01:27 -07:00
Philip Rosedale
7a74432bef Merge pull request #994 from ZappoMan/voxel_geo_shader 
removed old normal support from voxel system only using global normals
 2013-09-30 11:37:09 -07:00
Andrzej Kapolka
1592aac177 Getting closer to the correct set of transforms. 2013-09-30 11:24:41 -07:00
Stephen Birarda
bb32da12f1 complete removal of fervor and C++11 array 2013-09-30 10:30:18 -07:00
ZappoMan
b6fe8befdc removed old normal support from voxel system only using global normals 2013-09-30 09:29:04 -07:00
Philip Rosedale
9645cd9831 Click on voxels as way of moving around 2013-09-28 15:18:59 -07:00
stojce
a0f23d409e Merging changes 2013-09-28 13:16:50 +02:00
stojce
bac228bdb8 Merge branch 'master' of https://github.com/worklist/hifi 2013-09-28 12:47:47 +02:00
Andrzej Kapolka
f8d26f207d Include the local transforms from the FBX file when rendering meshes. 2013-09-27 17:57:18 -07:00
ZappoMan
5dd4d8a8e1 Merge pull request #990 from PhilipRosedale/master 
Smooth flying, fixed spinning problem, top speed about Mach 1
 2013-09-27 16:22:49 -07:00
Philip Rosedale
1189ac2216 Merge pull request #989 from ZappoMan/voxel_geo_shader 
add support for global normals for voxels
 2013-09-27 15:10:53 -07:00
Freddy
c78aa591c5 Fix spinning while flying, top speed now about Mach 1 2013-09-27 15:08:10 -07:00
ZappoMan
8cffa8d872 add support for global normals for voxels 2013-09-27 15:04:44 -07:00
Philip Rosedale
549b863665 Merge pull request #988 from ZappoMan/voxel_geo_shader 
voxel rendering performance and debugging improvements
 2013-09-27 13:27:29 -07:00
ZappoMan
605c2f30cf add memory usage debugging 2013-09-27 10:17:10 -07:00
ZappoMan
eb6af1afbf fix byte normals, fix crashes in switching between voxel shader and normal mode 2013-09-27 09:02:51 -07:00
ZappoMan
fb85add6b4 Merge pull request #986 from PhilipRosedale/master 
Faceshift rotates body, slow near others for easier positioning
 2013-09-27 07:01:00 -07:00
Freddy
f88a3633a5 Slow down when near other avatars for easier positioning 2013-09-27 00:40:41 -07:00
Freddy
6b0f9314ba Faceshift drives body rotation, remove gyro-driven rotation 2013-09-26 23:52:44 -07:00
ZappoMan
2487a55be9 add support for use of Byte normals 2013-09-26 19:04:19 -07:00
Freddy
462d0b90c1 Merge branch 'master' of https://github.com/worklist/hifi 2013-09-26 17:26:59 -07:00
Philip Rosedale
0fbabe9891 Merge pull request #984 from ZappoMan/voxel_geo_shader 
Voxel Geometry Shader Experiment
 2013-09-26 17:22:55 -07:00
Freddy
e74950db24 Merge branch 'master' of https://github.com/worklist/hifi 2013-09-26 17:07:41 -07:00
ZappoMan
3f8e55da28 style cleanup 2013-09-26 16:46:34 -07:00
ZappoMan
5695429a78 style fixes 2013-09-26 16:36:59 -07:00
ZappoMan
fd0cc3b417 style fixes 2013-09-26 16:33:37 -07:00
ZappoMan
7845340279 menu cleanup, support for on the fly switching of maxVoxels and useVoxelShader 2013-09-26 16:26:49 -07:00
Freddy
ddcec39f04 Merge branch 'master' of https://github.com/worklist/hifi 2013-09-26 15:58:06 -07:00
Andrzej Kapolka
91999dfe1f Pupil dilation. 2013-09-26 15:48:11 -07:00
ZappoMan
552d9fadd8 rearranged menus, some hacking on voxel shader 2013-09-26 14:51:57 -07:00
Andrzej Kapolka
4dec183262 Enlarge heads when they're moused over. 2013-09-26 12:07:13 -07:00
Andrzej Kapolka
3ccf276137 Merge branch 'master' of https://github.com/worklist/hifi into grower 2013-09-25 18:06:27 -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
63efeccb13 Renaming for clarity. 2013-09-25 17:38:37 -07:00
Freddy
b4fa1dc7c2 Merge remote-tracking branch 'upstream/master' 2013-09-25 16:49:04 -07:00
Freddy
1dbc8459f8 adding measured angular velocity to faceshift 2013-09-25 16:46:26 -07:00
Andrzej Kapolka
736dae0c81 Use shaders for eyes (like the ones for the iris). 2013-09-25 15:26:29 -07:00
Andrzej Kapolka
7d14aaeea4 Merge branch 'master' of https://github.com/worklist/hifi into blendface 2013-09-25 14:39:43 -07:00
Andrzej Kapolka
6e8df9584e Faceshift starts reporting failure to track under load, so determine active 
state based on the amount of time elapsed since last successful tracking data
received.
 2013-09-25 14:37:53 -07:00
Andrzej Kapolka
402f65fc00 Use the blend face eye locations for the eye vectors, when possible. 2013-09-25 14:12:50 -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
b44e962ac7 Merge branch 'master' of https://github.com/worklist/hifi into blendface 2013-09-24 14:30:57 -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
Freddy
6bbe34a8c4 missing space 2013-09-23 23:06:32 -07:00
Freddy
36104d0b06 remove unused older voxel grab thrust 2013-09-23 23:04:27 -07:00
Freddy
027811e37c Increase thrust while holding keys down to allow very fast speeds 2013-09-23 22:53:35 -07:00
Andrzej Kapolka
aa6eb7b3d8 Render the "other" meshes as separate, static, white. 2013-09-23 16:34:28 -07:00
ZappoMan
3d4341cee4 hacking on voxel geometry shader 2013-09-23 15:18:45 -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
255e5179ae Let's actually use the variable we initialized. 2013-09-23 13:02:00 -07:00
Andrzej Kapolka
1a55c64299 Scale the normal contributions down. For some reason, their magnitudes are 
higher than one would expect.
 2013-09-23 12:42:58 -07:00
Andrzej Kapolka
807f6aaf14 Temporarily render the normals for debugging. 2013-09-23 12:20:19 -07:00
Andrzej Kapolka
c7bb523fc5 Apply the skin color to the blend face. 2013-09-23 12:15:02 -07:00
Andrzej Kapolka
1893fdba29 Revert "Trying a different method of updating the normals." 
This reverts commit 8e2be380f6.
 2013-09-23 11:47:59 -07:00
Andrzej Kapolka
8e2be380f6 Trying a different method of updating the normals. 2013-09-23 11:17:12 -07:00
Andrzej Kapolka
0fa2eca02d Remove option to use Faceshift rig (using the "macaw" model has much the same 
result, and it lets other people see it).
 2013-09-23 10:43:20 -07:00
Andrzej Kapolka
8c963ed6a7 Blend the normals, too. 2013-09-23 10:30:03 -07:00
Andrzej Kapolka
24bf1e2036 Don't render neck/neck base when blend face is active. 2013-09-20 17:55:31 -07:00
Andrzej Kapolka
133ba3a00a Set normals based on indices, cache face models. 2013-09-20 17:40:15 -07:00
Andrzej Kapolka
ddb0d916ae Merge branch 'master' of https://github.com/worklist/hifi into blendface 2013-09-20 16:50:38 -07:00
Andrzej Kapolka
9c2d851650 Fixed bug in decoding: newer versions of Qt streaming use whatever precision 
the stream is set at for both floats and doubles.
 2013-09-20 16:38:44 -07:00
Andrzej Kapolka
120f8f729c Find the mesh that corresponds to the blendshapes. 2013-09-20 15:28:08 -07:00
Stephen Birarda
f8f0e3db1b remove the sphere from the ground plane 2013-09-20 14:04:18 -07:00
Andrzej Kapolka
fe0d93102e Another slight face fix: clear the face when set, before loading the new one. 2013-09-20 13:46:29 -07:00
Andrzej Kapolka
df0b2f4eec Fix for face model sending. 2013-09-20 13:28:50 -07:00
Andrzej Kapolka
77d9e21162 Meant to include this in the last commit. 2013-09-20 10:06:34 -07:00
Andrzej Kapolka
2f5a5a4b27 Remove unnecessary, unlucky "13," add note explaining arbitrary translation. 2013-09-20 09:52:15 -07:00
Andrzej Kapolka
9d28aaefae Merge branch 'master' of https://github.com/worklist/hifi into blendface 2013-09-19 18:00:46 -07:00
Andrzej Kapolka
94d6f00f65 Parenting the info view to the menu is preventing the menu from showing up on 
Linux.  Let's try not doing that.
 2013-09-19 17:47:50 -07:00
Andrzej Kapolka
c049665090 Removed temporary comment. 2013-09-19 16:42:25 -07:00
Andrzej Kapolka
5c841616dc Merge branch 'master' of https://github.com/worklist/hifi into blendface 2013-09-19 16:37:26 -07:00
Andrzej Kapolka
a04ced633e Include the face model URL in the same packet as the avatar voxel URL. 2013-09-19 16:35:25 -07:00
Andrzej Kapolka
fff10375a9 Map the blendshapes by name. 2013-09-19 15:48:33 -07:00
Andrzej Kapolka
116a4e0bad Subtract the deltas. 2013-09-19 15:18:45 -07:00
Andrzej Kapolka
09fa782c61 More work on FBX reading. 2013-09-19 15:05:17 -07:00
Andrzej Kapolka
1bd8ea947a Merge branch 'master' of https://github.com/worklist/hifi into blendface 2013-09-18 17:14:58 -07:00
Stephen Birarda
bbbdc4f88c fixes for InfoView ownership and display 2013-09-18 16:42:51 -07:00
Andrzej Kapolka
dfea69ab8f Basic FBX parser. 2013-09-18 16:26:35 -07:00
Stephen Birarda
5393d75281 remove call to re-set default setting in InfoView 2013-09-18 14:39:35 -07:00
Stephen Birarda
8a901382a3 get rid of local and domain options in interface 2013-09-18 14:01:32 -07:00
Stephen Birarda
9fa695b71c allow setting of custom port via domainHostname setting 2013-09-18 13:50:14 -07:00
Stephen Birarda
ab85c4109d use QHostInfo and QHostAddress for DS changes in NodeList 2013-09-18 13:29:53 -07:00
Andrzej Kapolka
6be03ac3df Working on downloading the faces. 2013-09-18 10:10:24 -07:00
Andrzej Kapolka
596d0ac471 Subtract the neutral position from the blendshapes. 2013-09-17 17:01:17 -07:00
Andrzej Kapolka
617b3d67cf I think we need to treat the blend shapes as offsets from neutral. 2013-09-17 16:11:07 -07:00
Andrzej Kapolka
558d3d41a6 First attempt at blending. 2013-09-17 15:22:06 -07:00
Andrzej Kapolka
1afece81c5 Use quads as well as triangles, apply scale. 2013-09-17 11:49:50 -07:00
Andrzej Kapolka
b4ca66eb68 Merge branch 'master' of https://github.com/worklist/hifi into blendface 
Conflicts:
	interface/src/devices/Faceshift.cpp
 2013-09-17 11:05:11 -07:00
Andrzej Kapolka
262365f15f Only render the Perlin face for the local user. 2013-09-17 10:51:33 -07:00
Andrzej Kapolka
a4f79390f4 Fixed initialization order. 2013-09-17 10:25:27 -07:00
Andrzej Kapolka
1fce6c717b Working on shipping around the complete set of blendshape coefficients. 2013-09-16 17:28:04 -07:00
Andrzej Kapolka
f9426cbecc Working on reading and rendering the rig from Faceshift. 2013-09-16 15:49:40 -07:00
atlante45
ac0ee6c7d6 another merge commit 2013-09-14 14:41:03 -07:00
ZappoMan
facd60799e Merge pull request #931 from Atlante45/add_fs_data_in_head_data 
Add fs data in head data
 2013-09-14 14:04:37 -07:00
ZappoMan
2d545c8adb Merge pull request #924 from stojce/19418 
Code Review for Job #19418
 2013-09-14 14:00:09 -07:00
stojce
316f8a0345 Brace placement fix 2013-09-14 08:39:21 +02:00
atlante45
d6981bfa20 Andrejz Faceshift modif merge 2013-09-13 18:18:41 -07:00
LionTurtle
6613ad0591 Arrow keys now also control nudge guide. Avatar position is now fixed 
during nudge.
 2013-09-13 18:10:52 -07:00
LionTurtle
394e660ac3 Use WASD to move nudge guide instead of mouse. 
Nudge can be completed with return/enter key now.
Nudge is now accessible in any voxelEditMode.
 2013-09-13 17:51:10 -07:00
atlante45
7a2a79f6f5 Temp code for Brad to look at 2013-09-13 15:17:17 -07:00
atlante45
9ae7fab95f Merge branch 'master' of https://github.com/worklist/hifi into add_fs_data_in_head_data 2013-09-13 14:59:17 -07:00
LionTurtle
67bbcc4d9b Put upper bound on increasing nudge precision (i.e. making the nudge 
less precise).
 2013-09-13 14:08:21 -07:00
LionTurtle
86d1666d6a Add ifdef for OS X to show delete hotkey in edit menu 2013-09-13 13:49:19 -07:00
LionTurtle
0251349221 Change nudge UI to be more consistent with classic editing UI. 
Add menu option for Delete and fix delete for VoxelSelectMode.
 2013-09-13 13:41:26 -07:00
atlante45
683cfd6c8b Fixed Eye Open 2013-09-13 11:21:13 -07:00
stojce
4b993ec931 CR fixes 2013-09-13 20:10:27 +02:00
atlante45
87b4528e2c removed unmeant committed files 2013-09-12 17:54:57 -07:00
atlante45
7cd2f2b06b send faceshift data to avatar mixer 2013-09-12 17:41:26 -07:00
stojce
921e88ea5d Merge branch 'master' of https://github.com/worklist/hifi into 19418 
Merge branch 'master'
 2013-09-12 21:11:30 +02:00
stojce
eefe08e733 non OS X menu 
added help + about menu for non OS X
 2013-09-12 19:39:34 +02:00
LionTurtle
bb1feab661 Merge remote-tracking branch 'upstream/master' 2013-09-11 16:45:29 -07:00
LionTurtle
cef4837654 Fix voxel erase bug in nudge code. Fix rendering of nudge guide. 2013-09-11 16:43:50 -07:00
atlante45
64b462a4f0 Improved smile 2013-09-11 15:19:01 -07:00
stojce
330b1cdaf1 About menu 
added About menu - OS X version only
 2013-09-11 22:08:07 +02:00
atlante45
88e8ef7c7c eye opening and some better memory handling 2013-09-11 12:57:58 -07:00
atlante45
5618a784c7 Fixed perlin's face eyes 2013-09-11 10:51:31 -07:00
Andrzej Kapolka
80cc278bfa Increase the eye open scale. 2013-09-11 10:49:12 -07:00
Andrzej Kapolka
feecb4fa25 Fix for eyelids, change Faceshift menu option to indicate that it applies 
specifically to TCP connection.
 2013-09-11 10:44:38 -07:00
atlante45
ae5173a730 Added Jaw 2013-09-10 18:32:39 -07:00
atlante45
117565934c added smooth normals for lighting 2013-09-10 17:54:59 -07:00
Andrzej Kapolka
4b19e3d0fe Incorporate the "eye open" coefficients for eye widening. 2013-09-10 17:43:06 -07:00
RyanDowne
13c228e796 Added Smile 2013-09-10 17:33:22 -07:00
Andrzej Kapolka
b9878bbbd6 Adjustment to UDP code. 2013-09-10 16:55:59 -07:00
atlante45
61f9088d3e eyelib handling for faceshift 2013-09-10 16:35:14 -07:00
Andrzej Kapolka
5c7913068e Support for UDP input from Faceshift. 2013-09-10 16:21:08 -07:00
atlante45
85c3d54718 mouth handling on perlin faces 2013-09-10 15:33:09 -07:00
atlante45
4e3484021e PerlinFace implementation 2013-09-10 15:31:58 -07:00
stojce
a362fdc2ed name the current domain server 2013-09-10 21:51:50 +02:00
Andrzej Kapolka
cea645dfc7 Tweak to blink angles. 2013-09-10 12:34:41 -07:00
stojce
114cc065bd Merge branch 'master' of https://github.com/worklist/hifi into 19418 2013-09-10 21:05:44 +02:00