From: Clifton Palmer <clifton.james.palmer@protonmail.com>
Date: Thu, 19 Dec 2024 18:47:48 +0000 (+0200)
Subject: Updated player walls to be same color as player
X-Git-Tag: 0.9.0~5
X-Git-Url: http://git.purplebirdman.com/lightcycles.git/commitdiff_plain/50bbcd345ad197834435d5a7aa375d8f41b3e8e8?ds=inline;hp=641c10419faa820148a6939ae3c24db13ee749e1

Updated player walls to be same color as player
---

diff --git a/map/world.gd b/map/world.gd
index 32f1a7c..6429a3c 100644
--- a/map/world.gd
+++ b/map/world.gd
@@ -5,6 +5,7 @@ extends Node3D
 
 var _player_wall_tscn = preload("res://player/player_wall.tscn")
 var _player_wall_map = {}
+var _player_color_map = {}
 
 var _input_map = [
 	{
@@ -25,8 +26,9 @@ func _ready() -> void:
 	_screen.set_splitscreen(players)
 	
 	for player in players:
-		_player_add_wall(player)
 		player.set_input_map(_input_map.pop_front())
+		_player_color_map[player] = player.color
+		_player_add_wall(player)
 
 
 func _input(event: InputEvent) -> void:
@@ -45,6 +47,7 @@ func _player_add_wall(player: Player) -> void:
 	
 	# start new wall from origin position
 	add_child(wall)
+	wall.set_color(_player_color_map[player])
 	wall.global_position = player.global_position
 	wall.global_rotation = player.global_rotation
 	
diff --git a/map/world.tscn b/map/world.tscn
index 3e4ccba..8a8f968 100644
--- a/map/world.tscn
+++ b/map/world.tscn
@@ -110,7 +110,7 @@ stretch = true
 
 [node name="SubViewport" type="SubViewport" parent="SplitScreenContainer/SubViewportContainer"]
 handle_input_locally = false
-size = Vector2i(3456, 970)
+size = Vector2i(2, 2)
 render_target_update_mode = 4
 
 [node name="SubViewportContainer2" type="SubViewportContainer" parent="SplitScreenContainer"]
@@ -121,7 +121,7 @@ stretch = true
 
 [node name="SubViewport2" type="SubViewport" parent="SplitScreenContainer/SubViewportContainer2"]
 handle_input_locally = false
-size = Vector2i(3456, 970)
+size = Vector2i(2, 2)
 render_target_update_mode = 4
 
 [connection signal="playerDestroyed" from="Player1" to="." method="_on_player_destroyed"]
diff --git a/player/player.gd b/player/player.gd
index ed5bba0..42300fe 100644
--- a/player/player.gd
+++ b/player/player.gd
@@ -14,10 +14,10 @@ signal playerRestart
 @export var color: Color = Color.GOLD
 
 @export_category("Movement") 
-@export var speed = 5.0
+@export var speed: float = 5.0
 
 @export_category("Camera")
-@export var distance = 3.0
+@export var distance: float = 3.0
 
 
 @onready var _springArm = $SpringArm3D
diff --git a/player/player_wall.gd b/player/player_wall.gd
index e8dd447..cd2994e 100644
--- a/player/player_wall.gd
+++ b/player/player_wall.gd
@@ -1,2 +1,19 @@
 class_name PlayerWall
 extends Node3D
+
+
+@export_category("Material")
+@export var _color: Color = Color.GOLD
+
+@onready var mesh: MeshInstance3D = $MeshInstance3D
+
+
+func _ready() -> void:
+	set_color(_color)
+
+
+func set_color(color: Color) -> void:
+	var material = mesh.get_active_material(0)
+	material.albedo_color = color
+	material.emission = color
+	mesh.set_surface_override_material(0, material.duplicate())
diff --git a/player/player_wall.tscn b/player/player_wall.tscn
index 60918fb..727f473 100644
--- a/player/player_wall.tscn
+++ b/player/player_wall.tscn
@@ -1,14 +1,10 @@
-[gd_scene load_steps=6 format=3 uid="uid://6a20phajjwu8"]
+[gd_scene load_steps=5 format=3 uid="uid://6a20phajjwu8"]
 
 [ext_resource type="Script" path="res://player/player_wall.gd" id="1_rj8im"]
-[ext_resource type="Texture2D" uid="uid://cp8pv6wya3ep2" path="res://textures/untextured.png" id="2_oiq6c"]
 
 [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_sk1tc"]
-albedo_color = Color(0.1152, 0.8192, 0.96, 1)
-albedo_texture = ExtResource("2_oiq6c")
-emission_enabled = true
-emission = Color(0.354498, 0.45596, 0.814702, 1)
-emission_energy_multiplier = 1.44
+albedo_color = Color(0.716296, 0.716296, 0.716296, 1)
+emission = Color(0.726732, 0.726732, 0.726732, 1)
 uv1_triplanar = true
 uv1_world_triplanar = true