From 780b743d8b9938cbdff2101a215075d0ea9696a1 Mon Sep 17 00:00:00 2001 From: Hamcha Date: Wed, 16 Sep 2020 01:24:08 +0200 Subject: [PATCH] GOOD BYE 1x1 --- Graphics/UI/ui_theme.tres | 74 ++++++++++++++- Graphics/deepspace_mat.tres | 24 +---- Graphics/tgstation/walls.tres | 100 ++++++++++---------- Graphics/tgstation/walls_tiled.png | Bin 0 -> 5166 bytes Graphics/tgstation/walls_tiled.png.import | 34 +++++++ Graphics/tgstation/windows_tiled.png | Bin 0 -> 11761 bytes Graphics/tgstation/windows_tiled.png.import | 34 +++++++ Scenes/Rendering/MapTiles.gd | 39 ++------ 8 files changed, 199 insertions(+), 106 deletions(-) create mode 100644 Graphics/tgstation/walls_tiled.png create mode 100644 Graphics/tgstation/walls_tiled.png.import create mode 100644 Graphics/tgstation/windows_tiled.png create mode 100644 Graphics/tgstation/windows_tiled.png.import diff --git a/Graphics/UI/ui_theme.tres b/Graphics/UI/ui_theme.tres index 194f49a..6c1cc53 100644 --- a/Graphics/UI/ui_theme.tres +++ b/Graphics/UI/ui_theme.tres @@ -1,4 +1,4 @@ -[gd_resource type="Theme" load_steps=4 format=2] +[gd_resource type="Theme" load_steps=6 format=2] [ext_resource path="res://Graphics/UI/uifont.tres" type="DynamicFont" id=1] @@ -36,6 +36,40 @@ expand_margin_right = 8.0 expand_margin_top = 8.0 expand_margin_bottom = 8.0 +[sub_resource type="StyleBoxFlat" id=3] +content_margin_left = 10.0 +content_margin_right = 10.0 +content_margin_top = 5.0 +content_margin_bottom = 0.0 +bg_color = Color( 0.09962, 0.0918, 0.17, 1 ) +border_width_left = 4 +border_width_top = 4 +border_width_right = 4 +border_width_bottom = 4 +border_color = Color( 0.0941176, 0.0823529, 0.180392, 1 ) +border_blend = true +corner_radius_top_left = 4 +corner_radius_top_right = 4 +corner_radius_bottom_right = 4 +corner_radius_bottom_left = 4 +expand_margin_bottom = 2.0 + +[sub_resource type="StyleBoxFlat" id=4] +content_margin_left = 10.0 +content_margin_right = 10.0 +content_margin_top = 5.0 +bg_color = Color( 0.133333, 0.12549, 0.203922, 1 ) +border_width_left = 4 +border_width_top = 4 +border_width_right = 4 +border_color = Color( 0.0941176, 0.0823529, 0.180392, 1 ) +border_blend = true +corner_radius_top_left = 4 +corner_radius_top_right = 4 +corner_radius_bottom_right = 2 +corner_radius_bottom_left = 2 +expand_margin_bottom = 4.0 + [resource] default_font = ExtResource( 1 ) Button/colors/font_color = Color( 0.88, 0.88, 0.88, 1 ) @@ -70,6 +104,44 @@ PopupMenu/styles/labeled_separator_right = null PopupMenu/styles/panel = SubResource( 2 ) PopupMenu/styles/panel_disabled = null PopupMenu/styles/separator = null +TabContainer/colors/font_color_bg = Color( 0.69, 0.69, 0.69, 1 ) +TabContainer/colors/font_color_disabled = Color( 0.9, 0.9, 0.9, 0.2 ) +TabContainer/colors/font_color_fg = Color( 0.94, 0.94, 0.94, 1 ) +TabContainer/constants/hseparation = 4 +TabContainer/constants/label_valign_bg = 2 +TabContainer/constants/label_valign_fg = 0 +TabContainer/constants/side_margin = 8 +TabContainer/constants/top_margin = 24 +TabContainer/fonts/font = null +TabContainer/icons/decrement = null +TabContainer/icons/decrement_highlight = null +TabContainer/icons/increment = null +TabContainer/icons/increment_highlight = null +TabContainer/icons/menu = null +TabContainer/icons/menu_highlight = null +TabContainer/styles/panel = SubResource( 1 ) +TabContainer/styles/tab_bg = SubResource( 3 ) +TabContainer/styles/tab_disabled = SubResource( 3 ) +TabContainer/styles/tab_fg = SubResource( 4 ) +Tabs/colors/font_color_bg = Color( 0.69, 0.69, 0.69, 1 ) +Tabs/colors/font_color_disabled = Color( 0.9, 0.9, 0.9, 0.2 ) +Tabs/colors/font_color_fg = Color( 0.94, 0.94, 0.94, 1 ) +Tabs/constants/hseparation = 4 +Tabs/constants/label_valign_bg = 2 +Tabs/constants/label_valign_fg = 0 +Tabs/constants/top_margin = 24 +Tabs/fonts/font = null +Tabs/icons/close = null +Tabs/icons/decrement = null +Tabs/icons/decrement_highlight = null +Tabs/icons/increment = null +Tabs/icons/increment_highlight = null +Tabs/styles/button = null +Tabs/styles/button_pressed = null +Tabs/styles/panel = SubResource( 1 ) +Tabs/styles/tab_bg = null +Tabs/styles/tab_disabled = null +Tabs/styles/tab_fg = SubResource( 1 ) ToolButton/colors/font_color = Color( 0.88, 0.88, 0.88, 1 ) ToolButton/colors/font_color_disabled = Color( 0.9, 0.95, 1, 0.3 ) ToolButton/colors/font_color_hover = Color( 0.94, 0.94, 0.94, 1 ) diff --git a/Graphics/deepspace_mat.tres b/Graphics/deepspace_mat.tres index e437f8a..b0522fd 100644 --- a/Graphics/deepspace_mat.tres +++ b/Graphics/deepspace_mat.tres @@ -6,10 +6,6 @@ code = "shader_type canvas_item; uniform sampler2D noise_sparse; uniform sampler2D noise_fine; -uniform float scroll_speed = 0.0; -uniform float warp_boost: hint_range(1, 10) = 1.0; -uniform float warp_opacity : hint_range(0, 1) = 0.0; - const float noise_sparse_scale = 0.0007; const float noise_fine_scale = 0.003; const float warp_clouds_scale = 0.0003; @@ -20,10 +16,9 @@ const float PI = 3.1415; render_mode unshaded; void fragment() { - float scroll = scroll_speed * TIME; - float sparse = texture(noise_sparse, (FRAGCOORD.xy + scroll_dir * scroll)*noise_sparse_scale).r; + float sparse = texture(noise_sparse, FRAGCOORD.xy*noise_sparse_scale).r; sparse = ((sparse * sparse) - 0.2) * 1.2; - float fine = texture(noise_fine, (FRAGCOORD.xy + scroll_dir * scroll)*noise_fine_scale).r; + float fine = texture(noise_fine, FRAGCOORD.xy*noise_fine_scale).r; fine = fine - 0.6; if (fine > 0.) { fine = fine * 10.0; @@ -35,17 +30,7 @@ void fragment() { vec4 clouds = vec4(vec3(0.3, 0.5, 0.7) * sparse, 1.0); vec4 stars = vec4(fine); - vec2 warp_scroll = scroll_dir * scroll; - vec2 warp_uv = (FRAGCOORD.xy * sin(SCREEN_UV.y * PI) + warp_scroll)*warp_clouds_scale; - vec2 warp_uv_inv = (FRAGCOORD.xy * sin((abs(SCREEN_UV.y-0.5)) * SCREEN_UV.x * PI) + warp_scroll*0.5)*warp_clouds_scale; - float warp_clouds_sparse = texture(noise_sparse, vec2(0.5,1) * warp_uv).r; - float warp_clouds_fine = texture(noise_sparse, vec2(2,1) * warp_uv_inv).r; - - vec4 warp = vec4(vec3(0), 1); - warp += vec4(vec3(0.3,0.2,0.9)*warp_clouds_sparse, 0); - warp += vec4(vec3(0.5,0.0,0.5)*(warp_clouds_fine*0.5+warp_clouds_sparse)*abs(SCREEN_UV.y-0.5), 0); - - COLOR = mix(clouds + stars, warp*warp_boost, warp_opacity); + COLOR = clouds + stars; }" [sub_resource type="OpenSimplexNoise" id=2] @@ -67,8 +52,5 @@ noise = SubResource( 4 ) [resource] shader = SubResource( 1 ) -shader_param/scroll_speed = 0.0 -shader_param/warp_boost = 0.0 -shader_param/warp_opacity = 0.0 shader_param/noise_sparse = SubResource( 5 ) shader_param/noise_fine = SubResource( 3 ) diff --git a/Graphics/tgstation/walls.tres b/Graphics/tgstation/walls.tres index 3e51b11..a3f2296 100644 --- a/Graphics/tgstation/walls.tres +++ b/Graphics/tgstation/walls.tres @@ -1,54 +1,52 @@ -[gd_resource type="TileSet" load_steps=5 format=2] +[gd_resource type="TileSet" load_steps=3 format=2] -[ext_resource path="res://Graphics/tgstation/wall.png" type="Texture" id=2] -[ext_resource path="res://Graphics/tgstation/window.png" type="Texture" id=3] - -[sub_resource type="ConvexPolygonShape2D" id=1] -points = PoolVector2Array( 32, 32, 0, 32, 0, 0, 32, 0 ) - -[sub_resource type="ConvexPolygonShape2D" id=2] -points = PoolVector2Array( 0, 0, 32, 0, 32, 32, 0, 32 ) +[ext_resource path="res://Graphics/tgstation/walls_tiled.png" type="Texture" id=1] +[ext_resource path="res://Graphics/tgstation/windows_tiled.png" type="Texture" id=4] [resource] -2/name = "Wall" -2/texture = ExtResource( 2 ) -2/tex_offset = Vector2( 0, 0 ) -2/modulate = Color( 1, 1, 1, 1 ) -2/region = Rect2( 0, 0, 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 = SubResource( 1 ) -2/shape_one_way = false -2/shape_one_way_margin = 1.0 -2/shapes = [ { -"autotile_coord": Vector2( 0, 0 ), -"one_way": false, -"one_way_margin": 1.0, -"shape": SubResource( 1 ), -"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 ) -} ] -2/z_index = 0 -3/name = "Window" -3/texture = ExtResource( 3 ) -3/tex_offset = Vector2( 0, 0 ) -3/modulate = Color( 1, 1, 1, 1 ) -3/region = Rect2( 0, 0, 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 = SubResource( 2 ) -3/shape_one_way = false -3/shape_one_way_margin = 1.0 -3/shapes = [ { -"autotile_coord": Vector2( 0, 0 ), -"one_way": false, -"one_way_margin": 1.0, -"shape": SubResource( 2 ), -"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 ) -} ] -3/z_index = 0 +4/name = "Wall" +4/texture = ExtResource( 1 ) +4/tex_offset = Vector2( 0, 0 ) +4/modulate = Color( 1, 1, 1, 1 ) +4/region = Rect2( 0, 0, 256, 224 ) +4/tile_mode = 1 +4/autotile/bitmask_mode = 1 +4/autotile/bitmask_flags = [ Vector2( 0, 0 ), 176, Vector2( 0, 1 ), 178, Vector2( 0, 2 ), 50, Vector2( 0, 3 ), 442, Vector2( 0, 4 ), 190, Vector2( 0, 5 ), 434, Vector2( 0, 6 ), 182, Vector2( 1, 0 ), 184, Vector2( 1, 1 ), 186, Vector2( 1, 2 ), 58, Vector2( 1, 3 ), 250, Vector2( 1, 4 ), 187, Vector2( 1, 5 ), 218, Vector2( 1, 6 ), 155, Vector2( 2, 0 ), 152, Vector2( 2, 1 ), 154, Vector2( 2, 2 ), 26, Vector2( 2, 3 ), 464, Vector2( 2, 4 ), 23, Vector2( 2, 5 ), 440, Vector2( 2, 6 ), 62, Vector2( 3, 0 ), 144, Vector2( 3, 1 ), 146, Vector2( 3, 2 ), 18, Vector2( 3, 3 ), 16, Vector2( 3, 4 ), 510, Vector2( 3, 5 ), 248, Vector2( 3, 6 ), 59, Vector2( 4, 0 ), 48, Vector2( 4, 1 ), 432, Vector2( 4, 2 ), 438, Vector2( 4, 3 ), 54, Vector2( 4, 4 ), 507, Vector2( 4, 5 ), 447, Vector2( 4, 6 ), 255, Vector2( 5, 0 ), 56, Vector2( 5, 1 ), 504, Vector2( 5, 2 ), 511, Vector2( 5, 3 ), 63, Vector2( 5, 4 ), 308, Vector2( 5, 5 ), 254, Vector2( 5, 6 ), 443, Vector2( 6, 0 ), 24, Vector2( 6, 1 ), 216, Vector2( 6, 2 ), 219, Vector2( 6, 3 ), 27, Vector2( 6, 4 ), 89, Vector2( 6, 5 ), 443, Vector2( 6, 6 ), 254, Vector2( 7, 0 ), 251, Vector2( 7, 1 ), 446, Vector2( 7, 2 ), 191, Vector2( 7, 3 ), 506 ] +4/autotile/icon_coordinate = Vector2( 3, 3 ) +4/autotile/tile_size = Vector2( 32, 32 ) +4/autotile/spacing = 0 +4/autotile/occluder_map = [ ] +4/autotile/navpoly_map = [ ] +4/autotile/priority_map = [ ] +4/autotile/z_index_map = [ ] +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 +5/name = "Window" +5/texture = ExtResource( 4 ) +5/tex_offset = Vector2( 0, 0 ) +5/modulate = Color( 1, 1, 1, 1 ) +5/region = Rect2( 0, 0, 256, 224 ) +5/tile_mode = 1 +5/autotile/bitmask_mode = 1 +5/autotile/bitmask_flags = [ Vector2( 0, 0 ), 176, Vector2( 0, 1 ), 178, Vector2( 0, 2 ), 50, Vector2( 0, 3 ), 442, Vector2( 0, 4 ), 190, Vector2( 0, 5 ), 434, Vector2( 0, 6 ), 182, Vector2( 1, 0 ), 184, Vector2( 1, 1 ), 186, Vector2( 1, 2 ), 58, Vector2( 1, 3 ), 250, Vector2( 1, 4 ), 187, Vector2( 1, 5 ), 218, Vector2( 1, 6 ), 155, Vector2( 2, 0 ), 152, Vector2( 2, 1 ), 154, Vector2( 2, 2 ), 26, Vector2( 2, 3 ), 464, Vector2( 2, 4 ), 23, Vector2( 2, 5 ), 440, Vector2( 2, 6 ), 62, Vector2( 3, 0 ), 144, Vector2( 3, 1 ), 146, Vector2( 3, 2 ), 18, Vector2( 3, 3 ), 16, Vector2( 3, 4 ), 510, Vector2( 3, 5 ), 248, Vector2( 3, 6 ), 59, Vector2( 4, 0 ), 48, Vector2( 4, 1 ), 432, Vector2( 4, 2 ), 438, Vector2( 4, 3 ), 54, Vector2( 4, 4 ), 507, Vector2( 4, 5 ), 447, Vector2( 4, 6 ), 255, Vector2( 5, 0 ), 56, Vector2( 5, 1 ), 504, Vector2( 5, 2 ), 511, Vector2( 5, 3 ), 63, Vector2( 5, 4 ), 308, Vector2( 5, 5 ), 254, Vector2( 5, 6 ), 443, Vector2( 6, 0 ), 24, Vector2( 6, 1 ), 216, Vector2( 6, 2 ), 219, Vector2( 6, 3 ), 27, Vector2( 6, 4 ), 89, Vector2( 6, 5 ), 443, Vector2( 6, 6 ), 254, Vector2( 7, 0 ), 251, Vector2( 7, 1 ), 446, Vector2( 7, 2 ), 191, Vector2( 7, 3 ), 506 ] +5/autotile/icon_coordinate = Vector2( 3, 3 ) +5/autotile/tile_size = Vector2( 32, 32 ) +5/autotile/spacing = 0 +5/autotile/occluder_map = [ ] +5/autotile/navpoly_map = [ ] +5/autotile/priority_map = [ ] +5/autotile/z_index_map = [ ] +5/occluder_offset = Vector2( 0, 0 ) +5/navigation_offset = Vector2( 0, 0 ) +5/shape_offset = Vector2( 0, 0 ) +5/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 ) +5/shape_one_way = false +5/shape_one_way_margin = 0.0 +5/shapes = [ ] +5/z_index = 0 diff --git a/Graphics/tgstation/walls_tiled.png b/Graphics/tgstation/walls_tiled.png new file mode 100644 index 0000000000000000000000000000000000000000..68a2f6ed5f5d377b288e52e09d4ba647dafb5d66 GIT binary patch literal 5166 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 aa1PfOw(!3RM}Z#z0c&%6v+7emiT?%THU}gC literal 0 HcmV?d00001 diff --git a/Graphics/tgstation/walls_tiled.png.import b/Graphics/tgstation/walls_tiled.png.import new file mode 100644 index 0000000..5e218c7 --- /dev/null +++ b/Graphics/tgstation/walls_tiled.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/walls_tiled.png-e9af388078750e44e8d744c580c0c4d5.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Graphics/tgstation/walls_tiled.png" +dest_files=[ "res://.import/walls_tiled.png-e9af388078750e44e8d744c580c0c4d5.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/Graphics/tgstation/windows_tiled.png b/Graphics/tgstation/windows_tiled.png new file mode 100644 index 0000000000000000000000000000000000000000..0956bb79646a6203339475f712196768bac860b4 GIT binary patch literal 11761 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 z zsR}itCu1_TdtL1i-c)%j8=E@?)_5BWdpB$qS3nwDdZDoBoUvVG3(;26JXuv-sh0uZ zZw`GFW=UOq5RTdV-~tlgITDAk-L>*_AgLO^)E}Cj?h7$i!ftJ6b*et*qlkFY(`hZ4 zfI#a)+oxB=mLLcx!LkEg#m6`t6p>$L)buvoBs}Z(=ti~KQ^km0T}h2gE{$!UH>dtZ z+%QY&5QxCt5Rekd$Xs=}vPxVaI#tazY4aj`55ZQ?rlCb0_26l9L=g~<{da@HyauGc zVYQg}D}6W}bE(#A?XSc7b&aj*!j|i=lc(N!D1NZhhW)x880>VnND4MKu%}` zvV3Vj5@Ud!qAE^6QJnifxWcJaT2_w%Tx>IN703CXt2kz~@B4c*Fx#U|vbmW?dUrUn zQFYzbC{Ll4g1x>(N|TiRF>giGi>GRlbb>!ZVDE%Xl||_dce-kby1*+ll8eU-4g%eJRYEjJnJMuhHg5Xp`u)f?3!9% zbA=(pq}0HU>uV7ay1liE*qFz%S-CEwD?b4eW+u8G7hBOo(m*Vb(ZeHwOukpJq4XyB zrMN>v?CuKS+C){rys4?8L_|(0C>mvZ`&IR;S{9Nb>>^Qno`4+EWUtLf{z8>PwIHhX z*H6s|;^S&_HMJ*w%s(K^WG?`vB%43-6tpsE+4ECVv6Q$MugSh;g-X#WWWl`EB9#K{ zrJ8*}H|J_(6P~~iQW)Z`dVfMd7o#NT&ICg66teKV8U8-XF~}8u*1$SY(32LM6~jmS zsmrSa&~RyW`#+t3A`X>OQwv#9CcS@f3?g2xkk7H9t5y*z&@Ruvvo->ieNX*4*diVn zO}KrB-H8p_s0Kd(_L%hg$xgwITt{P`r^owI$NQ97-g%BoV0O;WYCd=g5`F-Fat~+{ z)?eLIB1sRt$OE+81>uVnB)hg?M%B|0oRwI242lFSmmBa`Lywjx4#_I!MW_>8Ja=+n#NL%)jPo=`T>a1k(MU>d8zDEC z2-5)`243>EUU2rs+^EH}-%F=7ao9DF_C24i>*!kA;?UWNfHOvuwp0usWnb-#zw8ws z(Ao|CDDpG<*arlh98I@1uI;VdbOSgXl^aIS z8iyYuqp~Vwv7YwZ$)33a5(dA#y&_y5OMi3qq@o|I8AOSZI0o5qg8%3@dLwxV^lt#7 zuu2c^A3A^|T~6hxIz35t34&~)b4iqqyFNi!hX{FnV39 z6v(eJdB^1lB!0gSm5ODCHabU%dlsvwQ+zB&r}==6=0t=x7Qsi~`Ax(r#TMp$ z^now}!*o0chE!8a=ri$vfyNk+E8BZ2@c|P+)81^4Q)v+qbG5}?g8BL9A3D!xd9R61 z3Q&aH1%T)-12!-)G+HA*tT91a$t$)kas&ReDPx+Xa139?BPGVMc()71B#RNR3A_~Qv*bMBv@+El;fgg43@uTCJjotVz z%gR4XcYfa}+6I0Agz3+nBJa_aR!JPOUsYz{`=A%eQLq|+s|)(h0#{^VwJ!^w$@}FP z8)X_%Mqcen8V4?aAvX7xQ^bk>o-QAF^d04NuE2?9i~sEH{&qoEarN2iq_Witz}(`y zu?T)zZT~eD^}szjEMKwezKzCR&7@THuqLP8ds9X>in7fPw&2wRUDd(;!d%BnUO;sY zY?WWUUqVQ9w~~LYLS9zfNaDD{e-qg-x5ONxns%ss+{3~`{;>|DBd~s=vx6h3`Ic-z UHzx4~f1_JbR_#%-v`N7K16qaccmMzZ literal 0 HcmV?d00001 diff --git a/Graphics/tgstation/windows_tiled.png.import b/Graphics/tgstation/windows_tiled.png.import new file mode 100644 index 0000000..11de408 --- /dev/null +++ b/Graphics/tgstation/windows_tiled.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/windows_tiled.png-2e919e68bf2e5f8f08c847994c524d05.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Graphics/tgstation/windows_tiled.png" +dest_files=[ "res://.import/windows_tiled.png-2e919e68bf2e5f8f08c847994c524d05.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=true +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/Scenes/Rendering/MapTiles.gd b/Scenes/Rendering/MapTiles.gd index c7c321a..c2c42c2 100644 --- a/Scenes/Rendering/MapTiles.gd +++ b/Scenes/Rendering/MapTiles.gd @@ -2,48 +2,22 @@ extends TileMap class_name MapTiles -var transparentImage = preload("res://Graphics/transparent.png") +var transparentImage := preload("res://Graphics/transparent.png") export(NodePath) var extended_tilemap_node -export var occluders = ["Wall"] +export var occluders := ["Wall"] -export var shadow_intensity = 0.2 - -onready var extended_tilemap = get_node(extended_tilemap_node) as TileMap +export var shadow_intensity := 0.2 func run_conversions(): # Make occluders make_occluders() - # Convert 2x2 tiles to 1x1 if possible - convert_extended() - - -func convert_extended(): - var extended = extended_tilemap.tile_set - for id in tile_set.get_tiles_ids(): - var name = tile_set.tile_get_name(id) - var extended_id = extended.find_tile_by_name(name) - if extended_id < 0: - # Not found, skip it - continue - # Find all uses of this tile - for cell in get_used_cells_by_id(id): - var x = cell.x * 2 - var y = cell.y * 2 - extended_tilemap.set_cell(x, y, extended_id) - extended_tilemap.set_cell(x+1, y, extended_id) - extended_tilemap.set_cell(x, y+1, extended_id) - extended_tilemap.set_cell(x+1, y+1, extended_id) - tile_set.tile_set_texture(id, transparentImage) - extended_tilemap.update_bitmask_region() - extended_tilemap.update_dirty_quadrants() - func make_occluders(): - var occluder_ids = [] + var occluder_ids := [] for occluder_name in occluders: - var id = tile_set.find_tile_by_name(occluder_name) + var id := tile_set.find_tile_by_name(occluder_name) if id >= 0: occluder_ids.push_back(id) for id in tile_set.get_tiles_ids(): @@ -53,7 +27,7 @@ func make_occluders(): # Find all uses of this tile for cell in get_used_cells_by_id(id): # Check sides - var occluder = Occluder.new() + var occluder := Occluder.new() occluder.ignore_sides = [ occluder_ids.find(get_cell(cell.x, cell.y-1)) >= 0, # Top occluder_ids.find(get_cell(cell.x+1, cell.y)) >= 0, # Right @@ -62,7 +36,6 @@ func make_occluders(): ] occluder.transform.origin = map_to_world(cell) add_child(occluder) - func set_occluder_origin(origin): for child in get_children():