Commit Graph

50 Commits (98299f2b3cf771850c0eab2ae165068d4487a0c0)

Author SHA1 Message Date
Marc Gilleron 98299f2b3c Optimize octree further by taking out children pointers. Nodes are only 5 bytes now. 2019-09-01 21:07:38 +01:00
Marc Gilleron 0ee054dc3c Took out position from octree nodes 2019-09-01 17:11:28 +01:00
Marc Gilleron bd10e89dea Implement proper box difference 2019-09-01 16:10:01 +01:00
Marc Gilleron 6369985b74 Fix problems with MinGW 2019-09-01 01:47:45 +01:00
Marc Gilleron d0275b29ee Apply split_scale to newly created octrees 2019-08-31 21:47:00 +01:00
Marc Gilleron 0e6d3873c7 Properly implement hiding of the terrain node, for LOD it was showing all blocks of all LODs at once 2019-08-31 21:46:40 +01:00
Marc Gilleron 8574655c18 Re-enabled request dropping through exclusive region, except for last lod 2019-08-30 01:08:06 +01:00
Marc Gilleron 6a540a8720 Remove old code 2019-08-30 00:04:20 +01:00
Marc Gilleron eb01f99c2c First WIP at paging LOD 2019-08-29 22:55:02 +01:00
Marc Gilleron d4ed6372b7 Optimize collision shapes, doubles build speed 2019-08-25 22:59:55 +01:00
Marc Gilleron 8fc1e40230 Line up statistics variable names 2019-08-25 18:47:43 +01:00
Marc Gilleron a0c7201fcd Rename `get_stats()` => `get_statistics()` 2019-08-25 17:40:19 +01:00
Marc Gilleron c13c0fbf20 Fix `remaining_main_thread_blocks` stat, it wasn't reported 2019-08-25 17:23:25 +01:00
Marc Gilleron 4ec82928b4 Remove redundant VoxelTerrain::BlockDirtyState 2019-08-25 15:14:10 +01:00
Marc Gilleron 4ff5f91e6f Add optional physics collision through node-less static bodies 2019-08-25 13:04:49 +01:00
Marc Gilleron 332041751d Move mesh instance into a thin wrapper 2019-08-25 01:11:38 +01:00
Marc Gilleron 9ca40b854b Don't stop threads when the terrain exits the tree, it prevents saving-on-destroy from completing 2019-08-24 23:26:01 +01:00
Marc Gilleron 68dfe9fc70 Fix crash where null maps were accessed 2019-08-24 22:38:27 +01:00
Marc Gilleron f14b374931 Made block size and a few other params modifiable (not so easy, though) 2019-08-24 01:44:27 +01:00
Marc Gilleron 07d4deeaab Formatting 2019-08-15 01:40:27 +01:00
Marc Gilleron c272a37f1a Merge branch 'master' into persistence
# Conflicts:
#	terrain/block_thread_manager.h
#	terrain/voxel_terrain.cpp
2019-06-25 20:51:35 +01:00
Cory Petkovsek 3b7dccefb2 Revert some castings 2019-06-22 22:14:27 +09:00
Cory Petkovsek f6a9c5761a Fix gcc sign comparison warnings 2019-06-18 14:24:56 +09:00
Cory Petkovsek 67bdcbd048 Gcc compiling fixes 2019-06-18 11:27:55 +09:00
Marc Gilleron f831d03cf5 Merge branch 'master' into persistence
# Conflicts:
#	terrain/voxel_data_loader.cpp
2019-05-28 01:17:28 +01:00
Marc Gilleron 2c81db52f8 Rename remaining occurences of "provider" => stream 2019-05-28 01:10:50 +01:00
Marc Gilleron 82502d3397 Simple file-per-block saving WIP. Compiles but didn't test. 2019-05-28 00:40:09 +01:00
Marc Gilleron 2e1b13ffea Rename VoxelProvider* => VoxelStream* 2019-05-25 16:07:38 +01:00
Marc Gilleron 75cffa7d59 Rename VoxelBlock.pos => position 2019-05-25 15:50:01 +01:00
Marc Gilleron 15ae1b99ba Rename voxel_provider_thread.h => voxel_data_loader.h to match class name 2019-05-25 15:07:16 +01:00
Marc Gilleron 5a7d0b6f1b Added optional code to debug-draw unexpected block drops 2019-05-20 20:49:46 +01:00
Marc Gilleron d8cab2d32b Use generic block manager for loading and fix bugs:
- VoxelProviderThread is now VoxelDataLoader and uses generic block manager
- Fixed threads locking up, input mutex was not always unlocked due to for loop exiting early
- Fixed blocks failing to load, region rejection was using invalid pointer
- Fixed block shifting in region rejection, was replacing wrong index in `block_indexes`
- Fixed block region rejection missing blocks, was not stepping back the loop after shifting blocks
- Added output message to notify of block rejection
2019-05-20 20:48:58 +01:00
Marc Gilleron ceb7f47fa1 Don't bother calling `remove_positions_outside_box`, it's not doing anything currently 2019-05-20 20:34:41 +01:00
Marc Gilleron e47afabe49 Sort blocks using a heuristic, take look direction into account 2019-05-19 21:04:26 +01:00
Marc Gilleron b9add5d671 Allow more than one thread for mesh updates, also made it generic 2019-05-19 18:27:49 +01:00
Marc Gilleron efe58f1af6 Added exclusive area parameter to block processors so they can remove blocks from their queue 2019-05-12 16:33:25 +01:00
Marc Gilleron 561f95a506 Added stats for dropped block loads and meshs 2019-05-12 16:30:45 +01:00
Marc Gilleron a521501add Move both meshing and loading sheduling to LodOctree polling 2019-05-10 18:56:48 +01:00
Marc Gilleron 29298958e7 Fix mistake in previous commit about missing binding argument 2019-05-10 00:57:09 +01:00
Marc Gilleron 255acbb739 Remove wrong CRASH_COND, also use get/setters for VoxelBlock properties 2019-05-09 22:00:54 +01:00
Marc Gilleron cf7ece7a58 Remove BlockState and replace it with loading_blocks set and enum inside VoxelBlock 2019-05-09 19:11:17 +01:00
Marc Gilleron 73d5d9993c Load blocks on demand instead of speculatively, it's faster 2019-05-08 20:53:51 +01:00
Marc Gilleron d21974e122 Changed debug methods, also fixed blocked lods due to small block region extent 2019-05-08 00:57:34 +01:00
Marc Gilleron 40ccdd8fea Expose material and LOD settings 2019-05-05 19:54:47 +01:00
Marc Gilleron 310e2172ff Added stat to monitor LODs blocked by non-ready meshes 2019-05-05 19:15:50 +01:00
Marc Gilleron 1f219e68eb Added marching square skirts to hide most LOD cracks 2019-05-05 03:56:18 +01:00
Marc Gilleron d93f23337a Added stats to VoxelLodTerrain 2019-05-05 01:09:12 +01:00
Marc Gilleron 8850019dc4 Put LodOctree child position calculation in a function 2019-05-04 17:58:33 +01:00
Marc Gilleron 295374b99f Don't subdivide or unsubdivide if meshes aren't ready 2019-05-04 16:29:52 +01:00
Marc Gilleron 9bab6c04d1 Added VoxelLodTerrain, focused on LOD. No seam management, no editing yet. 2019-05-04 00:02:10 +01:00