Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-16 19:37:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
16974 commits 25 branches 0 tags 1.1 GiB
Commit graph

853 commits

Author SHA1 Message Date
Brad Hefta-Gaub
550ec8a9c7 changed all fmin to std::min 2014-01-10 21:42:01 -08:00
Brad Hefta-Gaub
26adabf130 removed voxel addSphere since it wasn't compiling and was old debug code 2014-01-10 21:39:03 -08:00
Brad Hefta-Gaub
b0f8e21d06 more windows build hackery 2014-01-10 20:36:37 -08:00
Brad Hefta-Gaub
c181d0a849 first cut at local voxel cache 2014-01-09 12:05:09 -08:00
Brad Hefta-Gaub
abf8e83c33 change Voxels JS interface to be more clear 2014-01-05 11:09:16 -08:00
Andrzej Kapolka
6c27569e9b Fix arm bending, compile warning. 2014-01-02 13:23:15 -08:00
ZappoMan
48b2d7d3fa scripting for particle to voxel collisions 2013-12-31 11:33:43 -08:00
ZappoMan
651d2d0c81 rename voxels and particles scripting interfaces 2013-12-31 09:41:35 -08:00
ZappoMan
8f1fbec057 added versioning to SVO files and Particle inHand support 2013-12-16 19:49:22 -08:00
ZappoMan
c2d5accbc9 implement OctreeScriptingInterface base class to share common behavior for particle and voxel scripting 2013-12-14 13:25:33 -08:00
ZappoMan
03c72134cb first cut at creatorTokenIDs for creating particles 2013-12-11 15:38:52 -08:00
ZappoMan
4df2f2189d moved voxels scripting interface 2013-12-06 16:07:59 -08:00
ZappoMan
c067f8ad11 moved most of VoxelEditPacketSender into new generic base class OctreeEditPacketSender 2013-12-05 16:27:35 -08:00
ZappoMan
aec0e9f4aa added basic particle server renamed voxel packet names to fit standard 2013-12-04 21:00:00 -08:00
ZappoMan
5ff12ab8d1 first cut at getting voxel server based on octree server 2013-12-04 17:41:52 -08:00
ZappoMan
2b27c91550 Merge branch 'master' of https://github.com/worklist/hifi into particle_server 
Conflicts:
	interface/src/VoxelSystem.cpp
	interface/src/VoxelSystem.h
 2013-12-04 11:40:54 -08:00
ZappoMan
188d52c06e get client working in refactored mode 2013-12-04 10:05:37 -08:00
ZappoMan
d7ae023492 make addChildAtIndex() use createNewElement() so we get our correct classes 2013-12-03 20:40:40 -08:00
ZappoMan
9faef65ccc first cut at splitting out octree base classes 2013-12-03 17:32:02 -08:00
Stephen Birarda
3277cb49a6 Merge remote-tracking branch 'upstream/master' into cleanup 2013-12-03 12:21:03 -08:00
Stephen Birarda
bdf9f9eb22 remove extra debugging line 2013-12-03 12:11:31 -08:00
Stephen Birarda
5143c68b91 fix packet sending from VoxelScriptingInterface 2013-12-03 12:09:47 -08:00
Stephen Birarda
141394a664 replace UDPSocket with QUDPSocket 2013-12-02 13:34:29 -08:00
ZappoMan
040ad1853e properly handle sequence numbers to not skip when supressing duplicate packets 2013-11-27 15:33:48 -08:00
ZappoMan
7f9d0849bd added more client side voxel stats including lost packets, out of order packets, and average flight time 2013-11-27 13:37:47 -08:00
ZappoMan
17e979dc9f improved client side stats, don't suppress initial stats message in server since it includes jurisdiction 2013-11-27 10:20:49 -08:00
ZappoMan
7cc5339702 cleanup comments and coding standard 2013-11-27 07:40:23 -08:00
ZappoMan
dac211cebd pack more compressed sections into wire packets if there is room 2013-11-26 22:18:24 -08:00
ZappoMan
b7ee2ea2db add section size to compressed packets to allow packing of multiple sections 2013-11-26 19:47:14 -08:00
ZappoMan
77590b5b87 cleanup debug, readd fix to not recurse subtrees when node is colored 2013-11-26 19:23:21 -08:00
ZappoMan
491512fbce major pass on cleaning up voxel packets to have flags, sequence numbers, and flight time, add compression menu item 2013-11-26 17:26:54 -08:00
ZappoMan
a60cf0f34e fix issue with copy 2013-11-25 15:52:30 -08:00
ZappoMan
d13ebf6095 more menu cleanup removing developer options that are now defunct 2013-11-25 14:44:34 -08:00
ZappoMan
de26b950f8 cleanup menu defaults 2013-11-25 14:25:09 -08:00
ZappoMan
66ebaae7c8 added debugging/logging of sleep times removed bail early loging in send thread since it wasn't needed and reduced sending potential in high PPS case 2013-11-25 13:34:53 -08:00
ZappoMan
78d39ed948 added timing details for better debugging and results measurement 2013-11-25 10:41:07 -08:00
ZappoMan
78a8f2d0cc added comments 2013-11-25 08:56:37 -08:00
ZappoMan
17f5530893 fixed wasted bitmasks bug where we would include colors and extra layers 2013-11-25 01:42:19 -08:00
ZappoMan
8bb2bd2ecf get voxel packet statistics to work and add them to server status page 2013-11-25 00:26:37 -08:00
ZappoMan
8d8d73a940 start of statistics, convert level key into class 2013-11-24 20:49:47 -08:00
ZappoMan
ed80895eb3 fix issue where we sometimes don't completely fill a packet mid scene 2013-11-24 20:29:54 -08:00
ZappoMan
0cd269632e fix bug where some parts of scene weren't sent, turned out it was in the octal code not fitting voxels getting ignored 2013-11-24 17:49:10 -08:00
ZappoMan
3ef7c1a732 moved const definitions to better file 2013-11-24 15:28:50 -08:00
ZappoMan
25511f99ec cleanup for coding standard 2013-11-24 15:22:44 -08:00
ZappoMan
94584d4ead disable voxel packet compression for now 2013-11-24 15:01:37 -08:00
ZappoMan
e2f5069e6a more VoxelPacket compression tuning 2013-11-24 14:41:50 -08:00
ZappoMan
57633f8b92 fixed comment 2013-11-24 00:05:06 -08:00
ZappoMan
ba26e5c3e3 add back non-compression mode to VoxelPacket and tweaks to how compression works to make it more efficient 2013-11-24 00:02:51 -08:00
ZappoMan
c28027b7ca better compressed packets with fewer calls to checkCompress 2013-11-23 22:30:15 -08:00
ZappoMan
e65f74e06b moved compression into VoxelPacket class. works, but too slow for larger sizes 2013-11-23 21:40:50 -08:00
ZappoMan
cd1d3765a9 cleaned up const semantics and DRYed up appendBitMask 2013-11-23 16:28:21 -08:00
ZappoMan
0f66f4c1bd Revert "cleaned up some comments and code" 
This reverts commit 99c427c97d.
 2013-11-23 16:19:57 -08:00
ZappoMan
99c427c97d cleaned up some comments and code 2013-11-23 16:18:18 -08:00
ZappoMan
cb43b0dea1 cleaned up some comments and code 2013-11-23 15:10:03 -08:00
ZappoMan
b0cc6494da cleaned up some comments and code 2013-11-23 14:58:23 -08:00
ZappoMan
7ff7b13c6b cleaned up some comments 2013-11-23 14:52:34 -08:00
ZappoMan
0ed31b5b9f tweaks and cleanup 2013-11-23 14:14:00 -08:00
ZappoMan
ae5d5324c1 added some comments to VoxelPacket 2013-11-23 14:02:46 -08:00
ZappoMan
4c0569fc60 removing compression from VoxelNodeData to eventually move it into VoxelPacket where it belongs 2013-11-23 13:55:21 -08:00
ZappoMan
b1a0ed6480 remove old buffer style approach to encoding 2013-11-23 13:36:38 -08:00
ZappoMan
661152956a clean up comments 2013-11-23 13:23:03 -08:00
ZappoMan
00b3451729 properly handle update fails when encoding 2013-11-23 13:11:06 -08:00
ZappoMan
b1adf82d4b cleaned up const semantics in streaming voxel packets, fixed double reset bug 2013-11-23 13:05:37 -08:00
ZappoMan
1d88399476 cleaning up semantics of VoxelPacket 2013-11-22 20:39:11 -08:00
ZappoMan
0cd0012aab cleaning up semantics of VoxelPacket 2013-11-22 20:08:58 -08:00
ZappoMan
9d8f0b82df make append() private 2013-11-22 17:59:47 -08:00
ZappoMan
69eee541db removed some old debug, standardize callers of VoxelPacket to use semantic entry points instead of direct access to bytes 2013-11-22 17:53:25 -08:00
ZappoMan
01488ed332 don't send any voxel stats till we've succesfully encoded at least one voxel 2013-11-22 17:23:12 -08:00
ZappoMan
a426f97e52 removing some debug output 2013-11-22 10:04:59 -08:00
ZappoMan
48dad5ab86 fix bug in packet filling related to octcodes for new trees not fitting 2013-11-22 09:49:50 -08:00
ZappoMan
4fc9d5409c voxel sender now uses maximum bytes in packets with VoxelPacket class 2013-11-21 23:46:12 -08:00
ZappoMan
c25199c80a removed some debugging 2013-11-21 21:27:37 -08:00
ZappoMan
b9429eeb1e working version of writeToSVO that uses VoxelPacket and fills it to limit before writing 2013-11-21 21:18:31 -08:00
ZappoMan
5a9baf2779 moved some debug code 2013-11-21 20:36:09 -08:00
ZappoMan
e8c3670cdd added packet.reset() in writeToSVO() 2013-11-21 20:18:19 -08:00
ZappoMan
e0c55be4e2 more debug 2013-11-21 15:21:29 -08:00
ZappoMan
9784288b63 added some debugging 2013-11-21 13:51:40 -08:00
ZappoMan
e2e9c29824 implement old vs new side by side encoding to test for correctness 2013-11-21 13:26:28 -08:00
ZappoMan
6c640752cd make compression optional 2013-11-21 12:04:13 -08:00
ZappoMan
a590f384a6 Merge branch 'master' of https://github.com/worklist/hifi into compressed_packets 2013-11-21 11:33:08 -08:00
ZappoMan
e959be82f8 Merge branch 'master' of https://github.com/worklist/hifi into keep_local_voxels 2013-11-21 11:18:47 -08:00
ZappoMan
6881d9fb36 fix to crash in client side VoxelSceneStats crash 2013-11-19 22:57:42 -08:00
ZappoMan
8c90e96740 addeding VoxelPacket class for encoding bit streams 2013-11-19 15:36:21 -08:00
ZappoMan
4da70cf3c8 fix to crash on deleteNotify 2013-11-15 16:45:03 -08:00
ZappoMan
3c17c70541 Merge branch 'master' of https://github.com/worklist/hifi into keep_local_voxels 2013-11-13 17:15:41 -08:00
ZappoMan
496f3a1380 removed some noise, and made persist thread less sleepy 2013-11-13 16:37:08 -08:00
ZappoMan
e32bfc38f5 change voxelServersExist() to make sure that all existing voxel servers have a legitimate jurisdiction 2013-11-13 01:06:17 -08:00
ZappoMan
2b604864d6 fix bug where VoxelEditPacketSender oversends to unknown jurisdictions 2013-11-12 00:35:55 -08:00
ZappoMan
af8438b098 add stats to voxel server to show average voxel edit packet statistics 2013-11-11 16:31:36 -08:00
ZappoMan
977b730fc0 add support for tuning the size of packets used by VoxelEditPacketSender 2013-11-10 12:44:20 -08:00
ZappoMan
1a6efea5c0 improvements to PPS behavior of PacketSender 2013-11-10 10:39:56 -08:00
ZappoMan
a9c5c0707f added sentAt timestamps to voxel edit packets so we can measure transit time 2013-11-08 10:32:46 -08:00
ZappoMan
a75e577d0a voxel edit packet debugging support 2013-11-08 09:32:06 -08:00
ZappoMan
20c66386f8 fix comment 2013-11-08 02:24:46 -08:00
ZappoMan
8043970df7 bug fixes to JurisdictionListener, PacketSender, addition of packetsToSendCount() to Voxels JS 2013-11-08 02:22:10 -08:00
ZappoMan
cad51885e8 removed some hackery 2013-11-07 17:21:45 -08:00
ZappoMan
19515c80fd Merge branch 'master' of https://github.com/worklist/hifi into new_voxel_scene_stats 
Conflicts:
	interface/src/Application.cpp
 2013-11-07 16:44:34 -08:00
ZappoMan
b5f6a51728 fix thread contention issues and VS crash on domain server shutdown and restart 2013-11-07 13:03:04 -08:00
ZappoMan
76ad42015a added debugging to JurisdictionMap for server crashes 2013-11-06 16:41:08 -08:00
ZappoMan
f9291e6e5c implement ReadWriteLock for VoxelTree to fix crashes in VoxelServer 2013-11-06 15:22:17 -08:00
ZappoMan
987ce16b10 more potential fixes for voxel server crashes 2013-11-06 01:55:04 -08:00
ZappoMan
7cbebf3941 fixed warning and logic problem 2013-11-05 13:11:35 -08:00
ZappoMan
6dc7f68f0e Merge pull request #1185 from birarda/assignment 
add helper to ping if no active socket
 2013-11-05 12:55:06 -08:00
Stephen Birarda
eef6fd53eb cleanup node type check in JL 2013-11-05 12:37:38 -08:00
Stephen Birarda
771021995b add helper to ping with inactive socket 2013-11-05 12:34:56 -08:00
ZappoMan
e296be8c7a make numberOfThreeBitSectionsInCode() robust against overflowing buffers if length is known 2013-11-05 12:31:20 -08:00
ZappoMan
9060020279 style cleanup 2013-11-05 11:33:28 -08:00
ZappoMan
4cab991c02 style cleanup 2013-11-05 11:24:51 -08:00
ZappoMan
1c4163b010 add guards against buffer overflow in voxel server for edit/delete voxel packets 2013-11-05 11:12:14 -08:00
ZappoMan
581e0adecf Merge branch 'master' of https://github.com/worklist/hifi into new_voxel_scene_stats 
Conflicts:
	interface/src/Application.cpp
 2013-11-05 10:45:30 -08:00
ZappoMan
09dab892d3 first cut at new voxel scene stats 2013-11-05 10:29:56 -08:00
ZappoMan
7daff4c279 coding standard cleanup 2013-11-04 15:36:46 -08:00
ZappoMan
9e88cfe953 initlaize sortedChildren[] array to help prevent possible crashes 2013-11-04 15:33:28 -08:00
Stephen Birarda
5c3075401a add a guard for JurisdictionListener kill for missing UUID 2013-11-04 12:03:04 -08:00
ZappoMan
054f49808f Merge branch 'master' of https://github.com/worklist/hifi into bugfixes 
Conflicts:
	libraries/voxel-server-library/src/VoxelSendThread.cpp
 2013-10-30 16:48:50 -07:00
ZappoMan
ac236b9ed8 if LOD changes than don't consider WasInView on server 2013-10-30 16:26:42 -07:00
ZappoMan
3445a15d61 fix build buster 2013-10-30 12:35:42 -07:00
ZappoMan
580102bb38 more work on LOD slider 2013-10-30 11:01:37 -07:00
ZappoMan
fbc3a4d2c1 first cut at user adjustable LOD 2013-10-29 16:16:58 -07:00
Philip Rosedale
2931e2e41a Merge pull request #1138 from ZappoMan/bugfixes 
add mutex for _nodesRequestingJurisdictions to fix crash
 2013-10-29 09:49:15 -07:00
Philip Rosedale
6b3a1de22b Merge pull request #1139 from ZappoMan/voxelnode_memory_savings 
VoxelNode memory savings
 2013-10-29 09:48:53 -07:00
ZappoMan
4874eda317 add mutex for _nodesRequestingJurisdictions to fix crash 2013-10-28 22:16:36 -07:00
ZappoMan
905fd48e84 fix blinking 2013-10-28 16:03:29 -07:00
ZappoMan
97070607ea added SIMPLE_EXTERNAL_CHILDREN mode, which saves on most of our child VoxelNode children storage without being too complicated 2013-10-28 14:43:27 -07:00
ZappoMan
03b2ace488 moved blended _children union into BLENDED_UNION_CHILDREN 2013-10-28 12:54:37 -07:00
ZappoMan
87a44bafc9 added population data back for SIMPLE_CHILD_ARRAY implementation 2013-10-28 12:37:47 -07:00
ZappoMan
e3c64429b9 added SIMPLE_CHILD_ARRAY implementation to temporarily work around memory corruption 2013-10-28 12:10:30 -07:00
ZappoMan
b8a87294e6 added guard to protect against external child access 2013-10-25 14:22:56 -07:00
ZappoMan
dcccfb7ef0 temporarily force external child storage 2013-10-25 14:03:49 -07:00
ZappoMan
953196510f removed some dead code 2013-10-25 00:07:34 -07:00
ZappoMan
9492c3de18 various memory leaks and compiler warning fixes 2013-10-25 00:05:52 -07:00
ZappoMan
4a74499ea1 removed asserts and replaced with error messages 2013-10-24 17:43:38 -07:00
ZappoMan
0368e8c75e cleanup bit field positions 2013-10-24 14:27:47 -07:00
ZappoMan
015adeedcb first cut at splitting out PACKET_TYPE_VOXEL_QUERY from PACKET_TYPE_HEAD_DATA 2013-10-24 13:22:31 -07:00
ZappoMan
b4c88a85f8 improvements to subtle moves for view frustum and voxel serving 2013-10-23 17:49:58 -07:00
ZappoMan
aa5e2b6a19 memset to 0 in VoxelNode to address potential memory corruption 2013-10-23 10:54:02 -07:00
ZappoMan
303f4a8ce4 improved VoxelNode delete of children 2013-10-21 14:44:46 -07:00
ZappoMan
ca7225e525 fix reset of VoxelSystem on eraseAllVoxels() 2013-10-17 18:45:52 -07:00
ZappoMan
370defdc4a fixed comment 2013-10-17 16:16:20 -07:00
ZappoMan
9b0cc14552 fix voxel nodes to work with new UUID format 2013-10-17 16:14:06 -07:00
Stephen Birarda
42de553e32 Merge branch 'master' of github.com:worklist/hifi into assignment 2013-10-17 14:51:20 -07:00
ZappoMan
a11b6858d3 fix small stats bug 2013-10-17 14:43:19 -07:00
Stephen Birarda
73d3ecccf3 resolve conflicts on merge with upstream master 2013-10-17 14:37:58 -07:00
Stephen Birarda
8f1135feb7 more repairs to Agent and AvatarData for UUID transition 2013-10-17 14:35:42 -07:00
Stephen Birarda
d7d8d76b07 fix ping of VS from agent 2013-10-17 13:58:00 -07:00
ZappoMan
8d7874b01b add guards to prevent runaway reaverageVoxels(), added stats to see if 4 children could be packed internally 2013-10-17 13:47:18 -07:00
Stephen Birarda
74e66dfd35 push various PACKET_TYPES, repairs to Agent for UUID setup 2013-10-17 13:35:53 -07:00
ZappoMan
6688b450c5 cleaned up some printf's to qDebug's 2013-10-17 12:31:18 -07:00
ZappoMan
8448e47df8 cleanup dead code 2013-10-17 12:27:23 -07:00
ZappoMan
095b716366 make population stats use public getters and private member variables 2013-10-17 12:16:03 -07:00
ZappoMan
c5deed36b0 added ifdefs for HAS_AUDIT_CHILDREN and added more memory tracking stats 2013-10-17 11:56:18 -07:00
Stephen Birarda
fa146e302d remove 16-bit node IDs and replace with UUIDs 2013-10-17 11:49:41 -07:00
ZappoMan
296f18a844 make offset bounds match 20 bit storage 2013-10-17 09:58:28 -07:00
ZappoMan
d2bab77c88 implement support for three children encoding 2013-10-16 21:42:47 -07:00
ZappoMan
1e5ce8a7e5 first cut at really getting _children UNION to work 2013-10-16 12:54:37 -07:00
ZappoMan
6fff53a2dc next round of voxelnode size improvements 2013-10-15 14:43:51 -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
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
ZappoMan
c9b0edf345 first cut at reducing memory footprint of AABox 2013-10-15 11:29:04 -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
3425685119 first cut at added voxel node memory usage debugging to client and server 2013-10-14 12:09:44 -07:00
ZappoMan
c86bad77c9 progress on keep local voxels 2013-10-10 15:23:22 -07:00
ZappoMan
d939d3aaae Merge branch 'master' of https://github.com/worklist/hifi into keep_local_voxels 2013-10-09 14:02:40 -07:00
ZappoMan
c25b03dd58 first cut at keeping local voxels 2013-10-09 14:02:31 -07:00
Andrzej Kapolka
aa353a57ad Fix for mouse ray with off axis projection. 2013-10-09 13:38:06 -07:00
Andrzej Kapolka
dfd5f7d53e Fix for screwy view when you lean too far forward. 2013-10-09 10:40:20 -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
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
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
ZappoMan
b6fe8befdc removed old normal support from voxel system only using global normals 2013-09-30 09:29:04 -07: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
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
ZappoMan
3d4341cee4 hacking on voxel geometry shader 2013-09-23 15:18:45 -07:00
ZappoMan
4eedc6df29 make TREE_SCALE roughly 10 miles 2013-09-16 22:39:47 -07:00
LionTurtle
6f8ab7a6c6 Fix sign error in nudge code that made nudging in the negative Z 
direction buggy.
 2013-09-13 10:50:29 -07:00
LionTurtle
99db8491ef Get rid of qDebug statements in VoxelTree.cpp. 2013-09-12 17:41:02 -07:00
LionTurtle
71d5f3d2d8 Fix for copy/cut/paste single voxel leaves. 2013-09-12 17:38:16 -07:00
LionTurtle
cef4837654 Fix voxel erase bug in nudge code. Fix rendering of nudge guide. 2013-09-11 16:43:50 -07:00
LionTurtle
3b464094d9 Remove magic numbers, fix spacing, and other code clean up in nudge code. 2013-09-10 11:09:50 -07:00
LionTurtle
f41533fee6 Add nudgeVoxel shading in grid. Fix erase bug. 2013-09-09 18:23:37 -07:00
LionTurtle
b0803c1267 Merge remote-tracking branch 'upstream/master' 2013-09-09 16:54:34 -07:00
LionTurtle
ac878c9c63 UI for nudge completed! 2013-09-09 16:53:31 -07:00
Andrzej Kapolka
26411a42b1 More focal length bits. 2013-09-06 15:07:15 -07:00
LionTurtle
d965789812 Switching nudge to cut/paste implementation. Preliminary. 2013-09-06 11:40:35 -07:00
LionTurtle
59943dc2e8 Merge branch 'nudge' 
Conflicts:
	interface/src/Menu.cpp
	libraries/voxels/src/VoxelTree.h
 2013-09-05 17:58:39 -07:00
LionTurtle
868ef8bec6 Add VoxelNudgeMode and preliminary UI grid for nudging. 2013-09-05 17:42:25 -07:00
LionTurtle
647bd5b704 Got rid of delete in nudge. Create is already destructive. 2013-09-05 11:30:23 -07:00