Skip to content

Commit

Permalink
tscn/tres file format update
Browse files Browse the repository at this point in the history
  • Loading branch information
RodZill4 committed Oct 29, 2023
1 parent 64efcc6 commit a6007d8
Show file tree
Hide file tree
Showing 58 changed files with 323 additions and 323 deletions.
6 changes: 3 additions & 3 deletions material_maker/darken.tscn
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
[gd_scene load_steps=2 format=2]
[gd_scene load_steps=2 format=3 uid="uid://cmeh4ewlvp7vx"]

[ext_resource path="res://material_maker/darken.gd" type="Script" id=1]
[ext_resource type="Script" path="res://material_maker/darken.gd" id="1"]

[node name="Darken" type="ColorRect"]
anchor_right = 1.0
anchor_bottom = 1.0
script = ExtResource( 1 )
script = ExtResource("1")

[connection signal="resized" from="." to="." method="_on_resized"]
10 changes: 5 additions & 5 deletions material_maker/globals.tscn
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
[gd_scene load_steps=3 format=2]
[gd_scene load_steps=3 format=3 uid="uid://vt76awmi7ix7"]

[ext_resource path="res://material_maker/globals.gd" type="Script" id=1]
[ext_resource path="res://material_maker/globals_menu_manager.gd" type="Script" id=2]
[ext_resource type="Script" path="res://material_maker/globals.gd" id="1"]
[ext_resource type="Script" path="res://material_maker/globals_menu_manager.gd" id="2"]

[node name="Globals" type="Node"]
script = ExtResource( 1 )
script = ExtResource("1")

[node name="MenuManager" type="Node" parent="."]
script = ExtResource( 2 )
script = ExtResource("2")
4 changes: 4 additions & 0 deletions material_maker/main_window.tscn
Original file line number Diff line number Diff line change
Expand Up @@ -182,12 +182,14 @@ split_offset = 312
[node name="Top" type="TabContainer" parent="VBoxContainer/Layout/Left"]
layout_mode = 2
drag_to_rearrange_enabled = true
tabs_rearrange_group = 0
use_hidden_tabs_for_min_size = true
script = ExtResource("12_7mn0u")
[node name="Bottom" type="TabContainer" parent="VBoxContainer/Layout/Left"]
layout_mode = 2
drag_to_rearrange_enabled = true
tabs_rearrange_group = 0
use_hidden_tabs_for_min_size = true
script = ExtResource("12_7mn0u")
Expand Down Expand Up @@ -315,12 +317,14 @@ split_offset = 312
[node name="Top" type="TabContainer" parent="VBoxContainer/Layout/SplitRight/Right"]
layout_mode = 2
drag_to_rearrange_enabled = true
tabs_rearrange_group = 0
use_hidden_tabs_for_min_size = true
script = ExtResource("12_7mn0u")
[node name="Bottom" type="TabContainer" parent="VBoxContainer/Layout/SplitRight/Right"]
layout_mode = 2
drag_to_rearrange_enabled = true
tabs_rearrange_group = 0
use_hidden_tabs_for_min_size = true
script = ExtResource("12_7mn0u")
Expand Down
33 changes: 15 additions & 18 deletions material_maker/nodes/edit_buttons.tscn
Original file line number Diff line number Diff line change
@@ -1,45 +1,42 @@
[gd_scene load_steps=6 format=3]
[gd_scene load_steps=6 format=3 uid="uid://cit68cso5187c"]

[ext_resource type="Script" path="res://material_maker/nodes/edit_buttons.gd" id="1"]
[ext_resource type="Texture2D" path="res://material_maker/icons/icons.tres" id="2"]
[ext_resource type="Texture2D" uid="uid://c0j4px4n72di5" path="res://material_maker/icons/icons.tres" id="2"]

[sub_resource type="AtlasTexture" id=1]
flags = 4
atlas = ExtResource( 2 )
region = Rect2( 16, 16, 16, 16 )
[sub_resource type="AtlasTexture" id="1"]
atlas = ExtResource("2")
region = Rect2(16, 16, 16, 16)
filter_clip = true

[sub_resource type="AtlasTexture" id=2]
flags = 4
atlas = ExtResource( 2 )
region = Rect2( 48, 16, 16, 16 )
[sub_resource type="AtlasTexture" id="2"]
atlas = ExtResource("2")
region = Rect2(48, 16, 16, 16)

[sub_resource type="AtlasTexture" id=3]
flags = 4
atlas = ExtResource( 2 )
region = Rect2( 32, 16, 16, 16 )
[sub_resource type="AtlasTexture" id="3"]
atlas = ExtResource("2")
region = Rect2(32, 16, 16, 16)

[node name="NodeEditButtons" type="HBoxContainer"]
offset_right = 65.0
offset_bottom = 22.0
script = ExtResource( 1 )
script = ExtResource("1")

[node name="Edit" type="Button" parent="."]
offset_right = 28.0
offset_bottom = 22.0
icon = SubResource( 1 )
icon = SubResource("1")
flat = true

[node name="Load" type="Button" parent="."]
offset_left = 32.0
offset_right = 60.0
offset_bottom = 22.0
icon = SubResource( 2 )
icon = SubResource("2")
flat = true

[node name="Save" type="Button" parent="."]
offset_left = 64.0
offset_right = 92.0
offset_bottom = 22.0
icon = SubResource( 3 )
icon = SubResource("3")
flat = true
6 changes: 3 additions & 3 deletions material_maker/nodes/ios/port.tscn
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

[ext_resource type="Script" path="res://material_maker/nodes/ios/port.gd" id="1"]
[ext_resource type="Texture2D" uid="uid://c0j4px4n72di5" path="res://material_maker/icons/icons.tres" id="2"]
[ext_resource type="PackedScene" path="res://material_maker/widgets/linked_widgets/editable_label.tscn" id="3"]
[ext_resource type="PackedScene" path="res://material_maker/widgets/port_group_button/port_group_button.tscn" id="4"]
[ext_resource type="PackedScene" path="res://material_maker/widgets/desc_button/desc_button.tscn" id="5"]
[ext_resource type="PackedScene" uid="uid://dvp8gd7whg6h7" path="res://material_maker/widgets/linked_widgets/editable_label.tscn" id="3"]
[ext_resource type="PackedScene" uid="uid://bi88rsdxt0ld7" path="res://material_maker/widgets/port_group_button/port_group_button.tscn" id="4"]
[ext_resource type="PackedScene" uid="uid://buj231c2gxm4o" path="res://material_maker/widgets/desc_button/desc_button.tscn" id="5"]

[sub_resource type="AtlasTexture" id="1"]
atlas = ExtResource("2")
Expand Down
2 changes: 1 addition & 1 deletion material_maker/nodes/remote/named_parameter_dialog.tscn
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[gd_scene load_steps=3 format=3 uid="uid://ds7xknsmsf66c"]

[ext_resource type="Script" path="res://material_maker/nodes/remote/named_parameter_dialog.gd" id="1"]
[ext_resource type="PackedScene" path="res://material_maker/widgets/float_edit/float_edit.tscn" id="2"]
[ext_resource type="PackedScene" uid="uid://rflulhsuy3ax" path="res://material_maker/widgets/float_edit/float_edit.tscn" id="2"]

[node name="Popup" type="Window"]
script = ExtResource("1")
Expand Down
2 changes: 1 addition & 1 deletion material_maker/nodes/tones/tones.tscn
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[gd_scene load_steps=5 format=3 uid="uid://7wslfieqleli"]

[ext_resource type="PackedScene" path="res://material_maker/widgets/histogram/histogram.tscn" id="1"]
[ext_resource type="PackedScene" uid="uid://0b6d65sghy3s" path="res://material_maker/widgets/histogram/histogram.tscn" id="1"]
[ext_resource type="Script" path="res://material_maker/nodes/tones/tones.gd" id="2"]
[ext_resource type="Texture2D" uid="uid://c0j4px4n72di5" path="res://material_maker/icons/icons.tres" id="3"]

Expand Down
2 changes: 1 addition & 1 deletion material_maker/panels/graph_edit/graph_edit.tscn
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
[ext_resource type="Script" path="res://material_maker/panels/graph_edit/graph_edit.gd" id="1"]
[ext_resource type="Texture2D" uid="uid://c0j4px4n72di5" path="res://material_maker/icons/icons.tres" id="2"]
[ext_resource type="Script" path="res://material_maker/tools/undo_redo/undo_redo.gd" id="3"]
[ext_resource type="PackedScene" path="res://material_maker/widgets/desc_button/desc_button.tscn" id="4"]
[ext_resource type="PackedScene" uid="uid://buj231c2gxm4o" path="res://material_maker/widgets/desc_button/desc_button.tscn" id="4"]

[sub_resource type="Theme" id="1"]
GraphEdit/colors/activity = Color(1, 1, 1, 1)
Expand Down
40 changes: 19 additions & 21 deletions material_maker/panels/hierarchy/hierarchy_panel.tscn
Original file line number Diff line number Diff line change
@@ -1,27 +1,24 @@
[gd_scene load_steps=6 format=3]
[gd_scene load_steps=6 format=3 uid="uid://c5kgvwl2snpc8"]

[ext_resource type="Script" path="res://material_maker/panels/hierarchy/hierarchy_panel.gd" id="1"]
[ext_resource type="Texture2D" path="res://material_maker/icons/icons.tres" id="2"]
[ext_resource type="Texture2D" uid="uid://c0j4px4n72di5" path="res://material_maker/icons/icons.tres" id="2"]

[sub_resource type="AtlasTexture" id=1]
flags = 7
atlas = ExtResource( 2 )
region = Rect2( 32, 48, 16, 16 )
[sub_resource type="AtlasTexture" id="1"]
atlas = ExtResource("2")
region = Rect2(32, 48, 16, 16)

[sub_resource type="AtlasTexture" id=2]
flags = 7
atlas = ExtResource( 2 )
region = Rect2( 16, 48, 16, 16 )
[sub_resource type="AtlasTexture" id="2"]
atlas = ExtResource("2")
region = Rect2(16, 48, 16, 16)

[sub_resource type="AtlasTexture" id=3]
flags = 7
atlas = ExtResource( 2 )
region = Rect2( 0, 32, 16, 16 )
[sub_resource type="AtlasTexture" id="3"]
atlas = ExtResource("2")
region = Rect2(0, 32, 16, 16)

[node name="Hierarchy" type="VBoxContainer"]
offset_right = 40.0
offset_bottom = 40.0
script = ExtResource( 1 )
script = ExtResource("1")
__meta__ = {
"_edit_use_anchors_": false
}
Expand All @@ -34,33 +31,33 @@ offset_bottom = 22.0
offset_right = 28.0
offset_bottom = 22.0
tooltip_text = "Expand all"
icon = SubResource( 1 )
icon = SubResource("1")

[node name="Collapse" type="Button" parent="HBoxContainer"]
offset_left = 32.0
offset_right = 60.0
offset_bottom = 22.0
tooltip_text = "Collapse all"
icon = SubResource( 2 )
icon = SubResource("2")

[node name="Space" type="Control" parent="HBoxContainer"]
offset_left = 64.0
offset_right = 74.0
offset_bottom = 22.0
custom_minimum_size = Vector2( 10, 0 )
custom_minimum_size = Vector2(10, 0)

[node name="PreviewMenu" type="MenuButton" parent="HBoxContainer"]
offset_left = 78.0
offset_right = 106.0
offset_bottom = 22.0
icon = SubResource( 3 )
items = [ "No preview", null, 0, false, false, 0, 0, null, "", false, "1 preview", null, 0, false, false, 1, 0, null, "", false, "2 previews", null, 0, false, false, 2, 0, null, "", false, "3 previews", null, 0, false, false, 3, 0, null, "", false ]
icon = SubResource("3")
items = ["No preview", null, 0, false, false, 0, 0, null, "", false, "1 preview", null, 0, false, false, 1, 0, null, "", false, "2 previews", null, 0, false, false, 2, 0, null, "", false, "3 previews", null, 0, false, false, 3, 0, null, "", false]

[node name="Tree" type="Tree" parent="."]
offset_top = 26.0
offset_right = 200.0
offset_bottom = 176.0
custom_minimum_size = Vector2( 200, 150 )
custom_minimum_size = Vector2(200, 150)
size_flags_vertical = 3
allow_reselect = true
__meta__ = {
Expand All @@ -70,6 +67,7 @@ __meta__ = {
[node name="Delay" type="Timer" parent="."]
wait_time = 0.5
one_shot = true

[connection signal="pressed" from="HBoxContainer/Expand" to="." method="_on_Expand_pressed"]
[connection signal="pressed" from="HBoxContainer/Collapse" to="." method="_on_Collapse_pressed"]
[connection signal="item_activated" from="Tree" to="." method="_on_Hierarchy_item_double_clicked"]
Expand Down
10 changes: 5 additions & 5 deletions material_maker/panels/layers/add_layer_menu.tscn
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
[gd_scene load_steps=4 format=2]
[gd_scene load_steps=4 format=3 uid="uid://cy1ni25iat40x"]

[ext_resource path="res://material_maker/panels/layers/icons/layer_paint.tres" type="Texture2D" id=1]
[ext_resource path="res://material_maker/panels/layers/icons/layer_mask.tres" type="Texture2D" id=2]
[ext_resource path="res://material_maker/panels/layers/icons/layer_proc.tres" type="Texture2D" id=3]
[ext_resource type="Texture2D" path="res://material_maker/panels/layers/icons/layer_paint.tres" id="1"]
[ext_resource type="Texture2D" path="res://material_maker/panels/layers/icons/layer_mask.tres" id="2"]
[ext_resource type="Texture2D" path="res://material_maker/panels/layers/icons/layer_proc.tres" id="3"]

[node name="AddLayerMenu" type="PopupMenu"]
offset_right = 20.0
offset_bottom = 20.0
items = [ "Paint Layer", ExtResource( 1 ), 0, false, false, 0, 0, null, "", false, "Procedural Layer", ExtResource( 3 ), 0, false, false, 1, 0, null, "", false, "Mask Layer", ExtResource( 2 ), 0, false, false, 2, 0, null, "", false ]
items = ["Paint Layer", ExtResource("1"), 0, false, false, 0, 0, null, "", false, "Procedural Layer", ExtResource("3"), 0, false, false, 1, 0, null, "", false, "Mask Layer", ExtResource("2"), 0, false, false, 2, 0, null, "", false]
8 changes: 4 additions & 4 deletions material_maker/panels/layers/layer_tooltip.tscn
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
[gd_scene load_steps=2 format=2]
[gd_scene load_steps=2 format=3 uid="uid://b744rjxtaoi8a"]

[ext_resource path="res://material_maker/panels/layers/layer_tooltip.gd" type="Script" id=1]
[ext_resource type="Script" path="res://material_maker/panels/layers/layer_tooltip.gd" id="1"]

[node name="LayerTooltip" type="PanelContainer"]
anchor_right = 1.0
anchor_bottom = 1.0
offset_right = -1176.0
offset_bottom = -679.0
custom_minimum_size = Vector2( 104, 41 )
script = ExtResource( 1 )
custom_minimum_size = Vector2(104, 41)
script = ExtResource("1")
__meta__ = {
"_edit_use_anchors_": false
}
Expand Down
22 changes: 11 additions & 11 deletions material_maker/panels/layers/layer_tooltip_thumbnail.tscn
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
[gd_scene load_steps=5 format=2]
[gd_scene load_steps=5 format=3 uid="uid://djchjqk70hye1"]

[ext_resource path="res://material_maker/panels/layers/layer_tooltip_thumbnail.gd" type="Script" id=1]
[ext_resource path="res://material_maker/panels/layers/layer_tooltip_thumbnail.gdshader" type="Shader" id=2]
[ext_resource type="Script" path="res://material_maker/panels/layers/layer_tooltip_thumbnail.gd" id="1"]
[ext_resource type="Shader" path="res://material_maker/panels/layers/layer_tooltip_thumbnail.gdshader" id="2"]

[sub_resource type="ShaderMaterial" id=1]
[sub_resource type="ShaderMaterial" id="1"]
resource_local_to_scene = true
shader = ExtResource( 2 )
shader = ExtResource("2")

[sub_resource type="StyleBoxFlat" id=2]
bg_color = Color( 0, 0, 0, 0.878431 )
[sub_resource type="StyleBoxFlat" id="2"]
bg_color = Color(0, 0, 0, 0.878431)

[node name="Thumbnail" type="ColorRect"]
material = SubResource( 1 )
material = SubResource("1")
offset_top = 18.0
offset_right = 128.0
offset_bottom = 146.0
custom_minimum_size = Vector2( 128, 128 )
script = ExtResource( 1 )
custom_minimum_size = Vector2(128, 128)
script = ExtResource("1")
__meta__ = {
"_edit_use_anchors_": false
}
Expand All @@ -26,7 +26,7 @@ anchor_top = 1.0
anchor_right = 1.0
anchor_bottom = 1.0
offset_top = -14.0
theme_override_styles/normal = SubResource( 2 )
theme_override_styles/normal = SubResource("2")
text = "albedo"
align = 1
__meta__ = {
Expand Down
16 changes: 8 additions & 8 deletions material_maker/panels/library/create_lib_dialog.tscn
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
[gd_scene load_steps=3 format=2]
[gd_scene load_steps=3 format=3 uid="uid://c0ir88hj07hh5"]

[ext_resource path="res://material_maker/panels/library/create_lib_dialog.gd" type="Script" id=1]
[ext_resource path="res://material_maker/widgets/file_picker_button/file_picker_button.tscn" type="PackedScene" id=2]
[ext_resource type="Script" path="res://material_maker/panels/library/create_lib_dialog.gd" id="1"]
[ext_resource type="PackedScene" uid="uid://cfyio0a1b27t0" path="res://material_maker/widgets/file_picker_button/file_picker_button.tscn" id="2"]

[node name="CreateLibDialog" type="Window"]
offset_right = 321.0
offset_bottom = 76.0
exclusive = true
window_title = "New library"
script = ExtResource( 1 )
script = ExtResource("1")
__meta__ = {
"_edit_use_anchors_": false
}
Expand Down Expand Up @@ -40,7 +40,7 @@ text = "Library name:"
offset_left = 91.0
offset_right = 317.0
offset_bottom = 24.0
custom_minimum_size = Vector2( 200, 0 )
custom_minimum_size = Vector2(200, 0)
size_flags_horizontal = 3
__meta__ = {
"_edit_use_anchors_": false
Expand All @@ -52,7 +52,7 @@ offset_right = 87.0
offset_bottom = 45.0
text = "Library file:"

[node name="FilePickerButton" parent="VBoxContainer/GridContainer" instance=ExtResource( 2 )]
[node name="FilePickerButton" parent="VBoxContainer/GridContainer" instance=ExtResource("2")]
anchor_right = 0.0
anchor_bottom = 0.0
offset_left = 91.0
Expand All @@ -72,15 +72,15 @@ size_flags_vertical = 0
[node name="OK" type="Button" parent="VBoxContainer/HBoxContainer"]
offset_right = 60.0
offset_bottom = 20.0
custom_minimum_size = Vector2( 60, 0 )
custom_minimum_size = Vector2(60, 0)
disabled = true
text = "OK"

[node name="Cancel" type="Button" parent="VBoxContainer/HBoxContainer"]
offset_left = 64.0
offset_right = 124.0
offset_bottom = 20.0
custom_minimum_size = Vector2( 60, 0 )
custom_minimum_size = Vector2(60, 0)
text = "Cancel"

[connection signal="popup_hide" from="." to="." method="_on_Cancel_pressed"]
Expand Down
8 changes: 4 additions & 4 deletions material_maker/panels/parameters/parameters.tscn
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
[gd_scene load_steps=2 format=2]
[gd_scene load_steps=2 format=3 uid="uid://vkh00fjvl0py"]

[ext_resource path="res://material_maker/panels/parameters/parameters.gd" type="Script" id=1]
[ext_resource type="Script" path="res://material_maker/panels/parameters/parameters.gd" id="1"]

[node name="BrushParams" type="ScrollContainer"]
anchor_right = 1.0
anchor_bottom = 1.0
custom_minimum_size = Vector2( 200, 250 )
custom_minimum_size = Vector2(200, 250)
size_flags_horizontal = 3
scroll_horizontal_enabled = false
script = ExtResource( 1 )
script = ExtResource("1")
__meta__ = {
"_edit_use_anchors_": false
}
Expand Down
Loading

0 comments on commit a6007d8

Please sign in to comment.