Added the new rtile map module, and removed the props and terraman 2d modules.

This commit is contained in:
Relintai 2021-12-13 11:44:38 +01:00
parent e0d8c0d585
commit 8568d529c9
9 changed files with 78 additions and 16 deletions

2
HEADS
View File

@ -1 +1 @@
{"engine": {"3.2": "64a9e86c5c20bd4bd5833f0563457d0126617489", "3.x": "89eab58ec313fb49f22ea38c290ceeec39f1ccce"}, "world_generator": {"master": "260c430f11b0b591eaf4714516419aa327d2842c"}, "entity_spell_system": {"master": "cfba9403cb150d0a1c802039a5b7a8822a4f4832"}, "ui_extensions": {"master": "f82273f54cb1ab87d458c91af9554acec5c10831"}, "texture_packer": {"master": "a0786956813a85b5a82093a081b90c2f8a000e6c"}, "fastnoise": {"master": "d447fd5364e9ab5a6b14184483eab23cd3fe820b"}, "thread_pool": {"master": "a02955e929fea4a4188d02850b187fa4048145a2"}, "mesh_data_resource": {"master": "413b8c0f26085e4101a97158e398f9c73c6a90fc"}, "mesh_utils": {"master": "ca1f54268be462414ee40b9ff96276a8112276a9"}, "props": {"master": "2afd6eff45f9a921bdf4090ff3029def86df5cb5"}, "terraman_2d": {"master": "b547515ae3817b0088e2cf499af59c8f1dee7189"}, "broken_seals_module": {"master": "2afea56eba66beeb543934edf5a38a8aa63fc79b"}} {"engine": {"3.2": "64a9e86c5c20bd4bd5833f0563457d0126617489", "3.x": "9a7de6a344292fa3e979274c7149fb2e69d4c575"}, "world_generator": {"master": "260c430f11b0b591eaf4714516419aa327d2842c"}, "entity_spell_system": {"master": "cfba9403cb150d0a1c802039a5b7a8822a4f4832"}, "ui_extensions": {"master": "f82273f54cb1ab87d458c91af9554acec5c10831"}, "texture_packer": {"master": "a0786956813a85b5a82093a081b90c2f8a000e6c"}, "fastnoise": {"master": "d447fd5364e9ab5a6b14184483eab23cd3fe820b"}, "thread_pool": {"master": "a02955e929fea4a4188d02850b187fa4048145a2"}, "mesh_data_resource": {"master": "4c8560f40d7a210380a2e25962ac794e0950ef75"}, "mesh_utils": {"master": "ca1f54268be462414ee40b9ff96276a8112276a9"}, "props": {"master": "2afd6eff45f9a921bdf4090ff3029def86df5cb5"}, "terraman_2d": {"master": "b547515ae3817b0088e2cf499af59c8f1dee7189"}, "broken_seals_module": {"master": "2afea56eba66beeb543934edf5a38a8aa63fc79b"}, "rtile_map": {"master": "27e175b352f87987ca190ca617c247a313077eb1"}}

12
game/Node2D.tscn Normal file

File diff suppressed because one or more lines are too long

View File

@ -2,22 +2,19 @@
importer="texture" importer="texture"
type="StreamTexture" type="StreamTexture"
path.s3tc="res://.import/icon.png-487276ed1e3a0c39cad0279d744ee560.s3tc.stex" path="res://.import/icon.png-487276ed1e3a0c39cad0279d744ee560.stex"
path.etc2="res://.import/icon.png-487276ed1e3a0c39cad0279d744ee560.etc2.stex"
path.etc="res://.import/icon.png-487276ed1e3a0c39cad0279d744ee560.etc.stex"
metadata={ metadata={
"imported_formats": [ "s3tc", "etc2", "etc" ], "vram_texture": false
"vram_texture": true
} }
[deps] [deps]
source_file="res://icon.png" source_file="res://icon.png"
dest_files=[ "res://.import/icon.png-487276ed1e3a0c39cad0279d744ee560.s3tc.stex", "res://.import/icon.png-487276ed1e3a0c39cad0279d744ee560.etc2.stex", "res://.import/icon.png-487276ed1e3a0c39cad0279d744ee560.etc.stex" ] dest_files=[ "res://.import/icon.png-487276ed1e3a0c39cad0279d744ee560.stex" ]
[params] [params]
compress/mode=2 compress/mode=3
compress/lossy_quality=0.7 compress/lossy_quality=0.7
compress/hdr_mode=0 compress/hdr_mode=0
compress/bptc_ldr=0 compress/bptc_ldr=0

42
game/new_rtileset.tres Normal file
View File

@ -0,0 +1,42 @@
[gd_resource type="RTileSet" load_steps=5 format=2]
[ext_resource path="res://icon.png" type="Texture" id=1]
[sub_resource type="OccluderPolygon2D" id=1]
polygon = PoolVector2Array( 0, 0, 32, 0, 32, 32, 0, 32 )
[sub_resource type="ConvexPolygonShape2D" id=2]
points = PoolVector2Array( 0, 0, 32, 0, 32, 32, 0, 32 )
[sub_resource type="FastnoiseNoiseParams" id=3]
[resource]
noise = SubResource( 3 )
0/name = "icon.png 0"
0/texture = ExtResource( 1 )
0/tex_offset = Vector2( 0, 0 )
0/modulate = Color( 1, 1, 1, 1 )
0/region = Rect2( 32, 32, 128, 128 )
0/tile_mode = 2
0/autotile/icon_coordinate = Vector2( 0, 0 )
0/autotile/tile_size = Vector2( 32, 32 )
0/autotile/spacing = 0
0/autotile/occluder_map = [ Vector2( 1, 1 ), SubResource( 1 ) ]
0/autotile/navpoly_map = [ ]
0/autotile/priority_map = [ ]
0/autotile/z_index_map = [ ]
0/occluder_offset = Vector2( 0, 0 )
0/navigation_offset = Vector2( 0, 0 )
0/shape_offset = Vector2( 0, 0 )
0/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 )
0/shape = SubResource( 2 )
0/shape_one_way = false
0/shape_one_way_margin = 1.0
0/shapes = [ {
"autotile_coord": Vector2( 1, 1 ),
"one_way": false,
"one_way_margin": 1.0,
"shape": SubResource( 2 ),
"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 )
} ]
0/z_index = 0

View File

@ -627,6 +627,10 @@ limits/message_queue/max_size_kb=2048
2d/default_gravity=0 2d/default_gravity=0
[props]
default_prop_material_cache_class="PropMaterialCachePCM"
[rendering] [rendering]
quality/driver/driver_name="GLES2" quality/driver/driver_name="GLES2"

File diff suppressed because one or more lines are too long

View File

@ -1,8 +1,8 @@
[gd_scene load_steps=2 format=2] [gd_scene load_steps=2 format=2]
[ext_resource path="res://tilesets/tileset.tres" type="TileSet" id=1] [ext_resource path="res://tilesets/tileset.tres" type="RTileSet" id=1]
[node name="Terrarin" type="TileMap"] [node name="Terrarin" type="RTileMap"]
z_index = -10 z_index = -10
tile_set = ExtResource( 1 ) tile_set = ExtResource( 1 )
cell_size = Vector2( 32, 32 ) cell_size = Vector2( 32, 32 )

View File

@ -1,4 +1,4 @@
[gd_resource type="TileSet" load_steps=5 format=2] [gd_resource type="RTileSet" load_steps=6 format=2]
[ext_resource path="res://tilesets/tiles.png" type="Texture" id=1] [ext_resource path="res://tilesets/tiles.png" type="Texture" id=1]
@ -14,7 +14,10 @@ polygons = [ PoolIntArray( 0, 1, 2, 3 ) ]
vertices = PoolVector2Array( 0, 0, 32, 0, 32, 32, 0, 32 ) vertices = PoolVector2Array( 0, 0, 32, 0, 32, 32, 0, 32 )
polygons = [ PoolIntArray( 0, 1, 2, 3 ) ] polygons = [ PoolIntArray( 0, 1, 2, 3 ) ]
[sub_resource type="FastnoiseNoiseParams" id=4]
[resource] [resource]
noise = SubResource( 4 )
0/name = "Grass" 0/name = "Grass"
0/texture = ExtResource( 1 ) 0/texture = ExtResource( 1 )
0/tex_offset = Vector2( 0, 0 ) 0/tex_offset = Vector2( 0, 0 )

View File

@ -9,13 +9,14 @@ module_repositories = [
[ ['https://github.com/Relintai/thread_pool.git', 'git@github.com:Relintai/thread_pool.git'], 'thread_pool', '' ], [ ['https://github.com/Relintai/thread_pool.git', 'git@github.com:Relintai/thread_pool.git'], 'thread_pool', '' ],
[ ['https://github.com/Relintai/mesh_data_resource.git', 'git@github.com:Relintai/mesh_data_resource.git'], 'mesh_data_resource', '' ], [ ['https://github.com/Relintai/mesh_data_resource.git', 'git@github.com:Relintai/mesh_data_resource.git'], 'mesh_data_resource', '' ],
[ ['https://github.com/Relintai/mesh_utils.git', 'git@github.com:Relintai/mesh_utils.git'], 'mesh_utils', '' ], [ ['https://github.com/Relintai/mesh_utils.git', 'git@github.com:Relintai/mesh_utils.git'], 'mesh_utils', '' ],
[ ['https://github.com/Relintai/props.git', 'git@github.com:Relintai/props.git'], 'props', '' ],
[ ['https://github.com/Relintai/terraman_2d.git', 'git@github.com:Relintai/terraman_2d.git'], 'terraman_2d', '' ],
[ ['https://github.com/Relintai/broken_seals_module.git', 'git@github.com:Relintai/broken_seals_module.git'], 'broken_seals_module', '' ], [ ['https://github.com/Relintai/broken_seals_module.git', 'git@github.com:Relintai/broken_seals_module.git'], 'broken_seals_module', '' ],
[ ['https://github.com/Relintai/rtile_map.git', 'git@github.com:Relintai/rtile_map.git'], 'rtile_map', '' ],
] ]
removed_modules = [ removed_modules = [
[ ['https://github.com/Relintai/world_generator.git', 'git@github.com:Relintai/world_generator.git'], 'world_generator', '' ], [ ['https://github.com/Relintai/world_generator.git', 'git@github.com:Relintai/world_generator.git'], 'world_generator', '' ],
[ ['https://github.com/Relintai/terraman_2d.git', 'git@github.com:Relintai/terraman_2d.git'], 'terraman_2d', '' ],
[ ['https://github.com/Relintai/props.git', 'git@github.com:Relintai/props.git'], 'props', '' ],
] ]
addon_repositories = [ addon_repositories = [