diff --git a/addons/flexible_layout/arrow.svg.import b/addons/flexible_layout/arrow.svg.import index 55b443f60..44d24fd68 100644 --- a/addons/flexible_layout/arrow.svg.import +++ b/addons/flexible_layout/arrow.svg.import @@ -1,43 +1,18 @@ [remap] -importer="texture" -type="CompressedTexture2D" -uid="uid://c2ljin3axj2sd" -path="res://.godot/imported/arrow.svg-e1254f39413b91d100a308431d762230.ctex" -metadata={ -"vram_texture": false -} +importer="svg" +type="DPITexture" +uid="uid://7ydi1c1ic17e" +path="res://.godot/imported/arrow.svg-e1254f39413b91d100a308431d762230.dpitex" [deps] source_file="res://addons/flexible_layout/arrow.svg" -dest_files=["res://.godot/imported/arrow.svg-e1254f39413b91d100a308431d762230.ctex"] +dest_files=["res://.godot/imported/arrow.svg-e1254f39413b91d100a308431d762230.dpitex"] [params] -compress/mode=0 -compress/high_quality=false -compress/lossy_quality=0.7 -compress/uastc_level=0 -compress/rdo_quality_loss=0.0 -compress/hdr_compression=1 -compress/normal_map=0 -compress/channel_pack=0 -mipmaps/generate=false -mipmaps/limit=-1 -roughness/mode=0 -roughness/src_normal="" -process/channel_remap/red=0 -process/channel_remap/green=1 -process/channel_remap/blue=2 -process/channel_remap/alpha=3 -process/fix_alpha_border=true -process/premult_alpha=false -process/normal_map_invert_y=false -process/hdr_as_srgb=false -process/hdr_clamp_exposure=false -process/size_limit=0 -detect_3d/compress_to=1 -svg/scale=1.0 -editor/scale_with_editor_scale=false -editor/convert_colors_with_editor_theme=false +base_scale=1.0 +saturation=1.0 +color_map={} +compress=true diff --git a/addons/flexible_layout/tab.svg.import b/addons/flexible_layout/tab.svg.import index acc36dffd..31c0ada69 100644 --- a/addons/flexible_layout/tab.svg.import +++ b/addons/flexible_layout/tab.svg.import @@ -1,43 +1,18 @@ [remap] -importer="texture" -type="CompressedTexture2D" -uid="uid://bja65j8x1jrvj" -path="res://.godot/imported/tab.svg-ccf47035ab2d2b2098f3b421c7a32000.ctex" -metadata={ -"vram_texture": false -} +importer="svg" +type="DPITexture" +uid="uid://dqdyudofmmv61" +path="res://.godot/imported/tab.svg-ccf47035ab2d2b2098f3b421c7a32000.dpitex" [deps] source_file="res://addons/flexible_layout/tab.svg" -dest_files=["res://.godot/imported/tab.svg-ccf47035ab2d2b2098f3b421c7a32000.ctex"] +dest_files=["res://.godot/imported/tab.svg-ccf47035ab2d2b2098f3b421c7a32000.dpitex"] [params] -compress/mode=0 -compress/high_quality=false -compress/lossy_quality=0.7 -compress/uastc_level=0 -compress/rdo_quality_loss=0.0 -compress/hdr_compression=1 -compress/normal_map=0 -compress/channel_pack=0 -mipmaps/generate=false -mipmaps/limit=-1 -roughness/mode=0 -roughness/src_normal="" -process/channel_remap/red=0 -process/channel_remap/green=1 -process/channel_remap/blue=2 -process/channel_remap/alpha=3 -process/fix_alpha_border=true -process/premult_alpha=false -process/normal_map_invert_y=false -process/hdr_as_srgb=false -process/hdr_clamp_exposure=false -process/size_limit=0 -detect_3d/compress_to=1 -svg/scale=1.0 -editor/scale_with_editor_scale=false -editor/convert_colors_with_editor_theme=false +base_scale=1.0 +saturation=1.0 +color_map={} +compress=true diff --git a/material_maker/icons/godot_logo.svg.import b/material_maker/icons/godot_logo.svg.import index 451c7f370..05994b8b1 100644 --- a/material_maker/icons/godot_logo.svg.import +++ b/material_maker/icons/godot_logo.svg.import @@ -1,43 +1,18 @@ [remap] -importer="texture" -type="CompressedTexture2D" -uid="uid://cfugy4gny4tfh" -path="res://.godot/imported/godot_logo.svg-4b89d8bf8533de4522d0f7d92c0a0af4.ctex" -metadata={ -"vram_texture": false -} +importer="svg" +type="DPITexture" +uid="uid://bc6or0m45wo0f" +path="res://.godot/imported/godot_logo.svg-4b89d8bf8533de4522d0f7d92c0a0af4.dpitex" [deps] source_file="res://material_maker/icons/godot_logo.svg" -dest_files=["res://.godot/imported/godot_logo.svg-4b89d8bf8533de4522d0f7d92c0a0af4.ctex"] +dest_files=["res://.godot/imported/godot_logo.svg-4b89d8bf8533de4522d0f7d92c0a0af4.dpitex"] [params] -compress/mode=0 -compress/high_quality=false -compress/lossy_quality=0.7 -compress/uastc_level=0 -compress/rdo_quality_loss=0.0 -compress/hdr_compression=1 -compress/normal_map=0 -compress/channel_pack=0 -mipmaps/generate=false -mipmaps/limit=-1 -roughness/mode=0 -roughness/src_normal="" -process/channel_remap/red=0 -process/channel_remap/green=1 -process/channel_remap/blue=2 -process/channel_remap/alpha=3 -process/fix_alpha_border=true -process/premult_alpha=false -process/normal_map_invert_y=false -process/hdr_as_srgb=false -process/hdr_clamp_exposure=false -process/size_limit=0 -detect_3d/compress_to=1 -svg/scale=1.0 -editor/scale_with_editor_scale=false -editor/convert_colors_with_editor_theme=false +base_scale=1.0 +saturation=1.0 +color_map={} +compress=true diff --git a/material_maker/windows/about/about.gd b/material_maker/windows/about/about.gd index a2837f2ad..6564f37fb 100644 --- a/material_maker/windows/about/about.gd +++ b/material_maker/windows/about/about.gd @@ -112,5 +112,9 @@ func open_url(url) -> void: func _notification(what: int) -> void: match what: NOTIFICATION_THEME_CHANGED: - %EpicLogo.material.set_shader_parameter("invert", - "light" in mm_globals.main_window.theme.resource_path) + var is_light_theme : bool = "light" in mm_globals.main_window.theme.resource_path + %EpicLogo.material.set_shader_parameter("invert", is_light_theme) + $BG.color.a = float(is_light_theme) + for logo in $HBoxContainer/MarginContainer/SocialNetworks.get_children(): + if logo.material: + logo.material.set_shader_parameter("invert", is_light_theme) diff --git a/material_maker/windows/about/about.tscn b/material_maker/windows/about/about.tscn index ffaad46e4..866dfe7d0 100644 --- a/material_maker/windows/about/about.tscn +++ b/material_maker/windows/about/about.tscn @@ -1,43 +1,66 @@ -[gd_scene load_steps=16 format=3 uid="uid://btww87u0o4x7t"] +[gd_scene load_steps=22 format=3 uid="uid://btww87u0o4x7t"] [ext_resource type="Script" uid="uid://c80e0om4076tc" path="res://material_maker/windows/about/about.gd" id="1"] -[ext_resource type="Texture2D" uid="uid://uwqukrk00ios" path="res://material_maker/windows/about/github.png" id="2"] -[ext_resource type="Texture2D" uid="uid://d0417sp8jvp7a" path="res://material_maker/windows/about/itchio.png" id="5"] +[ext_resource type="Shader" uid="uid://clbm7f7vq3mgp" path="res://material_maker/windows/about/about_light_dark.gdshader" id="3_a5pf6"] +[ext_resource type="Texture2D" uid="uid://e6bml33fn07p" path="res://material_maker/windows/about/itchio.svg" id="5_a5pf6"] +[ext_resource type="Texture2D" uid="uid://deyqa1lpneeew" path="res://material_maker/windows/about/patreon.svg" id="5_wcmb3"] [ext_resource type="Texture2D" uid="uid://dntvnke4pcqqf" path="res://icon.png" id="6"] -[ext_resource type="Texture2D" uid="uid://bxfuae46y2fdc" path="res://material_maker/windows/about/youtube.png" id="7"] -[ext_resource type="Texture2D" uid="uid://c1due54dyeob1" path="res://material_maker/windows/about/x.svg" id="8_a5pf6"] +[ext_resource type="Texture2D" uid="uid://n8jt6rureb5f" path="res://material_maker/windows/about/discord.svg" id="6_0an10"] +[ext_resource type="Texture2D" uid="uid://bjhogo6c5ev1x" path="res://material_maker/windows/about/github.svg" id="6_a5pf6"] +[ext_resource type="Texture2D" uid="uid://dxn6pembncyas" path="res://material_maker/windows/about/x.svg" id="8_a5pf6"] [ext_resource type="Texture2D" uid="uid://d3measjdowk0x" path="res://material_maker/windows/about/facebook.png" id="9"] -[ext_resource type="Texture2D" uid="uid://cnso3ncxhcnek" path="res://material_maker/windows/about/bluesky.svg" id="9_a5pf6"] -[ext_resource type="Texture2D" uid="uid://dvniks5a8tybt" path="res://material_maker/windows/about/discord.png" id="10"] -[ext_resource type="Texture2D" uid="uid://clxj8dqkqggfi" path="res://material_maker/windows/about/mastodon.svg" id="10_wcmb3"] -[ext_resource type="Texture2D" uid="uid://btvwy8odw2nmx" path="res://material_maker/windows/about/patreon.png" id="11"] -[ext_resource type="Texture2D" uid="uid://t53vu231awns" path="res://material_maker/windows/about/epic_megagrant.svg" id="12"] - -[sub_resource type="Shader" id="Shader_0an10"] -code = "shader_type canvas_item; - -uniform sampler2D tex; -uniform bool invert = false; - -void fragment() { - vec4 col = texture(tex, UV); - COLOR = invert ? col : vec4(1.0-col.rgb, col.a); -} -" +[ext_resource type="Texture2D" uid="uid://dranxt7hxluot" path="res://material_maker/windows/about/bluesky.svg" id="9_a5pf6"] +[ext_resource type="Texture2D" uid="uid://bhcv8xiydl2fx" path="res://material_maker/windows/about/mastodon.svg" id="10_wcmb3"] +[ext_resource type="Texture2D" uid="uid://c06d6ulgucg4q" path="res://material_maker/windows/about/epic_megagrant.svg" id="12"] +[ext_resource type="Texture2D" uid="uid://ck3om64nu1ghj" path="res://material_maker/windows/about/youtube.svg" id="12_wcmb3"] [sub_resource type="ShaderMaterial" id="ShaderMaterial_a5pf6"] -shader = SubResource("Shader_0an10") +shader = ExtResource("3_a5pf6") shader_parameter/tex = ExtResource("12") +shader_parameter/scale = 1.0 shader_parameter/invert = false [sub_resource type="PlaceholderTexture2D" id="PlaceholderTexture2D_0an10"] +[sub_resource type="ShaderMaterial" id="ShaderMaterial_y717h"] +shader = ExtResource("3_a5pf6") +shader_parameter/tex = ExtResource("5_wcmb3") +shader_parameter/scale = 4.0 +shader_parameter/invert = false + +[sub_resource type="PlaceholderTexture2D" id="PlaceholderTexture2D_71vq8"] + +[sub_resource type="ShaderMaterial" id="ShaderMaterial_wcmb3"] +shader = ExtResource("3_a5pf6") +shader_parameter/tex = ExtResource("6_a5pf6") +shader_parameter/scale = 4.0 +shader_parameter/invert = false + +[sub_resource type="PlaceholderTexture2D" id="PlaceholderTexture2D_a5pf6"] + +[sub_resource type="ShaderMaterial" id="ShaderMaterial_71vq8"] +shader = ExtResource("3_a5pf6") +shader_parameter/tex = ExtResource("8_a5pf6") +shader_parameter/scale = 4.0 +shader_parameter/invert = false + +[sub_resource type="PlaceholderTexture2D" id="PlaceholderTexture2D_wcmb3"] + [node name="About" type="Window"] +oversampling_override = 1.0 title = "About Material Maker" position = Vector2i(0, 36) size = Vector2i(600, 500) script = ExtResource("1") +[node name="BG" type="ColorRect" parent="."] +anchors_preset = 15 +anchor_right = 1.0 +anchor_bottom = 1.0 +grow_horizontal = 2 +grow_vertical = 2 +color = Color(0.91764706, 0.91764706, 0.91764706, 0) + [node name="HBoxContainer" type="HBoxContainer" parent="."] anchors_preset = 15 anchor_right = 1.0 @@ -184,18 +207,17 @@ theme_override_constants/margin_bottom = 8 [node name="SocialNetworks" type="VBoxContainer" parent="HBoxContainer/MarginContainer"] layout_mode = 2 -size_flags_vertical = 3 [node name="Patreon" type="TextureButton" parent="HBoxContainer/MarginContainer/SocialNetworks"] +material = SubResource("ShaderMaterial_y717h") custom_minimum_size = Vector2(32, 32) layout_mode = 2 size_flags_horizontal = 4 size_flags_vertical = 6 tooltip_text = "Patreon" mouse_default_cursor_shape = 2 -texture_normal = ExtResource("11") -ignore_texture_size = true -stretch_mode = 4 +texture_normal = SubResource("PlaceholderTexture2D_71vq8") +stretch_mode = 5 [node name="ItchIo" type="TextureButton" parent="HBoxContainer/MarginContainer/SocialNetworks"] custom_minimum_size = Vector2(32, 32) @@ -204,20 +226,20 @@ size_flags_horizontal = 4 size_flags_vertical = 6 tooltip_text = "itch.io" mouse_default_cursor_shape = 2 -texture_normal = ExtResource("5") +texture_normal = ExtResource("5_a5pf6") ignore_texture_size = true -stretch_mode = 4 +stretch_mode = 5 [node name="Github" type="TextureButton" parent="HBoxContainer/MarginContainer/SocialNetworks"] +material = SubResource("ShaderMaterial_wcmb3") custom_minimum_size = Vector2(32, 32) layout_mode = 2 size_flags_horizontal = 4 size_flags_vertical = 6 tooltip_text = "GitHub" mouse_default_cursor_shape = 2 -texture_normal = ExtResource("2") -ignore_texture_size = true -stretch_mode = 4 +texture_normal = SubResource("PlaceholderTexture2D_a5pf6") +stretch_mode = 0 [node name="Discord" type="TextureButton" parent="HBoxContainer/MarginContainer/SocialNetworks"] custom_minimum_size = Vector2(32, 32) @@ -226,20 +248,20 @@ size_flags_horizontal = 4 size_flags_vertical = 6 tooltip_text = "Discord" mouse_default_cursor_shape = 2 -texture_normal = ExtResource("10") +texture_normal = ExtResource("6_0an10") ignore_texture_size = true -stretch_mode = 4 +stretch_mode = 5 [node name="X" type="TextureButton" parent="HBoxContainer/MarginContainer/SocialNetworks"] +material = SubResource("ShaderMaterial_71vq8") custom_minimum_size = Vector2(32, 32) layout_mode = 2 size_flags_horizontal = 4 size_flags_vertical = 6 tooltip_text = "X" mouse_default_cursor_shape = 2 -texture_normal = ExtResource("8_a5pf6") -ignore_texture_size = true -stretch_mode = 4 +texture_normal = SubResource("PlaceholderTexture2D_wcmb3") +stretch_mode = 5 [node name="BlueSky" type="TextureButton" parent="HBoxContainer/MarginContainer/SocialNetworks"] custom_minimum_size = Vector2(32, 32) @@ -250,7 +272,7 @@ tooltip_text = "Bluesky" mouse_default_cursor_shape = 2 texture_normal = ExtResource("9_a5pf6") ignore_texture_size = true -stretch_mode = 4 +stretch_mode = 5 [node name="Mastodon" type="TextureButton" parent="HBoxContainer/MarginContainer/SocialNetworks"] custom_minimum_size = Vector2(32, 32) @@ -261,7 +283,7 @@ tooltip_text = "Mastodon" mouse_default_cursor_shape = 2 texture_normal = ExtResource("10_wcmb3") ignore_texture_size = true -stretch_mode = 4 +stretch_mode = 5 [node name="Youtube" type="TextureButton" parent="HBoxContainer/MarginContainer/SocialNetworks"] custom_minimum_size = Vector2(32, 32) @@ -270,9 +292,9 @@ size_flags_horizontal = 4 size_flags_vertical = 6 tooltip_text = "YouTube" mouse_default_cursor_shape = 2 -texture_normal = ExtResource("7") +texture_normal = ExtResource("12_wcmb3") ignore_texture_size = true -stretch_mode = 4 +stretch_mode = 5 [node name="Facebook" type="TextureButton" parent="HBoxContainer/MarginContainer/SocialNetworks"] visible = false diff --git a/material_maker/windows/about/about_light_dark.gdshader b/material_maker/windows/about/about_light_dark.gdshader new file mode 100644 index 000000000..b6a22eb34 --- /dev/null +++ b/material_maker/windows/about/about_light_dark.gdshader @@ -0,0 +1,10 @@ +shader_type canvas_item; + +uniform sampler2D tex; +uniform float scale = 1.0; +uniform bool invert = false; + +void fragment() { + vec4 col = texture(tex, UV*scale); + COLOR = invert ? col : vec4(1.0-col.rgb, col.a); +} diff --git a/material_maker/windows/about/about_light_dark.gdshader.uid b/material_maker/windows/about/about_light_dark.gdshader.uid new file mode 100644 index 000000000..72a8472db --- /dev/null +++ b/material_maker/windows/about/about_light_dark.gdshader.uid @@ -0,0 +1 @@ +uid://clbm7f7vq3mgp diff --git a/material_maker/windows/about/bluesky.svg.import b/material_maker/windows/about/bluesky.svg.import index 3c2e9f0ed..2e9467bdb 100644 --- a/material_maker/windows/about/bluesky.svg.import +++ b/material_maker/windows/about/bluesky.svg.import @@ -1,43 +1,18 @@ [remap] -importer="texture" -type="CompressedTexture2D" -uid="uid://cnso3ncxhcnek" -path="res://.godot/imported/bluesky.svg-03537cafb51b1f38507a59b25687b2ee.ctex" -metadata={ -"vram_texture": false -} +importer="svg" +type="DPITexture" +uid="uid://dranxt7hxluot" +path="res://.godot/imported/bluesky.svg-03537cafb51b1f38507a59b25687b2ee.dpitex" [deps] source_file="res://material_maker/windows/about/bluesky.svg" -dest_files=["res://.godot/imported/bluesky.svg-03537cafb51b1f38507a59b25687b2ee.ctex"] +dest_files=["res://.godot/imported/bluesky.svg-03537cafb51b1f38507a59b25687b2ee.dpitex"] [params] -compress/mode=0 -compress/high_quality=false -compress/lossy_quality=0.7 -compress/uastc_level=0 -compress/rdo_quality_loss=0.0 -compress/hdr_compression=1 -compress/normal_map=0 -compress/channel_pack=0 -mipmaps/generate=false -mipmaps/limit=-1 -roughness/mode=0 -roughness/src_normal="" -process/channel_remap/red=0 -process/channel_remap/green=1 -process/channel_remap/blue=2 -process/channel_remap/alpha=3 -process/fix_alpha_border=true -process/premult_alpha=false -process/normal_map_invert_y=false -process/hdr_as_srgb=false -process/hdr_clamp_exposure=false -process/size_limit=0 -detect_3d/compress_to=1 -svg/scale=0.2 -editor/scale_with_editor_scale=false -editor/convert_colors_with_editor_theme=false +base_scale=1.0 +saturation=1.0 +color_map={} +compress=true diff --git a/material_maker/windows/about/discord.png b/material_maker/windows/about/discord.png deleted file mode 100644 index 0e4172f5f..000000000 Binary files a/material_maker/windows/about/discord.png and /dev/null differ diff --git a/material_maker/windows/about/discord.png.import b/material_maker/windows/about/discord.png.import deleted file mode 100644 index 5bf3a8759..000000000 --- a/material_maker/windows/about/discord.png.import +++ /dev/null @@ -1,40 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://dvniks5a8tybt" -path="res://.godot/imported/discord.png-e6874edc6fabb324b43a509b6b646f41.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://material_maker/windows/about/discord.png" -dest_files=["res://.godot/imported/discord.png-e6874edc6fabb324b43a509b6b646f41.ctex"] - -[params] - -compress/mode=0 -compress/high_quality=false -compress/lossy_quality=0.7 -compress/uastc_level=0 -compress/rdo_quality_loss=0.0 -compress/hdr_compression=1 -compress/normal_map=0 -compress/channel_pack=0 -mipmaps/generate=false -mipmaps/limit=-1 -roughness/mode=0 -roughness/src_normal="" -process/channel_remap/red=0 -process/channel_remap/green=1 -process/channel_remap/blue=2 -process/channel_remap/alpha=3 -process/fix_alpha_border=true -process/premult_alpha=false -process/normal_map_invert_y=false -process/hdr_as_srgb=false -process/hdr_clamp_exposure=false -process/size_limit=0 -detect_3d/compress_to=1 diff --git a/material_maker/windows/about/discord.svg b/material_maker/windows/about/discord.svg new file mode 100644 index 000000000..b636d1508 --- /dev/null +++ b/material_maker/windows/about/discord.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/material_maker/windows/about/discord.svg.import b/material_maker/windows/about/discord.svg.import new file mode 100644 index 000000000..5804f228c --- /dev/null +++ b/material_maker/windows/about/discord.svg.import @@ -0,0 +1,18 @@ +[remap] + +importer="svg" +type="DPITexture" +uid="uid://n8jt6rureb5f" +path="res://.godot/imported/discord.svg-8117f208b8ad543022c7adf2069a0c9b.dpitex" + +[deps] + +source_file="res://material_maker/windows/about/discord.svg" +dest_files=["res://.godot/imported/discord.svg-8117f208b8ad543022c7adf2069a0c9b.dpitex"] + +[params] + +base_scale=1.0 +saturation=1.0 +color_map={} +compress=true diff --git a/material_maker/windows/about/epic_megagrant.svg.import b/material_maker/windows/about/epic_megagrant.svg.import index fc7d48777..52aecff07 100644 --- a/material_maker/windows/about/epic_megagrant.svg.import +++ b/material_maker/windows/about/epic_megagrant.svg.import @@ -1,43 +1,18 @@ [remap] -importer="texture" -type="CompressedTexture2D" -uid="uid://t53vu231awns" -path="res://.godot/imported/epic_megagrant.svg-5f8c30e623426c4cf4afe393d87e2b99.ctex" -metadata={ -"vram_texture": false -} +importer="svg" +type="DPITexture" +uid="uid://c06d6ulgucg4q" +path="res://.godot/imported/epic_megagrant.svg-5f8c30e623426c4cf4afe393d87e2b99.dpitex" [deps] source_file="res://material_maker/windows/about/epic_megagrant.svg" -dest_files=["res://.godot/imported/epic_megagrant.svg-5f8c30e623426c4cf4afe393d87e2b99.ctex"] +dest_files=["res://.godot/imported/epic_megagrant.svg-5f8c30e623426c4cf4afe393d87e2b99.dpitex"] [params] -compress/mode=0 -compress/high_quality=false -compress/lossy_quality=0.7 -compress/uastc_level=0 -compress/rdo_quality_loss=0.0 -compress/hdr_compression=1 -compress/normal_map=0 -compress/channel_pack=0 -mipmaps/generate=false -mipmaps/limit=-1 -roughness/mode=0 -roughness/src_normal="" -process/channel_remap/red=0 -process/channel_remap/green=1 -process/channel_remap/blue=2 -process/channel_remap/alpha=3 -process/fix_alpha_border=true -process/premult_alpha=false -process/normal_map_invert_y=false -process/hdr_as_srgb=false -process/hdr_clamp_exposure=false -process/size_limit=0 -detect_3d/compress_to=1 -svg/scale=1.0 -editor/scale_with_editor_scale=false -editor/convert_colors_with_editor_theme=false +base_scale=1.0 +saturation=1.0 +color_map={} +compress=true diff --git a/material_maker/windows/about/github.png b/material_maker/windows/about/github.png deleted file mode 100644 index b7ed55c2a..000000000 Binary files a/material_maker/windows/about/github.png and /dev/null differ diff --git a/material_maker/windows/about/github.png.import b/material_maker/windows/about/github.png.import deleted file mode 100644 index 5a2b5dec2..000000000 --- a/material_maker/windows/about/github.png.import +++ /dev/null @@ -1,40 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://uwqukrk00ios" -path="res://.godot/imported/github.png-3b620d30367445a49ec5c5c9e802508e.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://material_maker/windows/about/github.png" -dest_files=["res://.godot/imported/github.png-3b620d30367445a49ec5c5c9e802508e.ctex"] - -[params] - -compress/mode=0 -compress/high_quality=false -compress/lossy_quality=0.7 -compress/uastc_level=0 -compress/rdo_quality_loss=0.0 -compress/hdr_compression=1 -compress/normal_map=0 -compress/channel_pack=0 -mipmaps/generate=false -mipmaps/limit=-1 -roughness/mode=0 -roughness/src_normal="" -process/channel_remap/red=0 -process/channel_remap/green=1 -process/channel_remap/blue=2 -process/channel_remap/alpha=3 -process/fix_alpha_border=true -process/premult_alpha=false -process/normal_map_invert_y=false -process/hdr_as_srgb=false -process/hdr_clamp_exposure=false -process/size_limit=0 -detect_3d/compress_to=1 diff --git a/material_maker/windows/about/github.svg b/material_maker/windows/about/github.svg new file mode 100644 index 000000000..57d83fac1 --- /dev/null +++ b/material_maker/windows/about/github.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/material_maker/windows/about/github.svg.import b/material_maker/windows/about/github.svg.import new file mode 100644 index 000000000..abbbfe6eb --- /dev/null +++ b/material_maker/windows/about/github.svg.import @@ -0,0 +1,18 @@ +[remap] + +importer="svg" +type="DPITexture" +uid="uid://bjhogo6c5ev1x" +path="res://.godot/imported/github.svg-f9ba5c5964dcfefbe9ce449edcc4d51d.dpitex" + +[deps] + +source_file="res://material_maker/windows/about/github.svg" +dest_files=["res://.godot/imported/github.svg-f9ba5c5964dcfefbe9ce449edcc4d51d.dpitex"] + +[params] + +base_scale=1.0 +saturation=1.0 +color_map={} +compress=true diff --git a/material_maker/windows/about/itchio.png b/material_maker/windows/about/itchio.png deleted file mode 100644 index 9efa7e674..000000000 Binary files a/material_maker/windows/about/itchio.png and /dev/null differ diff --git a/material_maker/windows/about/itchio.png.import b/material_maker/windows/about/itchio.png.import deleted file mode 100644 index 0460905e0..000000000 --- a/material_maker/windows/about/itchio.png.import +++ /dev/null @@ -1,40 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://d0417sp8jvp7a" -path="res://.godot/imported/itchio.png-0674b77fd8530e8c1a87c77c0fb16f47.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://material_maker/windows/about/itchio.png" -dest_files=["res://.godot/imported/itchio.png-0674b77fd8530e8c1a87c77c0fb16f47.ctex"] - -[params] - -compress/mode=0 -compress/high_quality=false -compress/lossy_quality=0.7 -compress/uastc_level=0 -compress/rdo_quality_loss=0.0 -compress/hdr_compression=1 -compress/normal_map=0 -compress/channel_pack=0 -mipmaps/generate=false -mipmaps/limit=-1 -roughness/mode=0 -roughness/src_normal="" -process/channel_remap/red=0 -process/channel_remap/green=1 -process/channel_remap/blue=2 -process/channel_remap/alpha=3 -process/fix_alpha_border=true -process/premult_alpha=false -process/normal_map_invert_y=false -process/hdr_as_srgb=false -process/hdr_clamp_exposure=false -process/size_limit=0 -detect_3d/compress_to=1 diff --git a/material_maker/windows/about/itchio.svg b/material_maker/windows/about/itchio.svg new file mode 100644 index 000000000..1c70733fe --- /dev/null +++ b/material_maker/windows/about/itchio.svg @@ -0,0 +1,11 @@ + + + itchio-logo-textless-black + + + + + + + + \ No newline at end of file diff --git a/material_maker/windows/about/itchio.svg.import b/material_maker/windows/about/itchio.svg.import new file mode 100644 index 000000000..d50ff5533 --- /dev/null +++ b/material_maker/windows/about/itchio.svg.import @@ -0,0 +1,18 @@ +[remap] + +importer="svg" +type="DPITexture" +uid="uid://e6bml33fn07p" +path="res://.godot/imported/itchio.svg-63f445caf1335fc89e7a0da6ed05f43a.dpitex" + +[deps] + +source_file="res://material_maker/windows/about/itchio.svg" +dest_files=["res://.godot/imported/itchio.svg-63f445caf1335fc89e7a0da6ed05f43a.dpitex"] + +[params] + +base_scale=1.0 +saturation=1.0 +color_map={} +compress=true diff --git a/material_maker/windows/about/mastodon.svg.import b/material_maker/windows/about/mastodon.svg.import index fdff5d010..60d0eada5 100644 --- a/material_maker/windows/about/mastodon.svg.import +++ b/material_maker/windows/about/mastodon.svg.import @@ -1,43 +1,18 @@ [remap] -importer="texture" -type="CompressedTexture2D" -uid="uid://clxj8dqkqggfi" -path="res://.godot/imported/mastodon.svg-26474328390710b9614e9ebd76f5015b.ctex" -metadata={ -"vram_texture": false -} +importer="svg" +type="DPITexture" +uid="uid://bhcv8xiydl2fx" +path="res://.godot/imported/mastodon.svg-26474328390710b9614e9ebd76f5015b.dpitex" [deps] source_file="res://material_maker/windows/about/mastodon.svg" -dest_files=["res://.godot/imported/mastodon.svg-26474328390710b9614e9ebd76f5015b.ctex"] +dest_files=["res://.godot/imported/mastodon.svg-26474328390710b9614e9ebd76f5015b.dpitex"] [params] -compress/mode=0 -compress/high_quality=false -compress/lossy_quality=0.7 -compress/uastc_level=0 -compress/rdo_quality_loss=0.0 -compress/hdr_compression=1 -compress/normal_map=0 -compress/channel_pack=0 -mipmaps/generate=false -mipmaps/limit=-1 -roughness/mode=0 -roughness/src_normal="" -process/channel_remap/red=0 -process/channel_remap/green=1 -process/channel_remap/blue=2 -process/channel_remap/alpha=3 -process/fix_alpha_border=true -process/premult_alpha=false -process/normal_map_invert_y=false -process/hdr_as_srgb=false -process/hdr_clamp_exposure=false -process/size_limit=0 -detect_3d/compress_to=1 -svg/scale=0.5 -editor/scale_with_editor_scale=false -editor/convert_colors_with_editor_theme=false +base_scale=1.0 +saturation=1.0 +color_map={} +compress=true diff --git a/material_maker/windows/about/patreon.png b/material_maker/windows/about/patreon.png deleted file mode 100644 index 7404b7982..000000000 Binary files a/material_maker/windows/about/patreon.png and /dev/null differ diff --git a/material_maker/windows/about/patreon.png.import b/material_maker/windows/about/patreon.png.import deleted file mode 100644 index 50cc434e1..000000000 --- a/material_maker/windows/about/patreon.png.import +++ /dev/null @@ -1,40 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://btvwy8odw2nmx" -path="res://.godot/imported/patreon.png-aab773564093d5c2ef9e484ae42ae21e.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://material_maker/windows/about/patreon.png" -dest_files=["res://.godot/imported/patreon.png-aab773564093d5c2ef9e484ae42ae21e.ctex"] - -[params] - -compress/mode=0 -compress/high_quality=false -compress/lossy_quality=0.7 -compress/uastc_level=0 -compress/rdo_quality_loss=0.0 -compress/hdr_compression=1 -compress/normal_map=0 -compress/channel_pack=0 -mipmaps/generate=false -mipmaps/limit=-1 -roughness/mode=0 -roughness/src_normal="" -process/channel_remap/red=0 -process/channel_remap/green=1 -process/channel_remap/blue=2 -process/channel_remap/alpha=3 -process/fix_alpha_border=true -process/premult_alpha=false -process/normal_map_invert_y=false -process/hdr_as_srgb=false -process/hdr_clamp_exposure=false -process/size_limit=0 -detect_3d/compress_to=1 diff --git a/material_maker/windows/about/patreon.svg b/material_maker/windows/about/patreon.svg new file mode 100644 index 000000000..4cf79b604 --- /dev/null +++ b/material_maker/windows/about/patreon.svg @@ -0,0 +1,8 @@ + + + + + diff --git a/material_maker/windows/about/patreon.svg.import b/material_maker/windows/about/patreon.svg.import new file mode 100644 index 000000000..65f9fa372 --- /dev/null +++ b/material_maker/windows/about/patreon.svg.import @@ -0,0 +1,18 @@ +[remap] + +importer="svg" +type="DPITexture" +uid="uid://deyqa1lpneeew" +path="res://.godot/imported/patreon.svg-e5400814c1ff8b95c128f724c874bba4.dpitex" + +[deps] + +source_file="res://material_maker/windows/about/patreon.svg" +dest_files=["res://.godot/imported/patreon.svg-e5400814c1ff8b95c128f724c874bba4.dpitex"] + +[params] + +base_scale=1.0 +saturation=1.0 +color_map={} +compress=true diff --git a/material_maker/windows/about/x.svg.import b/material_maker/windows/about/x.svg.import index e3af32f3e..264f4bb23 100644 --- a/material_maker/windows/about/x.svg.import +++ b/material_maker/windows/about/x.svg.import @@ -1,43 +1,18 @@ [remap] -importer="texture" -type="CompressedTexture2D" -uid="uid://c1due54dyeob1" -path="res://.godot/imported/x.svg-9a4b1312cf07a71d3800882dba5a8aa2.ctex" -metadata={ -"vram_texture": false -} +importer="svg" +type="DPITexture" +uid="uid://dxn6pembncyas" +path="res://.godot/imported/x.svg-9a4b1312cf07a71d3800882dba5a8aa2.dpitex" [deps] source_file="res://material_maker/windows/about/x.svg" -dest_files=["res://.godot/imported/x.svg-9a4b1312cf07a71d3800882dba5a8aa2.ctex"] +dest_files=["res://.godot/imported/x.svg-9a4b1312cf07a71d3800882dba5a8aa2.dpitex"] [params] -compress/mode=0 -compress/high_quality=false -compress/lossy_quality=0.7 -compress/uastc_level=0 -compress/rdo_quality_loss=0.0 -compress/hdr_compression=1 -compress/normal_map=0 -compress/channel_pack=0 -mipmaps/generate=false -mipmaps/limit=-1 -roughness/mode=0 -roughness/src_normal="" -process/channel_remap/red=0 -process/channel_remap/green=1 -process/channel_remap/blue=2 -process/channel_remap/alpha=3 -process/fix_alpha_border=true -process/premult_alpha=false -process/normal_map_invert_y=false -process/hdr_as_srgb=false -process/hdr_clamp_exposure=false -process/size_limit=0 -detect_3d/compress_to=1 -svg/scale=1.0 -editor/scale_with_editor_scale=false -editor/convert_colors_with_editor_theme=false +base_scale=1.0 +saturation=1.0 +color_map={} +compress=true diff --git a/material_maker/windows/about/youtube.png b/material_maker/windows/about/youtube.png deleted file mode 100644 index f88735d5b..000000000 Binary files a/material_maker/windows/about/youtube.png and /dev/null differ diff --git a/material_maker/windows/about/youtube.png.import b/material_maker/windows/about/youtube.png.import deleted file mode 100644 index 69b0897a2..000000000 --- a/material_maker/windows/about/youtube.png.import +++ /dev/null @@ -1,40 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://bxfuae46y2fdc" -path="res://.godot/imported/youtube.png-d1e177893d3242d8514834629872c666.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://material_maker/windows/about/youtube.png" -dest_files=["res://.godot/imported/youtube.png-d1e177893d3242d8514834629872c666.ctex"] - -[params] - -compress/mode=0 -compress/high_quality=false -compress/lossy_quality=0.7 -compress/uastc_level=0 -compress/rdo_quality_loss=0.0 -compress/hdr_compression=1 -compress/normal_map=0 -compress/channel_pack=0 -mipmaps/generate=false -mipmaps/limit=-1 -roughness/mode=0 -roughness/src_normal="" -process/channel_remap/red=0 -process/channel_remap/green=1 -process/channel_remap/blue=2 -process/channel_remap/alpha=3 -process/fix_alpha_border=true -process/premult_alpha=false -process/normal_map_invert_y=false -process/hdr_as_srgb=false -process/hdr_clamp_exposure=false -process/size_limit=0 -detect_3d/compress_to=1 diff --git a/material_maker/windows/about/youtube.svg b/material_maker/windows/about/youtube.svg new file mode 100644 index 000000000..55f1f7b65 --- /dev/null +++ b/material_maker/windows/about/youtube.svg @@ -0,0 +1,25 @@ + + + + diff --git a/material_maker/windows/about/youtube.svg.import b/material_maker/windows/about/youtube.svg.import new file mode 100644 index 000000000..4ddfb8598 --- /dev/null +++ b/material_maker/windows/about/youtube.svg.import @@ -0,0 +1,18 @@ +[remap] + +importer="svg" +type="DPITexture" +uid="uid://ck3om64nu1ghj" +path="res://.godot/imported/youtube.svg-db3de3f378029931964b0e5d9f49f0df.dpitex" + +[deps] + +source_file="res://material_maker/windows/about/youtube.svg" +dest_files=["res://.godot/imported/youtube.svg-db3de3f378029931964b0e5d9f49f0df.dpitex"] + +[params] + +base_scale=1.0 +saturation=1.0 +color_map={} +compress=true diff --git a/splash_screen/arrow.svg.import b/splash_screen/arrow.svg.import index 463ac7eef..52fc89bd7 100644 --- a/splash_screen/arrow.svg.import +++ b/splash_screen/arrow.svg.import @@ -1,43 +1,18 @@ [remap] -importer="texture" -type="CompressedTexture2D" +importer="svg" +type="DPITexture" uid="uid://dfy67bw73b836" -path="res://.godot/imported/arrow.svg-eb853693d8d177895b2abe93bb5f96fa.ctex" -metadata={ -"vram_texture": false -} +path="res://.godot/imported/arrow.svg-eb853693d8d177895b2abe93bb5f96fa.dpitex" [deps] source_file="res://splash_screen/arrow.svg" -dest_files=["res://.godot/imported/arrow.svg-eb853693d8d177895b2abe93bb5f96fa.ctex"] +dest_files=["res://.godot/imported/arrow.svg-eb853693d8d177895b2abe93bb5f96fa.dpitex"] [params] -compress/mode=0 -compress/high_quality=false -compress/lossy_quality=0.7 -compress/uastc_level=0 -compress/rdo_quality_loss=0.0 -compress/hdr_compression=1 -compress/normal_map=0 -compress/channel_pack=0 -mipmaps/generate=false -mipmaps/limit=-1 -roughness/mode=0 -roughness/src_normal="" -process/channel_remap/red=0 -process/channel_remap/green=1 -process/channel_remap/blue=2 -process/channel_remap/alpha=3 -process/fix_alpha_border=true -process/premult_alpha=false -process/normal_map_invert_y=false -process/hdr_as_srgb=false -process/hdr_clamp_exposure=false -process/size_limit=0 -detect_3d/compress_to=1 -svg/scale=1.0 -editor/scale_with_editor_scale=false -editor/convert_colors_with_editor_theme=false +base_scale=1.0 +saturation=1.0 +color_map={} +compress=true diff --git a/splash_screen/splash_screen.tscn b/splash_screen/splash_screen.tscn index cd2268df2..235c1ce92 100644 --- a/splash_screen/splash_screen.tscn +++ b/splash_screen/splash_screen.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=14 format=3 uid="uid://d24qj0s2ime0p"] [ext_resource type="Script" uid="uid://cms1wqfr4yeb5" path="res://splash_screen/splash_screen.gd" id="1_q7nii"] -[ext_resource type="Texture2D" uid="uid://bdba0wahju1ak" path="res://splash_screen/splash_title.png" id="2_ryhtq"] +[ext_resource type="Texture2D" uid="uid://6b2hhcgw86n8" path="res://splash_screen/splash_title.svg" id="2_uba88"] [ext_resource type="FontFile" uid="uid://dttdyavpec18b" path="res://material_maker/fonts/vegur_regular.otf" id="3_m0b76"] [ext_resource type="Texture2D" uid="uid://dfy67bw73b836" path="res://splash_screen/arrow.svg" id="5_o00vo"] [ext_resource type="Shader" uid="uid://b3x7551t5ha0u" path="res://splash_screen/splash_screen_bottom.gdshader" id="5_xhfa4"] @@ -53,7 +53,7 @@ layout_mode = 0 offset_top = 34.0 offset_right = 435.0 offset_bottom = 155.0 -texture = ExtResource("2_ryhtq") +texture = ExtResource("2_uba88") [node name="MM" type="Label" parent="SplashScreen/TextureRect"] layout_mode = 0 diff --git a/splash_screen/splash_title.png b/splash_screen/splash_title.png deleted file mode 100644 index e92bbfc9b..000000000 Binary files a/splash_screen/splash_title.png and /dev/null differ diff --git a/splash_screen/splash_title.png.import b/splash_screen/splash_title.png.import deleted file mode 100644 index 01e2d8187..000000000 --- a/splash_screen/splash_title.png.import +++ /dev/null @@ -1,40 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://bdba0wahju1ak" -path="res://.godot/imported/splash_title.png-20b9424661db4ee1f52ba6e9bedec544.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://splash_screen/splash_title.png" -dest_files=["res://.godot/imported/splash_title.png-20b9424661db4ee1f52ba6e9bedec544.ctex"] - -[params] - -compress/mode=0 -compress/high_quality=false -compress/lossy_quality=0.7 -compress/uastc_level=0 -compress/rdo_quality_loss=0.0 -compress/hdr_compression=1 -compress/normal_map=0 -compress/channel_pack=0 -mipmaps/generate=false -mipmaps/limit=-1 -roughness/mode=0 -roughness/src_normal="" -process/channel_remap/red=0 -process/channel_remap/green=1 -process/channel_remap/blue=2 -process/channel_remap/alpha=3 -process/fix_alpha_border=true -process/premult_alpha=false -process/normal_map_invert_y=false -process/hdr_as_srgb=false -process/hdr_clamp_exposure=false -process/size_limit=0 -detect_3d/compress_to=1 diff --git a/splash_screen/splash_title.svg.import b/splash_screen/splash_title.svg.import index 10b9c09d5..d5926938f 100644 --- a/splash_screen/splash_title.svg.import +++ b/splash_screen/splash_title.svg.import @@ -1,43 +1,18 @@ [remap] -importer="texture" -type="CompressedTexture2D" +importer="svg" +type="DPITexture" uid="uid://6b2hhcgw86n8" -path="res://.godot/imported/splash_title.svg-d58bc8b316f9727b5726b815dd5c6875.ctex" -metadata={ -"vram_texture": false -} +path="res://.godot/imported/splash_title.svg-d58bc8b316f9727b5726b815dd5c6875.dpitex" [deps] source_file="res://splash_screen/splash_title.svg" -dest_files=["res://.godot/imported/splash_title.svg-d58bc8b316f9727b5726b815dd5c6875.ctex"] +dest_files=["res://.godot/imported/splash_title.svg-d58bc8b316f9727b5726b815dd5c6875.dpitex"] [params] -compress/mode=0 -compress/high_quality=false -compress/lossy_quality=0.7 -compress/uastc_level=0 -compress/rdo_quality_loss=0.0 -compress/hdr_compression=1 -compress/normal_map=0 -compress/channel_pack=0 -mipmaps/generate=false -mipmaps/limit=-1 -roughness/mode=0 -roughness/src_normal="" -process/channel_remap/red=0 -process/channel_remap/green=1 -process/channel_remap/blue=2 -process/channel_remap/alpha=3 -process/fix_alpha_border=true -process/premult_alpha=false -process/normal_map_invert_y=false -process/hdr_as_srgb=false -process/hdr_clamp_exposure=false -process/size_limit=0 -detect_3d/compress_to=1 -svg/scale=1.0 -editor/scale_with_editor_scale=false -editor/convert_colors_with_editor_theme=false +base_scale=1.0 +saturation=1.0 +color_map={} +compress=true