Commit graph

1384 commits

Author SHA1 Message Date
ZappoMan
c25b03dd58 first cut at keeping local voxels 2013-10-09 14:02:31 -07:00
ZappoMan
8baa863242 fixed PPS bugs in threaded version of PacketSender class 2013-10-07 17:34:41 -07:00
ZappoMan
5f6fb3a3ae added some timing debugging 2013-10-05 00:55:34 -07:00
ZappoMan
0c70a05732 make view frustum oversend and don't remove oversend in client 2013-10-04 21:36:21 -07:00
ZappoMan
84862310d1 fix sendVoxelEditMessage() to honor jurisdictions, cleanup some threading/nonthreading behavior in PacketSender 2013-10-03 10:25:00 -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
90c64ab25c more work on handleing pending packets in VoxelEditPacketSender 2013-10-02 16:33:06 -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
Philip Rosedale
cebd8e5f4b Merge pull request #997 from birarda/assignment
file of static assignments for DS
2013-10-01 13:47:10 -07:00
ZappoMan
df4b64447b cleanup calls to markWithChangedTime() to happen after all changes made 2013-10-01 13:02:32 -07:00
ZappoMan
f1b28b929d fix a couple crashes disable emitting import progress in non-import case 2013-10-01 12:25:34 -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
94f7b98a5c handle mutli-VS config in DS when creating static file 2013-09-30 14:27:54 -07:00
Stephen Birarda
fb27e37607 have AC making create request use its own UUID 2013-09-30 14:09:46 -07:00
Stephen Birarda
b3bd159d09 don't send create assignment request until connection to DS 2013-09-30 13:57:42 -07:00
Stephen Birarda
774eef1c12 logging touchups in voxel-server 2013-09-30 13:36:36 -07:00
Stephen Birarda
32314ad540 have VS send UUID with check in for static assignment behavior 2013-09-30 13:34:22 -07:00
Stephen Birarda
38873c0693 some assignment debug cleanup 2013-09-30 13:26:31 -07:00
Stephen Birarda
0e5c5886b6 touchups to DS with static assignment file 2013-09-30 13:11:46 -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
Stephen Birarda
a8d55644e9 Assignment as LinkedData, add back to queue on node death 2013-09-30 11:04:42 -07:00
Stephen Birarda
ef1ff01188 resolve conflicts on merge with upstream/master 2013-09-30 10:12:54 -07:00
ZappoMan
b6fe8befdc removed old normal support from voxel system only using global normals 2013-09-30 09:29:04 -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
ZappoMan
8cffa8d872 add support for global normals for voxels 2013-09-27 15:04:44 -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
Philip Rosedale
0fbabe9891 Merge pull request #984 from ZappoMan/voxel_geo_shader
Voxel Geometry Shader Experiment
2013-09-26 17:22:55 -07:00
ZappoMan
5695429a78 style fixes 2013-09-26 16:36:59 -07:00
ZappoMan
7845340279 menu cleanup, support for on the fly switching of maxVoxels and useVoxelShader 2013-09-26 16:26:49 -07:00
Stephen Birarda
db1dacbbf4 some refactoring for DS, add create assignments to file 2013-09-26 15:56:41 -07:00
Andrzej Kapolka
91999dfe1f Pupil dilation. 2013-09-26 15:48:11 -07:00
Stephen Birarda
70c5d3e349 decouple DS from main, move to C++11 2013-09-26 15:03:43 -07:00
Stephen Birarda
bed4819313 inital setup for static assignment mapped file 2013-09-24 14:41:26 -07:00
ZappoMan
3d4341cee4 hacking on voxel geometry shader 2013-09-23 15:18:45 -07:00
Stephen Birarda
e774419f8d Merge branch 'master' of github.com:worklist/hifi into assignment 2013-09-20 17:39:03 -07:00
Stephen Birarda
6533d7fcde add method to packet sender to flush queue without sleep 2013-09-20 14:40:09 -07:00
Andrzej Kapolka
318b8c38bc Merge branch 'master' of https://github.com/worklist/hifi into blendface 2013-09-20 09:58:54 -07:00
Stephen Birarda
962dc0616d Merge pull request #966 from ZappoMan/multi_VS_assigments
remove standalone voxel server
2013-09-20 09:57:38 -07:00
ZappoMan
b682d3612b remove standalone voxel server 2013-09-19 22:09:03 -05: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
09fa782c61 More work on FBX reading. 2013-09-19 15:05:17 -07:00
Stephen Birarda
23e7278be5 re-use the check in packet sent to the domain-server, allow reset 2013-09-19 12:58:48 -07:00
Stephen Birarda
92c106a6bb refresh the UUID when sending out new AM assignments 2013-09-19 12:30:40 -07:00
Stephen Birarda
de276eff00 temporary removal of DS packet optimization for NodeList dynamism 2013-09-18 17:56:45 -07:00