Relintai/terraman
1
0
Fork 0
mirror of https://github.com/Relintai/terraman.git synced 2025-04-23 21:43:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

Changed the alt type and isolevel to liquid type and isolevel and removed the liquid liquid flow default channel. Liquids need to work differently here that with voxelman.

Browse Source
This commit is contained in:
Relintai 2022-02-18 21:59:22 +01:00
parent aaeca66f80
commit 55a98b96d5
3 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
world/default/terrain_chunk_default.cpp
View File

@ -965,14 +965,13 @@ void TerrainChunkDefault::_bind_methods() {
BIND_ENUM_CONSTANT(DEFAULT_CHANNEL_TYPE); BIND_ENUM_CONSTANT(DEFAULT_CHANNEL_TYPE);
BIND_ENUM_CONSTANT(DEFAULT_CHANNEL_ISOLEVEL); BIND_ENUM_CONSTANT(DEFAULT_CHANNEL_ISOLEVEL);
BIND_ENUM_CONSTANT(DEFAULT_CHANNEL_ALT_TYPE); BIND_ENUM_CONSTANT(DEFAULT_CHANNEL_LIQUID_TYPE);
BIND_ENUM_CONSTANT(DEFAULT_CHANNEL_ALT_ISOLEVEL); BIND_ENUM_CONSTANT(DEFAULT_CHANNEL_LIQUID_ISOLEVEL);
BIND_ENUM_CONSTANT(DEFAULT_CHANNEL_LIGHT_COLOR_R); BIND_ENUM_CONSTANT(DEFAULT_CHANNEL_LIGHT_COLOR_R);
BIND_ENUM_CONSTANT(DEFAULT_CHANNEL_LIGHT_COLOR_G); BIND_ENUM_CONSTANT(DEFAULT_CHANNEL_LIGHT_COLOR_G);
BIND_ENUM_CONSTANT(DEFAULT_CHANNEL_LIGHT_COLOR_B); BIND_ENUM_CONSTANT(DEFAULT_CHANNEL_LIGHT_COLOR_B);
BIND_ENUM_CONSTANT(DEFAULT_CHANNEL_AO); BIND_ENUM_CONSTANT(DEFAULT_CHANNEL_AO);
BIND_ENUM_CONSTANT(DEFAULT_CHANNEL_RANDOM_AO); BIND_ENUM_CONSTANT(DEFAULT_CHANNEL_RANDOM_AO);
BIND_ENUM_CONSTANT(DEFAULT_CHANNEL_LIQUID_FLOW);
BIND_ENUM_CONSTANT(MAX_DEFAULT_CHANNELS); BIND_ENUM_CONSTANT(MAX_DEFAULT_CHANNELS);
BIND_CONSTANT(MESH_INDEX_TERRAIN); BIND_CONSTANT(MESH_INDEX_TERRAIN);

5
world/default/terrain_chunk_default.h
View File

@ -65,14 +65,13 @@ public:
enum DefaultChannels { enum DefaultChannels {
DEFAULT_CHANNEL_TYPE = 0, DEFAULT_CHANNEL_TYPE = 0,
DEFAULT_CHANNEL_ISOLEVEL, DEFAULT_CHANNEL_ISOLEVEL,
DEFAULT_CHANNEL_ALT_TYPE, DEFAULT_CHANNEL_LIQUID_TYPE,
DEFAULT_CHANNEL_ALT_ISOLEVEL, DEFAULT_CHANNEL_LIQUID_ISOLEVEL,
DEFAULT_CHANNEL_LIGHT_COLOR_R, DEFAULT_CHANNEL_LIGHT_COLOR_R,
DEFAULT_CHANNEL_LIGHT_COLOR_G, DEFAULT_CHANNEL_LIGHT_COLOR_G,
DEFAULT_CHANNEL_LIGHT_COLOR_B, DEFAULT_CHANNEL_LIGHT_COLOR_B,
DEFAULT_CHANNEL_AO, DEFAULT_CHANNEL_AO,
DEFAULT_CHANNEL_RANDOM_AO, DEFAULT_CHANNEL_RANDOM_AO,
DEFAULT_CHANNEL_LIQUID_FLOW,
MAX_DEFAULT_CHANNELS MAX_DEFAULT_CHANNELS
}; };

2
world/default/terrain_world_default.cpp
View File

@ -244,7 +244,7 @@ int TerrainWorldDefault::_get_channel_index_info(const TerrainWorld::ChannelType
case CHANNEL_TYPE_INFO_ISOLEVEL: case CHANNEL_TYPE_INFO_ISOLEVEL:
return TerrainChunkDefault::DEFAULT_CHANNEL_ISOLEVEL; return TerrainChunkDefault::DEFAULT_CHANNEL_ISOLEVEL;
case CHANNEL_TYPE_INFO_LIQUID_FLOW: case CHANNEL_TYPE_INFO_LIQUID_FLOW:
return TerrainChunkDefault::DEFAULT_CHANNEL_LIQUID_FLOW; return -1;
default: default:
return -1; return -1;
} }