Updated terraman2d to the latest. I just renamed the blocky world, mesher and chunk to Simple.

This commit is contained in:
Relintai 2022-03-01 23:24:15 +01:00
parent b21e329e45
commit f29fc963a4
3 changed files with 7 additions and 7 deletions

2
HEADS
View File

@ -1 +1 @@
{"engine": {"3.2": "64a9e86c5c20bd4bd5833f0563457d0126617489", "3.x": "9f743429d4196bc501c982d6ea7e49eb7ce37f22"}, "world_generator": {"master": "260c430f11b0b591eaf4714516419aa327d2842c"}, "entity_spell_system": {"master": "3536f01bacf5f54cefb32b768cd020a1f94d0ade"}, "ui_extensions": {"master": "80a3b96fc56991a0f88a1d441ed1e3cebaf3307a"}, "texture_packer": {"master": "ae4d222fbaade063ed6f0bc9f3aaa53df68a7fed"}, "fastnoise": {"master": "46bb1f610bfb7171613b5c708d312bcf94e89356"}, "thread_pool": {"master": "0917511d04bb1aa308385b63ec88d3c182990628"}, "mesh_data_resource": {"master": "a062d871d49d954c5466b9de54b4075cb61cbef4"}, "mesh_utils": {"master": "b52a261c31f04fad624e5cfbcdcc4a45d61136da"}, "props": {"master": "2afd6eff45f9a921bdf4090ff3029def86df5cb5"}, "terraman_2d": {"master": "1b92eb9f61471846122fdf31c57bddf4ff6d548f"}, "broken_seals_module": {"master": "52c5a81350db1c29d375c63d95010260911ec034"}, "rtile_map": {"master": "389070cfef387b69902e23e6c4ac53997b69e42e"}, "props_2d": {"master": "a45822b63519d7f9fb391ab6b1dced468c6f399d"}} {"engine": {"3.2": "64a9e86c5c20bd4bd5833f0563457d0126617489", "3.x": "9b512dd510207d32911064a1bbe15b80c91b006b"}, "world_generator": {"master": "260c430f11b0b591eaf4714516419aa327d2842c"}, "entity_spell_system": {"master": "3536f01bacf5f54cefb32b768cd020a1f94d0ade"}, "ui_extensions": {"master": "80a3b96fc56991a0f88a1d441ed1e3cebaf3307a"}, "texture_packer": {"master": "ae4d222fbaade063ed6f0bc9f3aaa53df68a7fed"}, "fastnoise": {"master": "46bb1f610bfb7171613b5c708d312bcf94e89356"}, "thread_pool": {"master": "0917511d04bb1aa308385b63ec88d3c182990628"}, "mesh_data_resource": {"master": "a062d871d49d954c5466b9de54b4075cb61cbef4"}, "mesh_utils": {"master": "b52a261c31f04fad624e5cfbcdcc4a45d61136da"}, "props": {"master": "2afd6eff45f9a921bdf4090ff3029def86df5cb5"}, "terraman_2d": {"master": "e7f28eabd33bc6425cfba14e6e59457a0598cb62"}, "broken_seals_module": {"master": "52c5a81350db1c29d375c63d95010260911ec034"}, "rtile_map": {"master": "389070cfef387b69902e23e6c4ac53997b69e42e"}, "props_2d": {"master": "a45822b63519d7f9fb391ab6b1dced468c6f399d"}}

View File

@ -4,7 +4,7 @@
[ext_resource path="res://scenes/terra_2d_world/new_terrain2dlibrarymergerpcm.tres" type="Terrain2DLibraryMergerPCM" id=2] [ext_resource path="res://scenes/terra_2d_world/new_terrain2dlibrarymergerpcm.tres" type="Terrain2DLibraryMergerPCM" id=2]
[ext_resource path="res://scenes/terra_2d_world/new_terrain2dlevelgenerator.tres" type="Terrain2DLevelGenerator" id=3] [ext_resource path="res://scenes/terra_2d_world/new_terrain2dlevelgenerator.tres" type="Terrain2DLevelGenerator" id=3]
[node name="Terrain2DWorldBlocky" type="Terrain2DWorldBlocky" groups=["save"]] [node name="Terrain2DWorldBlocky" type="Terrain2DWorldSimple" groups=["save"]]
library = ExtResource( 2 ) library = ExtResource( 2 )
level_generator = ExtResource( 3 ) level_generator = ExtResource( 3 )
mesh_transform_terrain = Transform2D( 1, 0.45, -1, 0.45, 0, 0 ) mesh_transform_terrain = Transform2D( 1, 0.45, -1, 0.45, 0, 0 )

View File

@ -1,5 +1,5 @@
tool tool
extends Terrain2DWorldBlocky extends Terrain2DWorldSimple
# Copyright (c) 2019 Péter Magyar # Copyright (c) 2019 Péter Magyar
# #
@ -69,28 +69,28 @@ func load_character(file_name: String) -> void:
func _create_chunk(x, y, chunk): func _create_chunk(x, y, chunk):
if !chunk: if !chunk:
chunk = Terrain2DChunkBlocky.new() chunk = Terrain2DChunkSimple.new()
if chunk.job_get_count() == 0: if chunk.job_get_count() == 0:
var tj : Terrain2DTerrain2DJob = Terrain2DTerrain2DJob.new() var tj : Terrain2DTerrain2DJob = Terrain2DTerrain2DJob.new()
var lj : Terrain2DLightJob = Terrain2DLightJob.new() var lj : Terrain2DLightJob = Terrain2DLightJob.new()
var pj : Terrain2DProp2DJob = Terrain2DProp2DJob.new() var pj : Terrain2DProp2DJob = Terrain2DProp2DJob.new()
var mesher : Terrain2DMesherBlocky = Terrain2DMesherBlocky.new() var mesher : Terrain2DMesherSimple = Terrain2DMesherSimple.new()
mesher.base_light_value = 0.5 mesher.base_light_value = 0.5
mesher.ao_strength = 0.25 mesher.ao_strength = 0.25
mesher.texture_scale = 1 mesher.texture_scale = 1
tj.set_mesher(mesher) tj.set_mesher(mesher)
var liquid_mesher : Terrain2DMesherBlocky = Terrain2DMesherBlocky.new() var liquid_mesher : Terrain2DMesherSimple = Terrain2DMesherSimple.new()
liquid_mesher.base_light_value = 0.5 liquid_mesher.base_light_value = 0.5
liquid_mesher.ao_strength = 0.25 liquid_mesher.ao_strength = 0.25
liquid_mesher.set_channel_index_type(Terrain2DChunkDefault.DEFAULT_CHANNEL_LIQUID_TYPE) liquid_mesher.set_channel_index_type(Terrain2DChunkDefault.DEFAULT_CHANNEL_LIQUID_TYPE)
liquid_mesher.texture_scale = 1 liquid_mesher.texture_scale = 1
tj.set_liquid_mesher(liquid_mesher) tj.set_liquid_mesher(liquid_mesher)
pj.set_prop_mesher(Terrain2DMesherBlocky.new()) pj.set_prop_mesher(Terrain2DMesherSimple.new())
chunk.job_add(lj) chunk.job_add(lj)
chunk.job_add(tj) chunk.job_add(tj)