ZappoMan
afcf6dd3e0
type squish
2013-10-15 18:28:56 -07:00
Andrzej Kapolka
a79c0a9244
Removed unused shader.
2013-10-15 17:14:20 -07:00
Andrzej Kapolka
e2592fd9e7
Merge branch 'master' of https://github.com/worklist/hifi into skinny
2013-10-15 17:08:24 -07:00
Andrzej Kapolka
564c824143
Merge pull request #1063 from birarda/assignment
...
DS assignment JSON touchups
2013-10-15 17:04:32 -07:00
Andrzej Kapolka
6a265eacf2
Keep normal and dilatable textures in separate maps to fix crash on manly
...
"man" model.
2013-10-15 16:40:35 -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
84803854bf
Merge branch 'master' of https://github.com/worklist/hifi into skinny
2013-10-15 15:59:17 -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
Stephen Birarda
5523d52faf
Merge branch 'master' of github.com:worklist/hifi into assignment
2013-10-15 15:45:37 -07:00
Stephen Birarda
1ed2b3d8fe
add both fulfilled and queued assignments to DS json
2013-10-15 15:38:43 -07:00
Stephen Birarda
4cb657fa24
remove dependency on cJSON and use Qt instead
2013-10-15 15:29:51 -07:00
ZappoMan
6fff53a2dc
next round of voxelnode size improvements
2013-10-15 14:43:51 -07:00
Leonardo Murillo
97e0aeb707
Merge pull request #1062 from birarda/assignment
...
add a JSON endpoint for current assignments to DS
2013-10-15 14:43:30 -07:00
Stephen Birarda
2ec42a2a5d
revise linkage of civetweb for both DS and VS
2013-10-15 14:24:54 -07:00
Andrzej Kapolka
0a5ba79bbe
Merge branch 'master' of https://github.com/worklist/hifi into skinny
2013-10-15 14:01:53 -07:00
Stephen Birarda
41e1ec180c
add a JSON endpoint for current assignments
2013-10-15 13:45:40 -07:00
Andrzej Kapolka
66250ed488
Eye tweak.
2013-10-15 13:43:27 -07:00
ZappoMan
9800dc0fde
removed dead code
2013-10-15 13:40:55 -07:00
ZappoMan
05c9d4febc
added old style voxelnode for size comparison
2013-10-15 13:37:14 -07:00
ZappoMan
9d0ff1595a
make voxelnode population statistics static members instead of per node
2013-10-15 13:33:38 -07:00
Andrzej Kapolka
ce0d13feb4
Working on the neck transform.
2013-10-15 12:59:52 -07:00
ZappoMan
86ba5e3064
some size comparison debugging
2013-10-15 12:11:49 -07:00
ZappoMan
9ba39c3a84
removed center from AABox to further save memory
2013-10-15 12:05:54 -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
ZappoMan
c9b0edf345
first cut at reducing memory footprint of AABox
2013-10-15 11:29:04 -07:00
Stephen Birarda
2e84d1e213
Merge pull request #1061 from PhilipRosedale/option_to_hide_all_overlay
...
Option to hide all overlay
2013-10-15 11:11:58 -07:00
Philip Rosedale
746bce8626
All onscreen text, overlay OFF when stats are off
2013-10-15 11:01:22 -07:00
Philip Rosedale
19f20aa456
Merge branch 'master' of https://github.com/worklist/hifi into i-can-always-move
2013-10-15 10:34:22 -07:00
Philip Rosedale
9f05faa088
Merge pull request #1059 from ZappoMan/voxel_memory_stats
...
Voxel memory stats/Load voxels on persist thread/Save memory with VoxelNode size savings
2013-10-14 20:51:38 -07:00
Andrzej Kapolka
e97cfb8cf8
Per-pixel specular for blend faces.
2013-10-14 19:59:13 -07:00
Andrzej Kapolka
124966d2e4
More progress on skinning.
2013-10-14 18:39:19 -07:00
ZappoMan
9a2eaeb56f
Merge branch 'master' of https://github.com/worklist/hifi into keep_local_voxels
2013-10-14 16:49:25 -07:00
Andrzej Kapolka
db30e729d4
More work towards skinning.
2013-10-14 16:46:17 -07:00
ZappoMan
924053f2ec
added additional debugging of VoxelNode memory usage, shrunk size of VoxelNode by better alignment
2013-10-14 15:10:56 -07:00
ZappoMan
f0fc973db1
move loading of voxel file to the persist thread so that assignment client will load voxel server faster
2013-10-14 12:42:15 -07:00
ZappoMan
1513003ecd
added more stats to voxel server status
2013-10-14 12:20:50 -07:00
ZappoMan
3425685119
first cut at added voxel node memory usage debugging to client and server
2013-10-14 12:09:44 -07:00
ZappoMan
8c5c1aeae7
Merge pull request #1058 from ZappoMan/hide_cursor
...
make mouse cursor hiding more aware of focused window and bounds
2013-10-14 11:50:21 -07:00
ZappoMan
6f9fdfba2f
make mouse cursor hiding more aware of focused window and bounds
2013-10-14 11:39:48 -07:00
Andrzej Kapolka
ed0acd24f7
Merge branch 'master' of https://github.com/worklist/hifi into skinny
2013-10-14 10:40:30 -07:00
ZappoMan
5663fdd85a
Merge pull request #1057 from machinelevel/dev4
...
Leap interface and Avatar: left-hand IK works for Leap interface.
2013-10-14 10:21:43 -07:00
Eric Johnston
d5885acd75
Cleanup and simplification per feedback
2013-10-14 10:09:08 -07:00
Eric Johnston
7bc2cf6fa9
Leap interface and Avatar: left-hand IK works for Leap interface.
...
This is in and smooth, and there's a decision to be made:
In the case where only one hand is visible, we have to decide if it's the left or right hand. Currently it's simple, based on which side it's detected on.
So far this seems to work best, in the (very) common case where hands go in/out of the sensor's field frequently.
We could also use a history-based heuristic to hold one hand as left/right, but that means that when it guesses wrong the error lingers.
Detecting handedness based on where the thumbs are would be better, but is unreliable on the Leap.
I went for the simple/clear version, but we can do whatever we want.
2013-10-14 09:01:50 -07:00
ZappoMan
69a5b319a2
Merge branch 'master' of https://github.com/worklist/hifi into keep_local_voxels
2013-10-13 13:37:10 -07:00
Philip Rosedale
78b2f2665d
Merge pull request #1056 from birarda/master
...
add reset of node types of interest to NodeList reset
2013-10-11 18:51:20 -07:00
Philip Rosedale
8faf855c94
Merge branch 'master' of https://github.com/worklist/hifi into i-can-always-move
2013-10-11 17:55:55 -07:00
Andrzej Kapolka
adc5d4d256
Merge branch 'master' of https://github.com/worklist/hifi into skinny
2013-10-11 17:55:38 -07:00
Andrzej Kapolka
cec0ee0b22
Working on processing the cluster/skin information.
2013-10-11 17:51:29 -07:00
