diff --git a/addons/material_maker/main_window.gd b/addons/material_maker/main_window.gd index 125cfdf..a4333d9 100644 --- a/addons/material_maker/main_window.gd +++ b/addons/material_maker/main_window.gd @@ -50,6 +50,7 @@ func _ready(): # In HTML5 export, copy all examples to the filesystem if OS.get_name() == "HTML5": + print("Copying samples") var dir : Directory = Directory.new() dir.make_dir("/examples") dir.open("res://addons/material_maker/examples/") @@ -59,8 +60,9 @@ func _ready(): if f == "": break if f.ends_with(".ptex"): + print(f) dir.copy("res://addons/material_maker/examples/"+f, "/examples/"+f) - + print("Done") # Upscale everything if the display requires it (crude hiDPI support). # This prevents UI elements from being too small on hiDPI displays. if OS.get_screen_dpi() >= 192 and OS.get_screen_size().x >= 2048: @@ -371,7 +373,7 @@ func bug_report(): OS.shell_open("https://github.com/RodZill4/godot-procedural-textures/issues") func about(): - var about_box = preload("res://addons/material_maker/widgets/about.tscn").instance() + var about_box = preload("res://addons/material_maker/widgets/about/about.tscn").instance() add_child(about_box) about_box.popup_centered() diff --git a/addons/material_maker/widgets/about.gd b/addons/material_maker/widgets/about/about.gd similarity index 100% rename from addons/material_maker/widgets/about.gd rename to addons/material_maker/widgets/about/about.gd diff --git a/addons/material_maker/widgets/about.tscn b/addons/material_maker/widgets/about/about.tscn similarity index 70% rename from addons/material_maker/widgets/about.tscn rename to addons/material_maker/widgets/about/about.tscn index 6d3fccb..bfe8673 100644 --- a/addons/material_maker/widgets/about.tscn +++ b/addons/material_maker/widgets/about/about.tscn @@ -1,29 +1,34 @@ -[gd_scene load_steps=9 format=2] +[gd_scene load_steps=10 format=2] -[ext_resource path="res://addons/material_maker/widgets/about.gd" type="Script" id=1] +[ext_resource path="res://addons/material_maker/widgets/about/about.gd" type="Script" id=1] [ext_resource path="res://addons/material_maker/icons/icon.png" type="Texture" id=2] [ext_resource path="res://addons/material_maker/widgets/icon.png" type="Texture" id=3] [ext_resource path="res://rodz_labs_logo.png" type="Texture" id=4] -[ext_resource path="res://addons/material_maker/widgets/facebook.png" type="Texture" id=5] -[ext_resource path="res://addons/material_maker/widgets/twitter.png" type="Texture" id=6] -[ext_resource path="res://addons/material_maker/widgets/youtube.png" type="Texture" id=7] -[ext_resource path="res://addons/material_maker/widgets/github.png" type="Texture" id=8] +[ext_resource path="res://addons/material_maker/widgets/about/facebook.png" type="Texture" id=5] +[ext_resource path="res://addons/material_maker/widgets/about/twitter.png" type="Texture" id=6] +[ext_resource path="res://addons/material_maker/widgets/about/youtube.png" type="Texture" id=7] +[ext_resource path="res://addons/material_maker/widgets/about/github.png" type="Texture" id=8] +[ext_resource path="res://addons/material_maker/widgets/about/itchio.png" type="Texture" id=9] [node name="About" type="WindowDialog"] visible = true -margin_right = 138.0 -margin_bottom = 241.0 +margin_right = 200.0 +margin_bottom = 289.0 window_title = "About..." script = ExtResource( 1 ) [node name="VBoxContainer" type="VBoxContainer" parent="."] anchor_right = 1.0 anchor_bottom = 1.0 +margin_left = 10.0 +margin_top = 10.0 +margin_right = -10.0 +margin_bottom = -10.0 custom_constants/separation = 8 [node name="VBoxContainer1" type="VBoxContainer" parent="VBoxContainer"] -margin_left = 21.0 -margin_right = 116.0 +margin_left = 42.0 +margin_right = 137.0 margin_bottom = 83.0 size_flags_horizontal = 4 size_flags_vertical = 2 @@ -43,10 +48,10 @@ texture = ExtResource( 2 ) stretch_mode = 4 [node name="HBoxContainer2" type="HBoxContainer" parent="VBoxContainer"] -margin_left = 8.0 -margin_top = 100.0 -margin_right = 129.0 -margin_bottom = 132.0 +margin_left = 29.0 +margin_top = 114.0 +margin_right = 150.0 +margin_bottom = 146.0 size_flags_horizontal = 4 size_flags_vertical = 6 @@ -67,17 +72,17 @@ Godot Engine" align = 1 [node name="VBoxContainer3" type="VBoxContainer" parent="VBoxContainer"] -margin_left = 15.0 -margin_top = 149.0 -margin_right = 123.0 -margin_bottom = 241.0 +margin_left = 22.0 +margin_top = 177.0 +margin_right = 158.0 +margin_bottom = 269.0 size_flags_horizontal = 4 size_flags_vertical = 8 custom_constants/separation = 4 [node name="RZLogo" type="TextureRect" parent="VBoxContainer/VBoxContainer3"] -margin_left = 22.0 -margin_right = 86.0 +margin_left = 36.0 +margin_right = 100.0 margin_bottom = 64.0 rect_min_size = Vector2( 64, 64 ) size_flags_horizontal = 4 @@ -87,7 +92,7 @@ expand = true [node name="HBoxContainer" type="HBoxContainer" parent="VBoxContainer/VBoxContainer3"] margin_top = 68.0 -margin_right = 108.0 +margin_right = 136.0 margin_bottom = 92.0 size_flags_horizontal = 4 @@ -95,6 +100,7 @@ size_flags_horizontal = 4 margin_right = 24.0 margin_bottom = 24.0 rect_min_size = Vector2( 24, 24 ) +hint_tooltip = "Facebook" texture_normal = ExtResource( 5 ) expand = true stretch_mode = 4 @@ -104,6 +110,7 @@ margin_left = 28.0 margin_right = 52.0 margin_bottom = 24.0 rect_min_size = Vector2( 24, 24 ) +hint_tooltip = "Twitter" texture_normal = ExtResource( 6 ) expand = true stretch_mode = 4 @@ -113,6 +120,7 @@ margin_left = 56.0 margin_right = 80.0 margin_bottom = 24.0 rect_min_size = Vector2( 24, 24 ) +hint_tooltip = "Youtube" texture_normal = ExtResource( 7 ) expand = true stretch_mode = 4 @@ -122,11 +130,23 @@ margin_left = 84.0 margin_right = 108.0 margin_bottom = 24.0 rect_min_size = Vector2( 24, 24 ) +hint_tooltip = "Github" texture_normal = ExtResource( 8 ) expand = true stretch_mode = 4 + +[node name="ItchIo" type="TextureButton" parent="VBoxContainer/VBoxContainer3/HBoxContainer"] +margin_left = 112.0 +margin_right = 136.0 +margin_bottom = 24.0 +rect_min_size = Vector2( 24, 24 ) +hint_tooltip = "Github" +texture_normal = ExtResource( 9 ) +expand = true +stretch_mode = 4 [connection signal="pressed" from="VBoxContainer/HBoxContainer2/Godot" to="." method="open_url" binds= [ "https://godotengine.org/" ]] [connection signal="pressed" from="VBoxContainer/VBoxContainer3/HBoxContainer/Facebook" to="." method="open_url" binds= [ "https://www.facebook.com/RodzLabs" ]] [connection signal="pressed" from="VBoxContainer/VBoxContainer3/HBoxContainer/Twitter" to="." method="open_url" binds= [ "https://twitter.com/R0dZill4" ]] [connection signal="pressed" from="VBoxContainer/VBoxContainer3/HBoxContainer/Youtube" to="." method="open_url" binds= [ "https://www.youtube.com/channel/UCTDByv9i3ul_qQ98zUYlNAQ" ]] -[connection signal="pressed" from="VBoxContainer/VBoxContainer3/HBoxContainer/Github" to="." method="open_url" binds= [ "https://github.com/RodZill4" ]] +[connection signal="pressed" from="VBoxContainer/VBoxContainer3/HBoxContainer/Github" to="." method="open_url" binds= [ "https://github.com/RodZill4/godot-procedural-textures" ]] +[connection signal="pressed" from="VBoxContainer/VBoxContainer3/HBoxContainer/ItchIo" to="." method="open_url" binds= [ "https://rodzilla.itch.io/material-maker" ]] diff --git a/addons/material_maker/widgets/facebook.png b/addons/material_maker/widgets/about/facebook.png similarity index 100% rename from addons/material_maker/widgets/facebook.png rename to addons/material_maker/widgets/about/facebook.png diff --git a/addons/material_maker/widgets/github.png b/addons/material_maker/widgets/about/github.png similarity index 100% rename from addons/material_maker/widgets/github.png rename to addons/material_maker/widgets/about/github.png diff --git a/addons/material_maker/widgets/about/itchio.png b/addons/material_maker/widgets/about/itchio.png new file mode 100644 index 0000000..2807e6f Binary files /dev/null and b/addons/material_maker/widgets/about/itchio.png differ diff --git a/addons/material_maker/widgets/twitter.png b/addons/material_maker/widgets/about/twitter.png similarity index 100% rename from addons/material_maker/widgets/twitter.png rename to addons/material_maker/widgets/about/twitter.png diff --git a/addons/material_maker/widgets/youtube.png b/addons/material_maker/widgets/about/youtube.png similarity index 100% rename from addons/material_maker/widgets/youtube.png rename to addons/material_maker/widgets/about/youtube.png