Added the rtile_map module to the project, and swicthed the terrain tilmaps to it. It's effect is barely visible at the moment. Will probably add a rao strength parameter to it eventually.

This commit is contained in:
Relintai 2022-01-30 19:51:23 +01:00
parent 2afc8a27b3
commit 7953add9a3
9 changed files with 99 additions and 10 deletions

2
HEADS
View File

@ -1 +1 @@
{"engine": {"3.2": "f15f5b45781eb3de8e5811400f654e3e49580149", "3.x": "9cdd110cc3a7affe8c633f24d640c0c729ee6f06"}, "world_generator": {"master": "d12ab222a2387e20164b3e7c6236983223ca88ef"}, "entity_spell_system": {"master": "3c334566ff05a74e913cd5c5ff38ae45aba5f5d2"}, "ui_extensions": {"master": "992b322266e3d3225447c4df0a1c34fee19e1fe3"}, "texture_packer": {"master": "59480880356b7aff8967dfe2163e8416031c4f9b"}, "fastnoise": {"master": "46bb1f610bfb7171613b5c708d312bcf94e89356"}, "thread_pool": {"master": "06c56fcb37d28a275212e2864c5885ae6a5c2ba0"}}
{"engine": {"3.2": "f15f5b45781eb3de8e5811400f654e3e49580149", "3.x": "9cdd110cc3a7affe8c633f24d640c0c729ee6f06"}, "world_generator": {"master": "d12ab222a2387e20164b3e7c6236983223ca88ef"}, "entity_spell_system": {"master": "3c334566ff05a74e913cd5c5ff38ae45aba5f5d2"}, "ui_extensions": {"master": "992b322266e3d3225447c4df0a1c34fee19e1fe3"}, "texture_packer": {"master": "59480880356b7aff8967dfe2163e8416031c4f9b"}, "fastnoise": {"master": "46bb1f610bfb7171613b5c708d312bcf94e89356"}, "thread_pool": {"master": "06c56fcb37d28a275212e2864c5885ae6a5c2ba0"}, "rtile_map": {"master": "389070cfef387b69902e23e6c4ac53997b69e42e"}}

View File

@ -50,7 +50,7 @@ var nav_graph : AStar2D
var entrance_position : Transform2D = Transform2D()
var player_visibility_array : Array = Array()
onready var tile_map : TileMap = $Terrarin
onready var tile_map : = $Terrarin
onready var visibility_map : TileMap = $VisibilityMap
func _ready():

View File

@ -2,14 +2,14 @@
[ext_resource path="res://scenes/DungeonLevel.gd" type="Script" id=1]
[ext_resource path="res://world/WorldLayer.tscn" type="PackedScene" id=2]
[ext_resource path="res://tilesets/dc_32x32/tileset.tres" type="TileSet" id=3]
[ext_resource path="res://tilesets/dc_32x32/tileset.tres" type="RTileSet" id=3]
[ext_resource path="res://tilesets/Visibility_map/vis_32x32.tres" type="TileSet" id=4]
[node name="World" type="Node2D"]
script = ExtResource( 1 )
world_layer = ExtResource( 2 )
[node name="Terrarin" type="TileMap" parent="."]
[node name="Terrarin" type="RTileMap" parent="."]
z_index = -10
tile_set = ExtResource( 3 )
cell_size = Vector2( 32, 32 )

View File

@ -1,8 +1,11 @@
[gd_resource type="TileSet" load_steps=2 format=2]
[gd_resource type="RTileSet" load_steps=3 format=2]
[ext_resource path="res://tilesets/dc_32x32/DungeonCrawl_ProjectUtumnoTileset.png" type="Texture" id=1]
[sub_resource type="FastnoiseNoiseParams" id=1]
[resource]
noise = SubResource( 1 )
0/name = "Floor"
0/texture = ExtResource( 1 )
0/tex_offset = Vector2( 0, 0 )

View File

@ -2,14 +2,14 @@
[ext_resource path="res://scenes/DungeonLevel.gd" type="Script" id=1]
[ext_resource path="res://world/WorldLayer.tscn" type="PackedScene" id=2]
[ext_resource path="res://tilesets/denzi_32x32_orthogonal/new_tileset.tres" type="TileSet" id=3]
[ext_resource path="res://tilesets/denzi_32x32_orthogonal/new_tileset.tres" type="RTileSet" id=3]
[ext_resource path="res://tilesets/Visibility_map/vis_32x32.tres" type="TileSet" id=4]
[node name="World" type="Node2D"]
script = ExtResource( 1 )
world_layer = ExtResource( 2 )
[node name="Terrarin" type="TileMap" parent="."]
[node name="Terrarin" type="RTileMap" parent="."]
z_index = -10
tile_set = ExtResource( 3 )
cell_size = Vector2( 32, 32 )

View File

@ -1,8 +1,11 @@
[gd_resource type="TileSet" load_steps=2 format=2]
[gd_resource type="RTileSet" load_steps=3 format=2]
[ext_resource path="res://tilesets/denzi_32x32_orthogonal/32x32_terrain_Denzi110115-4.png" type="Texture" id=1]
[sub_resource type="FastnoiseNoiseParams" id=1]
[resource]
noise = SubResource( 1 )
0/name = "Floor"
0/texture = ExtResource( 1 )
0/tex_offset = Vector2( 0, 0 )

View File

@ -2,15 +2,16 @@
[ext_resource path="res://scenes/DungeonLevel.gd" type="Script" id=1]
[ext_resource path="res://world/WorldLayer.tscn" type="PackedScene" id=2]
[ext_resource path="res://tilesets/denzi_public_domain/new_tileset.tres" type="TileSet" id=3]
[ext_resource path="res://tilesets/denzi_public_domain/new_tilesetr.tres" type="RTileSet" id=3]
[ext_resource path="res://tilesets/Visibility_map/vis_32x32.tres" type="TileSet" id=4]
[node name="World" type="Node2D"]
script = ExtResource( 1 )
world_layer = ExtResource( 2 )
[node name="Terrarin" type="TileMap" parent="."]
[node name="Terrarin" type="RTileMap" parent="."]
z_index = -10
use_rao = false
tile_set = ExtResource( 3 )
cell_size = Vector2( 32, 32 )
format = 1

View File

@ -0,0 +1,81 @@
[gd_resource type="RTileSet" load_steps=3 format=2]
[ext_resource path="res://tilesets/denzi_public_domain/DENZI_CC0_32x32_tileset.png" type="Texture" id=1]
[sub_resource type="FastnoiseNoiseParams" id=1]
noise_type = 2
interpolation = 0
frequency = 0.1
[resource]
noise = SubResource( 1 )
0/name = "Floor"
0/texture = ExtResource( 1 )
0/tex_offset = Vector2( 0, 0 )
0/modulate = Color( 1, 1, 1, 1 )
0/region = Rect2( 291, 128, 32, 32 )
0/tile_mode = 0
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_one_way = false
0/shape_one_way_margin = 0.0
0/shapes = [ ]
0/z_index = 0
1/name = "Wall"
1/texture = ExtResource( 1 )
1/tex_offset = Vector2( 0, 0 )
1/modulate = Color( 1, 1, 1, 1 )
1/region = Rect2( 320, 0, 32, 32 )
1/tile_mode = 0
1/occluder_offset = Vector2( 0, 0 )
1/navigation_offset = Vector2( 0, 0 )
1/shape_offset = Vector2( 0, 0 )
1/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 )
1/shape_one_way = false
1/shape_one_way_margin = 0.0
1/shapes = [ ]
1/z_index = 0
2/name = "Door"
2/texture = ExtResource( 1 )
2/tex_offset = Vector2( 0, 0 )
2/modulate = Color( 1, 1, 1, 1 )
2/region = Rect2( 576, 992, 32, 32 )
2/tile_mode = 0
2/occluder_offset = Vector2( 0, 0 )
2/navigation_offset = Vector2( 0, 0 )
2/shape_offset = Vector2( 0, 0 )
2/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 )
2/shape_one_way = false
2/shape_one_way_margin = 0.0
2/shapes = [ ]
2/z_index = 0
3/name = "Ladder"
3/texture = ExtResource( 1 )
3/tex_offset = Vector2( 0, 0 )
3/modulate = Color( 1, 1, 1, 1 )
3/region = Rect2( 992, 993, 32, 32 )
3/tile_mode = 0
3/occluder_offset = Vector2( 0, 0 )
3/navigation_offset = Vector2( 0, 0 )
3/shape_offset = Vector2( 0, 0 )
3/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 )
3/shape_one_way = false
3/shape_one_way_margin = 0.0
3/shapes = [ ]
3/z_index = 0
4/name = "Stone"
4/texture = ExtResource( 1 )
4/tex_offset = Vector2( 0, 0 )
4/modulate = Color( 1, 1, 1, 1 )
4/region = Rect2( 544, 960, 32, 32 )
4/tile_mode = 0
4/occluder_offset = Vector2( 0, 0 )
4/navigation_offset = Vector2( 0, 0 )
4/shape_offset = Vector2( 0, 0 )
4/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 )
4/shape_one_way = false
4/shape_one_way_margin = 0.0
4/shapes = [ ]
4/z_index = 0

View File

@ -7,6 +7,7 @@ module_repositories = [
[ ['https://github.com/Relintai/texture_packer.git', 'git@github.com:Relintai/texture_packer.git'], 'texture_packer', '' ],
[ ['https://github.com/Relintai/godot_fastnoise.git', 'git@github.com:Relintai/godot_fastnoise.git'], 'fastnoise', '' ],
[ ['https://github.com/Relintai/thread_pool.git', 'git@github.com:Relintai/thread_pool.git'], 'thread_pool', '' ],
[ ['https://github.com/Relintai/rtile_map.git', 'git@github.com:Relintai/rtile_map.git'], 'rtile_map', '' ],
]
removed_modules = [