Merge branch 'main' of https://github.com/MarcEricMartel/MAD

player/player.cs

@@ -20,8 +20,14 @@ public partial class player : Camera3D
     [Export]
     private PackedScene _test_building;
 
-    public Node3D CurrentBuilding { get; set; }
+    [Export]
+    private TextureProgressBar _nuke, _pr, _kash;
 
+    private float Nuke { get => (float)_nuke.Value; set => _nuke.Value = value; }
+    private float PR { get => (float)_pr.Value; set => _pr.Value = value; }
+    private float Kash { get => (float)_kash.Value; set => _kash.Value = value; }
+
+    public Node3D CurrentBuilding { get; set; }
 
     public override void _Ready()
     {
@@ -53,7 +59,7 @@ public partial class player : Camera3D
         this.Rotation -= rot;
         if (this.Position.Y < 5)
             zin = false;
-        else if (this.Position.Y > 20)
+        else if (this.Position.Y > 45)
             zout = false;
         if (_mLeft && this.Position.X > -30)
             this.Translate(new Vector3((float)-delta * 10, 0, 0));

player/player.tscn

@@ -1,11 +1,71 @@
-[gd_scene load_steps=4 format=3 uid="uid://b5gb5paiupum"]
+[gd_scene load_steps=19 format=3 uid="uid://b5gb5paiupum"]
 
 [ext_resource type="Script" path="res://player/player.cs" id="1_of2l4"]
 [ext_resource type="PackedScene" uid="uid://2pw0p13lcklv" path="res://buildings/kash_buildings/factory.tscn" id="2_mspwe"]
 
-[sub_resource type="SphereMesh" id="SphereMesh_w0k5u"]
+[sub_resource type="CameraAttributesPhysical" id="CameraAttributesPhysical_1ejpb"]
+frustum_near = 0.032
 
-[node name="player" type="Camera3D" node_paths=PackedStringArray("_con", "_mousePosLabel", "_cursorPosLabel", "_cursor", "_cursorPoint")]
+[sub_resource type="Gradient" id="Gradient_hcpag"]
+interpolation_mode = 2
+colors = PackedColorArray(1, 0, 0, 1, 0.35782, 0, 0.0248139, 1)
+
+[sub_resource type="GradientTexture2D" id="GradientTexture2D_y5odr"]
+gradient = SubResource("Gradient_hcpag")
+fill_to = Vector2(0.858974, 0.615385)
+
+[sub_resource type="Gradient" id="Gradient_camjl"]
+colors = PackedColorArray(0.908061, 0.573562, 0.518565, 1, 1, 0.723217, 0.716857, 1)
+
+[sub_resource type="GradientTexture2D" id="GradientTexture2D_2xkee"]
+gradient = SubResource("Gradient_camjl")
+width = 24
+height = 255
+
+[sub_resource type="Gradient" id="Gradient_dxeak"]
+colors = PackedColorArray(0.533956, 4.45209e-07, 0.129296, 1, 0.902273, 0.0004242, 0.128051, 1)
+
+[sub_resource type="GradientTexture2D" id="GradientTexture2D_d5w6a"]
+gradient = SubResource("Gradient_dxeak")
+width = 24
+height = 255
+
+[sub_resource type="Gradient" id="Gradient_tpani"]
+colors = PackedColorArray(0.893472, 0.979245, 1, 1, 0.347927, 0.885716, 1, 1)
+
+[sub_resource type="GradientTexture2D" id="GradientTexture2D_7myfq"]
+gradient = SubResource("Gradient_tpani")
+width = 24
+height = 255
+
+[sub_resource type="Gradient" id="Gradient_127f1"]
+colors = PackedColorArray(0.00784314, 0.152941, 0.454902, 1, 0.349457, 0.500016, 1, 1)
+
+[sub_resource type="GradientTexture2D" id="GradientTexture2D_kdame"]
+gradient = SubResource("Gradient_127f1")
+width = 24
+height = 255
+
+[sub_resource type="Gradient" id="Gradient_psl0d"]
+colors = PackedColorArray(0, 0.933055, 0.58552, 1, 0.793971, 1, 0.891535, 1)
+
+[sub_resource type="GradientTexture2D" id="GradientTexture2D_18k81"]
+gradient = SubResource("Gradient_psl0d")
+width = 24
+height = 255
+
+[sub_resource type="Gradient" id="Gradient_od2su"]
+colors = PackedColorArray(1.44392e-06, 0.334951, 0.24823, 1, 1.8771e-06, 0.766586, 0.320037, 1)
+
+[sub_resource type="GradientTexture2D" id="GradientTexture2D_nfg3s"]
+gradient = SubResource("Gradient_od2su")
+width = 24
+height = 255
+
+[sub_resource type="SphereMesh" id="SphereMesh_mtv4x"]
+
+[node name="player" type="Camera3D" node_paths=PackedStringArray("_con", "_mousePosLabel", "_cursorPosLabel", "_cursor", "_cursorPoint", "_nuke", "_pr", "_kash")]
+attributes = SubResource("CameraAttributesPhysical_1ejpb")
 script = ExtResource("1_of2l4")
 _con = NodePath("Debug info/Label")
 _mousePosLabel = NodePath("Debug info/mousePos")
@@ -13,6 +73,9 @@ _cursorPosLabel = NodePath("Debug info/cursorPointPos")
 _cursor = NodePath("cursor")
 _cursorPoint = NodePath("cursorPoint")
 _test_building = ExtResource("2_mspwe")
+_nuke = NodePath("NukeBar")
+_pr = NodePath("PrBar")
+_kash = NodePath("KashBar")
 
 [node name="Debug info" type="Control" parent="."]
 layout_mode = 3
@@ -44,6 +107,76 @@ offset_right = 402.0
 offset_bottom = 182.0
 text = "Eat ze caca."
 
+[node name="Button" type="Button" parent="."]
+offset_left = 1772.0
+offset_top = 926.0
+offset_right = 1904.0
+offset_bottom = 1058.0
+text = "BOOM"
+icon = SubResource("GradientTexture2D_y5odr")
+flat = true
+icon_alignment = 1
+expand_icon = true
+
+[node name="NukeBar" type="TextureProgressBar" parent="."]
+offset_left = 1817.0
+offset_top = 664.0
+offset_right = 1841.0
+offset_bottom = 919.0
+value = 50.0
+rounded = true
+fill_mode = 3
+texture_under = SubResource("GradientTexture2D_2xkee")
+texture_progress = SubResource("GradientTexture2D_d5w6a")
+
+[node name="PrBar" type="TextureProgressBar" parent="."]
+offset_left = 1845.0
+offset_top = 664.0
+offset_right = 1869.0
+offset_bottom = 919.0
+value = 50.0
+rounded = true
+fill_mode = 3
+texture_under = SubResource("GradientTexture2D_7myfq")
+texture_progress = SubResource("GradientTexture2D_kdame")
+
+[node name="KashBar" type="TextureProgressBar" parent="."]
+offset_left = 1873.0
+offset_top = 664.0
+offset_right = 1897.0
+offset_bottom = 919.0
+value = 50.0
+rounded = true
+fill_mode = 3
+texture_under = SubResource("GradientTexture2D_18k81")
+texture_progress = SubResource("GradientTexture2D_nfg3s")
+
+[node name="lbl_Nukes" type="Label" parent="."]
+offset_left = 1842.0
+offset_top = 757.0
+offset_right = 2107.0
+offset_bottom = 783.0
+rotation = 1.5708
+text = "WMDs"
+horizontal_alignment = 1
+vertical_alignment = 1
+
+[node name="lbl_PR" type="Label" parent="."]
+offset_left = 1869.0
+offset_top = 894.0
+offset_right = 1909.0
+offset_bottom = 920.0
+rotation = 1.5708
+text = "PR"
+
+[node name="lbl_Kash" type="Label" parent="."]
+offset_left = 1897.0
+offset_top = 891.0
+offset_right = 1937.0
+offset_bottom = 917.0
+rotation = 1.5708
+text = "M$"
+
 [node name="cursor" type="RayCast3D" parent="."]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -1.17786)
 target_position = Vector3(0, 0, -999)
@@ -53,5 +186,5 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 2)
 
 [node name="cursorPointMesh" type="MeshInstance3D" parent="cursorPoint"]
 transform = Transform3D(0.5, 0, 0, 0, 0.5, 0, 0, 0, 0.5, 0, 0, 0)
-mesh = SubResource("SphereMesh_w0k5u")
+mesh = SubResource("SphereMesh_mtv4x")
 skeleton = NodePath("../..")

project.godot

@@ -57,3 +57,9 @@ build={
 , Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":66,"key_label":0,"unicode":98,"echo":false,"script":null)
 ]
 }
+
+[rendering]
+
+anti_aliasing/quality/msaa_2d=1
+anti_aliasing/quality/msaa_3d=1
+anti_aliasing/quality/screen_space_aa=1