Merge pull request #10 from WildRP/version/0.9.1-beta

Version/0.9.1 beta

amv_tool_theme.tres

@@ -1,4 +1,4 @@
-[gd_resource type="Theme" load_steps=54 format=3 uid="uid://b0c4jwsh62jan"]
+[gd_resource type="Theme" load_steps=53 format=3 uid="uid://b0c4jwsh62jan"]
 
 [ext_resource type="FontFile" uid="uid://ce0k46ki1ggwb" path="res://font/inter/Inter-Regular.ttf" id="1_glfyd"]
 [ext_resource type="FontFile" uid="uid://c1c81jmmwt6yu" path="res://font/inter/Inter-Bold.ttf" id="1_gnfhx"]
@@ -83,12 +83,6 @@ corner_radius_top_right = 8
 corner_radius_bottom_right = 8
 corner_radius_bottom_left = 8
 
-[sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_u0svq"]
-content_margin_left = 3.0
-content_margin_top = 3.0
-content_margin_right = 3.0
-content_margin_bottom = 3.0
-
 [sub_resource type="StyleBoxFlat" id="StyleBoxFlat_cm6fs"]
 bg_color = Color(1, 1, 1, 0.117647)
 border_color = Color(1, 1, 1, 0.709804)
@@ -508,7 +502,6 @@ Button/styles/focus = SubResource("StyleBoxFlat_wapt7")
 Button/styles/hover = SubResource("StyleBoxFlat_cupx2")
 Button/styles/normal = SubResource("StyleBoxFlat_ubyga")
 Button/styles/pressed = SubResource("StyleBoxFlat_dpijl")
-CheckBox/styles/normal = SubResource("StyleBoxEmpty_u0svq")
 Editor/colors/box_selection_fill_color = Color(1, 1, 1, 0.301961)
 Editor/colors/box_selection_stroke_color = Color(1, 1, 1, 0.8)
 Editor/colors/warning_color = Color(1, 0.854902, 0.458824, 1)

main.tscn

@@ -43,9 +43,12 @@ sky_material = SubResource("ProceduralSkyMaterial_hhw8l")
 [sub_resource type="Environment" id="Environment_8ejdi"]
 background_mode = 2
 sky = SubResource("Sky_tpun5")
+tonemap_mode = 3
 ssao_enabled = true
 ssao_light_affect = 1.0
 
+[sub_resource type="World3D" id="World3D_mjs27"]
+
 [sub_resource type="ShaderMaterial" id="ShaderMaterial_d1crs"]
 shader = ExtResource("5_2qwli")
 
@@ -74,9 +77,6 @@ sdfgi_max_distance = 51.2
 sdfgi_y_scale = 0
 sdfgi_energy = 2.0
 
-[sub_resource type="World3D" id="World3D_mjs27"]
-environment = SubResource("Environment_cajuw")
-
 [sub_resource type="ShaderMaterial" id="ShaderMaterial_f2aa8"]
 render_priority = 0
 shader = ExtResource("5_axexi")
@@ -227,7 +227,7 @@ tab_focus_mode = 1
 visible = false
 layout_mode = 2
 
-[node name="AMVs" type="Control" parent="CanvasLayer/GUI/TabContainer" node_paths=PackedStringArray("_volumeModelContainer", "_saveProjectBtn", "_loadProjectBtn", "_projectPanel", "_loadModelButton", "_modelNameLabel", "_fileDialog", "_modelListContainer", "_amvContainerNode", "_blurSizeDropdown", "_blurStrengthSlider", "_controlToHide", "_volumeList", "_amvListContextMenu", "_newAmvButton", "_bakeAllButton", "_exportTexturesBtn", "_bakeProgressBar", "_cancelBakeBtn", "_amvInfoPanel", "_textureName", "_rotation", "_randomizeTextureNameButton", "_positionX", "_positionY", "_positionZ", "_sizeX", "_sizeY", "_sizeZ", "_probesX", "_probesY", "_probesZ")]
+[node name="AMVs" type="Control" parent="CanvasLayer/GUI/TabContainer" node_paths=PackedStringArray("_volumeModelContainer", "_saveProjectBtn", "_loadProjectBtn", "_projectPanel", "_loadModelButton", "_modelNameLabel", "_fileDialog", "_modelListContainer", "_amvContainerNode", "_blurSizeDropdown", "_blurStrengthSlider", "_controlToHide", "_volumeList", "_amvListContextMenu", "_newAmvButton", "_bakeAllButton", "_exportTexturesBtn", "_bakeProgressBar", "_cancelBakeBtn", "_amvInfoPanel", "_textureName", "_rotation", "_randomizeTextureNameButton", "_positionX", "_positionY", "_positionZ", "_sizeX", "_sizeY", "_sizeZ", "_probesX", "_probesY", "_probesZ", "_topLayerButton", "_order", "_falloffPower", "_falloffScaleMinX", "_falloffScaleMinY", "_falloffScaleMinZ", "_falloffScaleMaxX", "_falloffScaleMaxY", "_falloffScaleMaxZ", "_interiorCheck", "_exteriorCheck", "_doorCheck")]
 layout_mode = 2
 mouse_filter = 1
 script = ExtResource("4_qsblh")
@@ -265,6 +265,18 @@ _sizeZ = NodePath("HSplitContainer/Left Panel/Margin/Left Panel Organizer/AMV In
 _probesX = NodePath("HSplitContainer/Left Panel/Margin/Left Panel Organizer/AMV Info Panel/Count Container/X")
 _probesY = NodePath("HSplitContainer/Left Panel/Margin/Left Panel Organizer/AMV Info Panel/Count Container/Y")
 _probesZ = NodePath("HSplitContainer/Left Panel/Margin/Left Panel Organizer/AMV Info Panel/Count Container/Z")
+_topLayerButton = NodePath("HSplitContainer/Left Panel/Margin/Left Panel Organizer/AMV Info Panel/CheckButton")
+_order = NodePath("HSplitContainer/Left Panel/Margin/Left Panel Organizer/AMV Info Panel/HBoxContainer2/SpinBox")
+_falloffPower = NodePath("HSplitContainer/Left Panel/Margin/Left Panel Organizer/AMV Info Panel/HBoxContainer3/SpinBox")
+_falloffScaleMinX = NodePath("HSplitContainer/Left Panel/Margin/Left Panel Organizer/AMV Info Panel/FalloffSizeMinContainer/X")
+_falloffScaleMinY = NodePath("HSplitContainer/Left Panel/Margin/Left Panel Organizer/AMV Info Panel/FalloffSizeMinContainer/Y")
+_falloffScaleMinZ = NodePath("HSplitContainer/Left Panel/Margin/Left Panel Organizer/AMV Info Panel/FalloffSizeMinContainer/Z")
+_falloffScaleMaxX = NodePath("HSplitContainer/Left Panel/Margin/Left Panel Organizer/AMV Info Panel/FalloffSizeMaxContainer/X")
+_falloffScaleMaxY = NodePath("HSplitContainer/Left Panel/Margin/Left Panel Organizer/AMV Info Panel/FalloffSizeMaxContainer/Y")
+_falloffScaleMaxZ = NodePath("HSplitContainer/Left Panel/Margin/Left Panel Organizer/AMV Info Panel/FalloffSizeMaxContainer/Z")
+_interiorCheck = NodePath("HSplitContainer/Left Panel/Margin/Left Panel Organizer/AMV Info Panel/GridContainer/InteriorCheck")
+_exteriorCheck = NodePath("HSplitContainer/Left Panel/Margin/Left Panel Organizer/AMV Info Panel/GridContainer/ExteriorCheck")
+_doorCheck = NodePath("HSplitContainer/Left Panel/Margin/Left Panel Organizer/AMV Info Panel/GridContainer/ExteriorCheck2")
 
 [node name="HSplitContainer" type="HSplitContainer" parent="CanvasLayer/GUI/TabContainer/AMVs"]
 layout_mode = 1
@@ -354,7 +366,7 @@ text = "AMVs
 "
 
 [node name="AMV List" type="ScrollContainer" parent="CanvasLayer/GUI/TabContainer/AMVs/HSplitContainer/Left Panel/Margin/Left Panel Organizer"]
-custom_minimum_size = Vector2(0, 75)
+custom_minimum_size = Vector2(0, 200)
 layout_mode = 2
 size_flags_vertical = 3
 theme_override_styles/panel = SubResource("StyleBoxFlat_iwv2c")
@@ -447,6 +459,7 @@ min_value = 1e+18
 max_value = 9.22337e+18
 value = 1e+18
 rounded = true
+editable = false
 script = ExtResource("10_ir2tt")
 
 [node name="VBoxContainer2" type="VBoxContainer" parent="CanvasLayer/GUI/TabContainer/AMVs/HSplitContainer/Left Panel/Margin/Left Panel Organizer/AMV Info Panel/HBoxContainer"]
@@ -566,7 +579,7 @@ size_flags_horizontal = 0
 [node name="X" type="SpinBox" parent="CanvasLayer/GUI/TabContainer/AMVs/HSplitContainer/Left Panel/Margin/Left Panel Organizer/AMV Info Panel/Count Container"]
 custom_minimum_size = Vector2(69.655, 0)
 layout_mode = 2
-min_value = 2.0
+min_value = 1.0
 value = 4.0
 allow_greater = true
 update_on_text_changed = true
@@ -577,7 +590,7 @@ script = ExtResource("10_ir2tt")
 [node name="Y" type="SpinBox" parent="CanvasLayer/GUI/TabContainer/AMVs/HSplitContainer/Left Panel/Margin/Left Panel Organizer/AMV Info Panel/Count Container"]
 custom_minimum_size = Vector2(69.655, 0)
 layout_mode = 2
-min_value = 2.0
+min_value = 1.0
 max_value = 10.0
 value = 4.0
 allow_greater = true
@@ -589,7 +602,7 @@ script = ExtResource("10_ir2tt")
 [node name="Z" type="SpinBox" parent="CanvasLayer/GUI/TabContainer/AMVs/HSplitContainer/Left Panel/Margin/Left Panel Organizer/AMV Info Panel/Count Container"]
 custom_minimum_size = Vector2(69.655, 0)
 layout_mode = 2
-min_value = 2.0
+min_value = 1.0
 max_value = 10.0
 value = 4.0
 allow_greater = true
@@ -603,8 +616,135 @@ layout_mode = 2
 tooltip_text = "Randomize texture name"
 text = "Randomize Texture Name"
 
+[node name="HSeparator4" type="HSeparator" parent="CanvasLayer/GUI/TabContainer/AMVs/HSplitContainer/Left Panel/Margin/Left Panel Organizer/AMV Info Panel"]
+layout_mode = 2
+
+[node name="CheckButton" type="CheckButton" parent="CanvasLayer/GUI/TabContainer/AMVs/HSplitContainer/Left Panel/Margin/Left Panel Organizer/AMV Info Panel"]
+layout_mode = 2
+text = "Top Layer"
+
+[node name="HBoxContainer2" type="HBoxContainer" parent="CanvasLayer/GUI/TabContainer/AMVs/HSplitContainer/Left Panel/Margin/Left Panel Organizer/AMV Info Panel"]
+layout_mode = 2
+theme_override_constants/separation = 80
+
+[node name="Label" type="Label" parent="CanvasLayer/GUI/TabContainer/AMVs/HSplitContainer/Left Panel/Margin/Left Panel Organizer/AMV Info Panel/HBoxContainer2"]
+layout_mode = 2
+text = "Order:"
+
+[node name="SpinBox" type="SpinBox" parent="CanvasLayer/GUI/TabContainer/AMVs/HSplitContainer/Left Panel/Margin/Left Panel Organizer/AMV Info Panel/HBoxContainer2"]
+layout_mode = 2
+size_flags_horizontal = 4
+value = 1.0
+script = ExtResource("10_ir2tt")
+
+[node name="HBoxContainer3" type="HBoxContainer" parent="CanvasLayer/GUI/TabContainer/AMVs/HSplitContainer/Left Panel/Margin/Left Panel Organizer/AMV Info Panel"]
+layout_mode = 2
+theme_override_constants/separation = 30
+
+[node name="Label" type="Label" parent="CanvasLayer/GUI/TabContainer/AMVs/HSplitContainer/Left Panel/Margin/Left Panel Organizer/AMV Info Panel/HBoxContainer3"]
+layout_mode = 2
+text = "Falloff Power:"
+
+[node name="SpinBox" type="SpinBox" parent="CanvasLayer/GUI/TabContainer/AMVs/HSplitContainer/Left Panel/Margin/Left Panel Organizer/AMV Info Panel/HBoxContainer3"]
+layout_mode = 2
+size_flags_horizontal = 4
+min_value = 1.0
+value = 4.0
+script = ExtResource("10_ir2tt")
+
+[node name="FalloffSizeMin" type="Label" parent="CanvasLayer/GUI/TabContainer/AMVs/HSplitContainer/Left Panel/Margin/Left Panel Organizer/AMV Info Panel"]
+layout_mode = 2
+text = "Falloff Size Min-Max
+"
+
+[node name="FalloffSizeMinContainer" type="HBoxContainer" parent="CanvasLayer/GUI/TabContainer/AMVs/HSplitContainer/Left Panel/Margin/Left Panel Organizer/AMV Info Panel"]
+layout_mode = 2
+size_flags_horizontal = 0
+
+[node name="X" type="SpinBox" parent="CanvasLayer/GUI/TabContainer/AMVs/HSplitContainer/Left Panel/Margin/Left Panel Organizer/AMV Info Panel/FalloffSizeMinContainer"]
+custom_minimum_size = Vector2(69.655, 0)
+layout_mode = 2
+min_value = 0.1
+max_value = 2.0
+step = 0.001
+value = 1.0
+prefix = "X:"
+script = ExtResource("10_ir2tt")
+
+[node name="Y" type="SpinBox" parent="CanvasLayer/GUI/TabContainer/AMVs/HSplitContainer/Left Panel/Margin/Left Panel Organizer/AMV Info Panel/FalloffSizeMinContainer"]
+custom_minimum_size = Vector2(69.655, 0)
+layout_mode = 2
+min_value = 0.1
+max_value = 2.0
+step = 0.001
+value = 1.0
+prefix = "Y:"
+script = ExtResource("10_ir2tt")
+
+[node name="Z" type="SpinBox" parent="CanvasLayer/GUI/TabContainer/AMVs/HSplitContainer/Left Panel/Margin/Left Panel Organizer/AMV Info Panel/FalloffSizeMinContainer"]
+custom_minimum_size = Vector2(69.655, 0)
+layout_mode = 2
+min_value = 0.1
+max_value = 2.0
+step = 0.001
+value = 1.0
+prefix = "Z:"
+script = ExtResource("10_ir2tt")
+
+[node name="FalloffSizeMaxContainer" type="HBoxContainer" parent="CanvasLayer/GUI/TabContainer/AMVs/HSplitContainer/Left Panel/Margin/Left Panel Organizer/AMV Info Panel"]
+layout_mode = 2
+size_flags_horizontal = 0
+
+[node name="X" type="SpinBox" parent="CanvasLayer/GUI/TabContainer/AMVs/HSplitContainer/Left Panel/Margin/Left Panel Organizer/AMV Info Panel/FalloffSizeMaxContainer"]
+custom_minimum_size = Vector2(69.655, 0)
+layout_mode = 2
+min_value = 0.1
+max_value = 2.0
+step = 0.001
+value = 1.25
+prefix = "X:"
+script = ExtResource("10_ir2tt")
+
+[node name="Y" type="SpinBox" parent="CanvasLayer/GUI/TabContainer/AMVs/HSplitContainer/Left Panel/Margin/Left Panel Organizer/AMV Info Panel/FalloffSizeMaxContainer"]
+custom_minimum_size = Vector2(69.655, 0)
+layout_mode = 2
+min_value = 0.1
+max_value = 2.0
+step = 0.001
+value = 1.25
+prefix = "Y:"
+script = ExtResource("10_ir2tt")
+
+[node name="Z" type="SpinBox" parent="CanvasLayer/GUI/TabContainer/AMVs/HSplitContainer/Left Panel/Margin/Left Panel Organizer/AMV Info Panel/FalloffSizeMaxContainer"]
+custom_minimum_size = Vector2(69.655, 0)
+layout_mode = 2
+min_value = 0.1
+max_value = 2.0
+step = 0.001
+value = 1.25
+prefix = "Z:"
+script = ExtResource("10_ir2tt")
+
+[node name="GridContainer" type="GridContainer" parent="CanvasLayer/GUI/TabContainer/AMVs/HSplitContainer/Left Panel/Margin/Left Panel Organizer/AMV Info Panel"]
+layout_mode = 2
+size_flags_horizontal = 4
+columns = 2
+
+[node name="InteriorCheck" type="CheckBox" parent="CanvasLayer/GUI/TabContainer/AMVs/HSplitContainer/Left Panel/Margin/Left Panel Organizer/AMV Info Panel/GridContainer"]
+layout_mode = 2
+button_pressed = true
+text = "Interior"
+
+[node name="ExteriorCheck" type="CheckBox" parent="CanvasLayer/GUI/TabContainer/AMVs/HSplitContainer/Left Panel/Margin/Left Panel Organizer/AMV Info Panel/GridContainer"]
+layout_mode = 2
+text = "Exterior"
+
+[node name="ExteriorCheck2" type="CheckBox" parent="CanvasLayer/GUI/TabContainer/AMVs/HSplitContainer/Left Panel/Margin/Left Panel Organizer/AMV Info Panel/GridContainer"]
+layout_mode = 2
+text = "Door"
+
 [node name="Bottom Filler" type="PanelContainer" parent="CanvasLayer/GUI/TabContainer/AMVs/HSplitContainer/Left Panel/Margin/Left Panel Organizer"]
-custom_minimum_size = Vector2(0, 50)
+custom_minimum_size = Vector2(0, 100)
 layout_mode = 2
 size_flags_horizontal = 3
 mouse_filter = 1

objects/deferred_probe.tscn

@@ -15,7 +15,7 @@ height = 0.2
 [node name="AmbientMaskVolume" type="Node3D" node_paths=PackedStringArray("_centerNode", "_renderCameras")]
 script = ExtResource("1_dwt6b")
 _centerNode = NodePath("CenterPoint")
-_renderCameras = [NodePath("CenterPoint/Node3D/0 X- Cam"), NodePath("CenterPoint/Node3D/1 X+ Cam"), NodePath("CenterPoint/Node3D/2 Z- Cam"), NodePath("CenterPoint/Node3D/3 Z+ Cam"), NodePath("CenterPoint/Node3D/4 Y+ Cam"), NodePath("CenterPoint/Node3D/5 Y- Cam")]
+_renderCameras = [NodePath("CenterPoint/Node3D/0 X- Cam"), NodePath("CenterPoint/Node3D/1 X+ Cam"), NodePath("CenterPoint/Node3D/2 Z+ Cam"), NodePath("CenterPoint/Node3D/3 Z- Cam"), NodePath("CenterPoint/Node3D/4 Y+ Cam"), NodePath("CenterPoint/Node3D/5 Y- Cam")]
 
 [node name="Bounds" type="MeshInstance3D" parent="." node_paths=PackedStringArray("_planesNode")]
 gi_mode = 0
@@ -32,28 +32,33 @@ gi_mode = 0
 mesh = SubResource("SphereMesh_b17rb")
 
 [node name="Node3D" type="Node3D" parent="CenterPoint"]
-transform = Transform3D(-4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, 0, 0, 0)
 
 [node name="0 X- Cam" parent="CenterPoint/Node3D" instance=ExtResource("4_5whmx")]
-transform = Transform3D(3.82138e-15, -1.31134e-07, -1, -1, -4.37114e-08, 1.91067e-15, -4.37114e-08, 1, -1.31134e-07, 0, 0, 0)
+transform = Transform3D(8.74228e-08, -4.37112e-08, -1, -1.74846e-07, 1, -4.37112e-08, 1, 1.74846e-07, 8.74228e-08, 0, 0, 0)
 cull_mask = 1048574
+far = 2500.0
 
 [node name="1 X+ Cam" parent="CenterPoint/Node3D" instance=ExtResource("4_5whmx")]
-transform = Transform3D(-8.74228e-08, -4.37114e-08, 1, 1, 4.37114e-08, 8.74228e-08, -4.37114e-08, 1, 4.37114e-08, 0, 0, 0)
+transform = Transform3D(-1.74846e-07, 4.37112e-08, 1, -1.74846e-07, 1, -4.37112e-08, -1, -1.74846e-07, -1.74846e-07, 0, 0, 0)
 cull_mask = 1048574
+far = 2500.0
 
-[node name="2 Z- Cam" parent="CenterPoint/Node3D" instance=ExtResource("4_5whmx")]
-transform = Transform3D(1, 3.82138e-15, 8.74228e-08, -3.82137e-15, -1, 8.74228e-08, 8.74228e-08, -8.74228e-08, -1, 0, 0, 0)
+[node name="2 Z+ Cam" parent="CenterPoint/Node3D" instance=ExtResource("4_5whmx")]
+transform = Transform3D(1, 1.74846e-07, 1.31134e-07, -1.74846e-07, 1, -4.37112e-08, -1.31134e-07, 4.37112e-08, 1, 0, 0, 0)
 cull_mask = 1048574
+far = 2500.0
 
-[node name="3 Z+ Cam" parent="CenterPoint/Node3D" instance=ExtResource("4_5whmx")]
-transform = Transform3D(1, 0, 2.13163e-14, 0, 1, 0, -2.13163e-14, 0, 1, 0, 0, 0)
+[node name="3 Z- Cam" parent="CenterPoint/Node3D" instance=ExtResource("4_5whmx")]
+transform = Transform3D(-1, -1.74846e-07, -2.18557e-07, -1.74846e-07, 1, -4.37112e-08, 2.18557e-07, -4.37112e-08, -1, 0, 0, 0)
 cull_mask = 1048574
+far = 2500.0
 
 [node name="4 Y+ Cam" parent="CenterPoint/Node3D" instance=ExtResource("4_5whmx")]
-transform = Transform3D(1, -4.37114e-08, 4.37114e-08, 4.37114e-08, -4.37114e-08, -1, 4.37114e-08, 1, -4.37114e-08, 0, 0, 0)
+transform = Transform3D(1, 1.74846e-07, 1.31134e-07, 1.31134e-07, -8.74226e-08, -1, -1.74846e-07, 1, -8.74226e-08, 0, 0, 0)
 cull_mask = 1048574
+far = 2500.0
 
 [node name="5 Y- Cam" parent="CenterPoint/Node3D" instance=ExtResource("4_5whmx")]
-transform = Transform3D(-1, -1.31134e-07, 4.37114e-08, 4.37114e-08, 4.37114e-08, 1, -1.31134e-07, 1, -4.37114e-08, 0, 0, 0)
+transform = Transform3D(1, 1.74846e-07, 1.31134e-07, -1.31134e-07, 1.74845e-07, 1, 1.74846e-07, -1, 1.74845e-07, 0, 0, 0)
 cull_mask = 1048574
+far = 2500.0

project.godot

@@ -11,7 +11,7 @@ config_version=5
 [application]
 
 config/name="WildRP AMV Tool"
-config/version="0.9.0"
+config/version="0.9.1"
 run/main_scene="res://main.tscn"
 config/use_custom_user_dir=true
 config/features=PackedStringArray("4.2", "C#", "Forward Plus")