b00ec1ccad
Merge branch 'master' into persistence
2019-08-09 20:07:43 +01:00
2e6256f6a5
Revert adding material property to fix error message
2019-07-06 00:19:29 +09:00
18626133cd
Allow set_material from gdscript
2019-07-04 00:58:39 +09:00
c272a37f1a
Merge branch 'master' into persistence
...
# Conflicts:
# terrain/block_thread_manager.h
# terrain/voxel_terrain.cpp
2019-06-25 20:51:35 +01:00
b13dccd998
Fix gcc shadow warning
2019-06-22 23:24:34 +09:00
3b7dccefb2
Revert some castings
2019-06-22 22:14:27 +09:00
f6a9c5761a
Fix gcc sign comparison warnings
2019-06-18 14:24:56 +09:00
0b854725f0
Fix gcc Wparentheses warnings
2019-06-18 12:13:44 +09:00
67bdcbd048
Gcc compiling fixes
2019-06-18 11:27:55 +09:00
3feb32e194
Fix a crash when a VoxelTerrain is created and deleted without ever entering the tree. Was caused by Godot creating dummy instances of VoxelTerrain just to call `get_property_list` when I open the inspector...
2019-06-02 02:30:22 +01:00
5ecd449acc
Fixed VXB saving so that it actually works for lod0-only terrain:
...
- Don't rely on ERR_FILE_NOT_FOUND, Godot never returns that from FileAccess...
- Fix LOD not used in block coordinates conversion
- Fix block size saved as u8 but read as u32 in meta file
- Fix block file path not being prepended directory path
- Fix negative coord block file path containing overflowed uint
- Fix VoxelDataLoader processor not being assigned block size in some cases
- Fix VoxelDataLoader not processing save requests properly
- Fix VoxelTerrain not actually sending save requests on destruction
2019-06-02 01:59:39 +01:00
76d3dcf737
Added `dropped_count` to block thread manager stats
2019-06-02 01:57:19 +01:00
439e5d9964
Fix sort heuristic being wrong on pending blocks surviving more than one thread_sync(), we really have to overwrite it
2019-06-02 01:54:17 +01:00
f831d03cf5
Merge branch 'master' into persistence
...
# Conflicts:
# terrain/voxel_data_loader.cpp
2019-05-28 01:17:28 +01:00
2c81db52f8
Rename remaining occurences of "provider" => stream
2019-05-28 01:10:50 +01:00
82502d3397
Simple file-per-block saving WIP. Compiles but didn't test.
2019-05-28 00:40:09 +01:00
4a90ca10a5
Rename "provider" files to "stream"
2019-05-25 16:16:03 +01:00
2e1b13ffea
Rename VoxelProvider* => VoxelStream*
2019-05-25 16:07:38 +01:00
9d2c491fe9
Remove some comments
2019-05-25 15:53:36 +01:00
75cffa7d59
Rename VoxelBlock.pos => position
2019-05-25 15:50:01 +01:00
15ae1b99ba
Rename voxel_provider_thread.h => voxel_data_loader.h to match class name
2019-05-25 15:07:16 +01:00
d01b00a29b
Renamed VoxelMesherDMC::OctreeMode => SimplifyMode
2019-05-25 15:00:22 +01:00
cae44985a8
Comments
2019-05-25 14:34:09 +01:00
34653341cf
Turn block loading duplicate rejection back on
2019-05-25 14:31:01 +01:00
5a7d0b6f1b
Added optional code to debug-draw unexpected block drops
2019-05-20 20:49:46 +01:00
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
ceb7f47fa1
Don't bother calling `remove_positions_outside_box`, it's not doing anything currently
2019-05-20 20:34:41 +01:00
2b3b3e9488
Take lod factor into account for view direction in the block sorting heuristic
2019-05-20 20:30:08 +01:00
e47afabe49
Sort blocks using a heuristic, take look direction into account
2019-05-19 21:04:26 +01:00
b9add5d671
Allow more than one thread for mesh updates, also made it generic
2019-05-19 18:27:49 +01:00
38062b32fe
Code style
2019-05-19 18:24:03 +01:00
d5236239bf
Added sort time to provider stats
2019-05-16 23:05:06 +01:00
efe58f1af6
Added exclusive area parameter to block processors so they can remove blocks from their queue
2019-05-12 16:33:25 +01:00
561f95a506
Added stats for dropped block loads and meshs
2019-05-12 16:30:45 +01:00
8126d732b6
Fix block processors' sorting function
2019-05-12 16:19:08 +01:00
960236b155
Remove commented function I never used
2019-05-12 16:17:43 +01:00
a521501add
Move both meshing and loading sheduling to LodOctree polling
2019-05-10 18:56:48 +01:00
29298958e7
Fix mistake in previous commit about missing binding argument
2019-05-10 00:57:09 +01:00
255acbb739
Remove wrong CRASH_COND, also use get/setters for VoxelBlock properties
2019-05-09 22:00:54 +01:00
96183e0c51
Fix missing argument in voxel/block conversion functions
2019-05-09 21:59:03 +01:00
cf7ece7a58
Remove BlockState and replace it with loading_blocks set and enum inside VoxelBlock
2019-05-09 19:11:17 +01:00
73d5d9993c
Load blocks on demand instead of speculatively, it's faster
2019-05-08 20:53:51 +01:00
035e45d0a3
Fix missing destructor in VoxelBlock... woopsie
2019-05-08 20:36:27 +01:00
d21974e122
Changed debug methods, also fixed blocked lods due to small block region extent
2019-05-08 00:57:34 +01:00
40ccdd8fea
Expose material and LOD settings
2019-05-05 19:54:47 +01:00
310e2172ff
Added stat to monitor LODs blocked by non-ready meshes
2019-05-05 19:15:50 +01:00
46784e4700
Make marching cubes skirts an option in VoxelMesherDMC, also use more C++11 initializers
2019-05-05 17:00:42 +01:00
1f219e68eb
Added marching square skirts to hide most LOD cracks
2019-05-05 03:56:18 +01:00
d93f23337a
Added stats to VoxelLodTerrain
2019-05-05 01:09:12 +01:00
8850019dc4
Put LodOctree child position calculation in a function
2019-05-04 17:58:33 +01:00
f0089dce8b
Use C++11 member initializers
2019-05-04 16:30:39 +01:00
295374b99f
Don't subdivide or unsubdivide if meshes aren't ready
2019-05-04 16:29:52 +01:00
9bab6c04d1
Added VoxelLodTerrain, focused on LOD. No seam management, no editing yet.
2019-05-04 00:02:10 +01:00
9363f54e8d
Comments
2019-05-04 00:00:50 +01:00
b24a0d4140
Make blocky voxels optional in VoxelMeshUpdater
2019-05-03 23:59:21 +01:00
5851e4849f
Added `lod` parameter to VoxelProvider
2019-04-29 21:57:39 +01:00
c80a24ef0b
Moved is_mesh_empty() to utility.h
2019-04-29 21:32:28 +01:00
d1c21bdf5d
Remove function from class declaration, doesn't need to be in here
2019-04-29 21:31:52 +01:00
faefde721a
Add base class to all meshers, gather common things in it
2019-04-28 20:48:59 +01:00
12a97cca5a
Reorganize all files and rename a few things
2019-04-28 17:58:29 +01:00
Marc Gilleron
Cory Petkovsek