Implement review collider to fix overlapping buildings. Temporary removal of explosion wand and nut. Bulb is smaller.

TheGBO · TheGBO · commit ae21a28945f0 · 2025-09-01T15:04:35.000-03:00
diff --git a/Assets/Shaders/PreviewShader.gdshader b/Assets/Shaders/PreviewShader.gdshader
@@ -1,6 +1,8 @@
 shader_type spatial;
 
-uniform vec3 renderColor = vec3(0.0, 1.0, 1.0);
+uniform vec3 validRenderColor = vec3(0.0, 1.0, 0.0);
+uniform vec3 invalidRenderColor = vec3(1.0, 0.0, 0.0);
+uniform bool isValid = true;
 uniform float transparencyAmplitude = 0.25;
 uniform float transparencyOffset = 0.125;
 render_mode unshaded;
@@ -21,7 +23,14 @@ void fragment() {
 	
 	ROUGHNESS = 1.0;
 	ALPHA = (abs(sin(TIME)) + transparencyOffset) * transparencyAmplitude;
-	ALBEDO = renderColor - bgColor;
+	vec3 currentColor;
+	if(isValid){
+		currentColor = validRenderColor;
+	}
+	else{
+		currentColor = invalidRenderColor;
+	}
+	ALBEDO = currentColor - bgColor;
 }
 
 //void light() {
diff --git a/Entities/Player/Player.tscn b/Entities/Player/Player.tscn
@@ -153,6 +153,9 @@ properties/6/replication_mode = 1
 properties/7/path = NodePath("Components/PlayerItemUse:desiredRotationY")
 properties/7/spawn = true
 properties/7/replication_mode = 1
+properties/8/path = NodePath("Components/PlayerItemUse:isUseValid")
+properties/8/spawn = true
+properties/8/replication_mode = 1
 
 [node name="Player" type="CharacterBody3D" node_paths=PackedStringArray("playerMovement", "cameraMovement", "playerInput", "chatHud", "camera", "model", "hud", "componentList", "nameTag")]
 floor_stop_on_slope = false
@@ -354,7 +357,7 @@ script = ExtResource("9_rtpsh")
 rayCast = NodePath("../../Neck/RayCast3D")
 hand = NodePath("../../Neck/Hand")
 handAnimator = NodePath("HandAnimator")
-inventory = Array[String](["hammer", "cube", "nut", "bulb"])
+inventory = Array[String](["hammer", "cube", "bulb"])
 parent = NodePath("../..")
 
 [node name="HandAnimator" type="AnimationPlayer" parent="Components/PlayerItemUse"]
diff --git a/Entities/Player/PlayerItemUse.cs b/Entities/Player/PlayerItemUse.cs
@@ -23,6 +23,7 @@ public partial class PlayerItemUse : AbstractPlayerComponent
 	private BaseItem item;
 	//desired rotation
 	[Export] public float desiredRotationY = 0f;
+	[Export] public bool isUseValid = false;
 	private float rotationIncrement = 45f;
 
 	public override void _Ready()
@@ -87,7 +88,6 @@ public void ClientUse()
 	[Rpc(MultiplayerApi.RpcMode.AnyPeer, CallLocal = true)]
 	private void C2S_Use(Dictionary args)
 	{
-		GD.Print(item);
 		item.UseItem(ItemUsageArgs.FromDictionary(args));
 	}
 
diff --git a/GameContent/Buildings/Bulb/PlacedBulb.tscn b/GameContent/Buildings/Bulb/PlacedBulb.tscn
@@ -85,7 +85,7 @@ blend_shape_mode = 0
 shadow_mesh = SubResource("ArrayMesh_x14qh")
 
 [sub_resource type="BoxShape3D" id="BoxShape3D_col7d"]
-size = Vector3(0.728088, 1.16309, 0.728516)
+size = Vector3(0.5, 0.9, 0.5)
 
 [sub_resource type="SceneReplicationConfig" id="SceneReplicationConfig_0g4ia"]
 properties/0/path = NodePath(".:position")
@@ -100,7 +100,7 @@ freeze = true
 script = ExtResource("1_mqh4i")
 
 [node name="model" type="Node3D" parent="."]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.5, 0)
+transform = Transform3D(0.7, 0, 0, 0, 0.7, 0, 0, 0, 0.7, 0, -0.5, 0)
 
 [node name="Base" type="MeshInstance3D" parent="model"]
 mesh = SubResource("ArrayMesh_fu5l0")
@@ -111,16 +111,16 @@ mesh = SubResource("ArrayMesh_4krtv")
 skeleton = NodePath("")
 
 [node name="CollisionShape3D" type="CollisionShape3D" parent="."]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.0693365, 0)
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.014044, -0.0622085, -0.014258)
 shape = SubResource("BoxShape3D_col7d")
 
 [node name="MultiplayerSynchronizer" type="MultiplayerSynchronizer" parent="."]
 replication_config = SubResource("SceneReplicationConfig_0g4ia")
 
 [node name="OmniLight3D" type="OmniLight3D" parent="."]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.07579, 0)
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.57579, 0)
 light_color = Color(1, 0.694118, 0, 1)
-light_energy = 5.0
+light_energy = 4.0
 light_size = 16.0
 light_specular = 0.0
 omni_range = 16.3436
diff --git a/GameContent/Items/Bulb/ItemBulb.tscn b/GameContent/Items/Bulb/ItemBulb.tscn
diff --git a/GameContent/Items/Cube/Cube.tres b/GameContent/Items/Cube/Cube.tres
@@ -10,5 +10,4 @@ itemScene = ExtResource("1_q23lb")
 itemID = "cube"
 itemIcon = ExtResource("1_7un7m")
 itemName = "Cube"
-usageCooldown = 0.013
-raycastRange = 15.0
+usageCooldown = 0.1
diff --git a/GameContent/Items/Cube/ItemCube.tscn b/GameContent/Items/Cube/ItemCube.tscn
@@ -6,6 +6,10 @@
 
 [node name="ItemCube" instance=ExtResource("1_jtm4k")]
 buildingScene = ExtResource("2_nxowp")
+snapRange = 0.5
 
 [node name="HandItem" parent="." index="0"]
 mesh = ExtResource("3_ghdtp")
+
+[connection signal="body_entered" from="PreviewCollider" to="PreviewCollider" method="_on_body_entered"]
+[connection signal="body_exited" from="PreviewCollider" to="PreviewCollider" method="_on_body_exited"]
diff --git a/GameContent/Items/ExplosionStaff/ExplosionStaff.tres b/GameContent/Items/ExplosionStaff/ExplosionStaff.tres
diff --git a/GameContent/Items/ExplosionStaff/ItemExplosionStaff.tscn b/GameContent/Items/ExplosionStaff/ItemExplosionStaff.tscn
diff --git a/GameContent/Items/Nut/ItemNut.tscn b/GameContent/Items/Nut/ItemNut.tscn
diff --git a/GameContent/Items/Nut/Nut.tres b/GameContent/Items/Nut/Nut.tres
diff --git a/GameContent/Items/RGBall/RGBall.png.import b/GameContent/Items/RGBall/RGBall.png.import
@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://bhncfyiqm2nju"
+path="res://.godot/imported/RGBall.png-91a74bd919507779c463ab6f564edbd4.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://GameContent/Items/RGBall/RGBall.png"
+dest_files=["res://.godot/imported/RGBall.png-91a74bd919507779c463ab6f564edbd4.ctex"]
+
+[params]
+
+compress/mode=0
+compress/high_quality=false
+compress/lossy_quality=0.7
+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/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/GameContent/Items/_Abstract/BasePlacingItem.tscn b/GameContent/Items/_Abstract/BasePlacingItem.tscn
@@ -1,12 +1,14 @@
-[gd_scene load_steps=5 format=3 uid="uid://brra32kqxyt3m"]
+[gd_scene load_steps=6 format=3 uid="uid://brra32kqxyt3m"]
 
 [ext_resource type="Script" uid="uid://dlgpemynsx233" path="res://GameContent/Items/_Abstract/PlacingItem.cs" id="1_wv8dl"]
 [ext_resource type="Material" uid="uid://b8qe5ox5smlkp" path="res://Assets/Materials/Preview.tres" id="2_a2mfg"]
+[ext_resource type="Script" uid="uid://rr01jacsxsuk" path="res://GameContent/Items/_Abstract/PreviewCollider.cs" id="3_a2mfg"]
 
 [sub_resource type="BoxMesh" id="BoxMesh_caru3"]
 material = ExtResource("2_a2mfg")
 
 [sub_resource type="BoxShape3D" id="BoxShape3D_pcbtr"]
+size = Vector3(0.9, 0.9, 0.9)
 
 [node name="BasePlacingItem" type="Node3D" node_paths=PackedStringArray("previewMesh", "previewCollider")]
 script = ExtResource("1_wv8dl")
@@ -23,6 +25,7 @@ visible = false
 mesh = SubResource("BoxMesh_caru3")
 
 [node name="PreviewCollider" type="Area3D" parent="."]
+script = ExtResource("3_a2mfg")
 
 [node name="CollisionShape3D" type="CollisionShape3D" parent="PreviewCollider"]
 shape = SubResource("BoxShape3D_pcbtr")
diff --git a/GameContent/Items/_Abstract/PlacingItem.cs b/GameContent/Items/_Abstract/PlacingItem.cs
@@ -6,30 +6,42 @@
 public partial class PlacingItem : BaseItem
 {
 	[Export] private PackedScene buildingScene;
-	[Export] private Node3D previewMesh;
-	[Export] private Area3D previewCollider;
+	[Export] private MeshInstance3D previewMesh;
+	[Export] private PreviewCollider previewCollider;
 	[Export] private float snapRange;
 	[Export] private float normalOffset = 1;
+	//Sync C2S
+	
 
 	public override void _PhysicsProcess(double delta)
 	{
 		if (!Ptu.parent.IsMultiplayerAuthority()) return;
 		GeneratePreviewMesh();
 	}
 
+	//Client Side
 	private void GeneratePreviewMesh()
 	{
+
 		previewMesh.Visible = Ptu.rayCast.IsColliding();
 		previewMesh.GlobalPosition = GetSnappedPosition(Ptu.rayCast.GetCollisionPoint(), Ptu.rayCast.GetCollisionNormal());
 		previewMesh.GlobalRotation = new Vector3(0, Ptu.desiredRotationY, 0);
-		previewCollider.Position = previewMesh.Position;
-		previewCollider.Rotation = previewMesh.Rotation;
+		previewCollider.GlobalPosition = previewMesh.GlobalPosition;
+		previewCollider.GlobalRotation = previewMesh.GlobalRotation;
+
+		Ptu.isUseValid = !previewCollider.IsColliding;
+		ShaderMaterial shaderMat = (ShaderMaterial)previewMesh.GetActiveMaterial(0);
+		if (shaderMat != null)
+		{
+			shaderMat.SetShaderParameter("isValid", Ptu.isUseValid);
+		}
 	}
 
 	//run on server
 	//TODO: Reformulate method of passing tool usage data to P.T.U, probably just by getting them directly from the player
 	public override void UseItem(ItemUsageArgs args)
 	{
+		if (!Ptu.isUseValid) return;
 		GD.Print($"block placed by {args.PlayerId}");
 		Node3D building = (Node3D)buildingScene.Instantiate();
 		building.Name = Guid.NewGuid().GetHashCode().ToString();
diff --git a/GameContent/Items/_Abstract/PreviewCollider.cs b/GameContent/Items/_Abstract/PreviewCollider.cs
@@ -0,0 +1,23 @@
+using Godot;
+using System;
+
+public partial class PreviewCollider : Area3D
+{
+    public bool IsColliding { get; private set; }
+
+    public override void _Ready()
+    {
+        BodyEntered += _on_body_entered;
+        BodyExited += _on_body_exited;
+    }
+
+    public void _on_body_entered(Node3D body)
+    {
+        IsColliding = true;
+    }
+    
+    public void _on_body_exited(Node3D body)
+    {
+        IsColliding = false;
+    }
+}
diff --git a/GameContent/Items/_Abstract/PreviewCollider.cs.uid b/GameContent/Items/_Abstract/PreviewCollider.cs.uid
@@ -0,0 +1 @@
+uid://rr01jacsxsuk
diff --git a/project.godot b/project.godot
@@ -12,7 +12,7 @@ config_version=5
 
 config/name="Sandboxnator"
 config/description="A LAN multiplayer sandbox game, have fun with your friends, hang out, build and destroy :3"
-config/version="0.3.0"
+config/version="0.3.1"
 run/main_scene="res://UI/MainMenu/MainMenu.tscn"
 config/features=PackedStringArray("4.4", "C#", "Forward Plus")
 boot_splash/use_filter=false
@@ -48,6 +48,9 @@ folder_colors={
 "res://GameContent/": "blue",
 "res://GameContent/Buildings/": "yellow",
 "res://GameContent/Items/": "blue",
+"res://GameContent/Items/ExplosionStaff/": "red",
+"res://GameContent/Items/Nut/": "red",
+"res://GameContent/Items/RGBall/": "red",
 "res://GameContent/Items/_Abstract/": "red",
 "res://Globals/": "purple",
 "res://Network/": "pink",

Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,7 @@ public partial class PlayerItemUse : AbstractPlayerComponent`
`23`	`23`	`private BaseItem item;`
`24`	`24`	`//desired rotation`
`25`	`25`	`[Export] public float desiredRotationY = 0f;`
	`26`	`+ [Export] public bool isUseValid = false;`
`26`	`27`	`private float rotationIncrement = 45f;`
`27`	`28`
`28`	`29`	`public override void _Ready()`
`@@ -87,7 +88,6 @@ public void ClientUse()`
`87`	`88`	`[Rpc(MultiplayerApi.RpcMode.AnyPeer, CallLocal = true)]`
`88`	`89`	`private void C2S_Use(Dictionary args)`
`89`	`90`	`{`
`90`		`- GD.Print(item);`
`91`	`91`	`item.UseItem(ItemUsageArgs.FromDictionary(args));`
`92`	`92`	`}`
`93`	`93`