From 61cd28172cea7e563a2e9ef50ec2726241157ff7 Mon Sep 17 00:00:00 2001
From: ncusimano <cusimano@ualberta.ca>
Date: Sat, 19 Aug 2023 11:30:53 -0600
Subject: [PATCH] Camera Updates

---
 godot/Models/grape_man.tscn |  2 +-
 godot/Player.gd             |  5 ++++-
 godot/player.tscn           | 25 +++++++++++--------------
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/godot/Models/grape_man.tscn b/godot/Models/grape_man.tscn
index 86858fe..f68a22d 100644
--- a/godot/Models/grape_man.tscn
+++ b/godot/Models/grape_man.tscn
@@ -1,4 +1,4 @@
-[gd_scene load_steps=3 format=3 uid="uid://bgoo1lbt28na"]
+[gd_scene load_steps=3 format=3 uid="uid://bmx4xpa5svia3"]
 
 [ext_resource type="PackedScene" uid="uid://bhanbx2dyhv2d" path="res://Models/grape_man.glb" id="1_fh5yr"]
 [ext_resource type="Script" path="res://Models/grape_man.gd" id="2_ksje8"]
diff --git a/godot/Player.gd b/godot/Player.gd
index 29f15a9..b2f4221 100644
--- a/godot/Player.gd
+++ b/godot/Player.gd
@@ -6,6 +6,7 @@ const JUMP_VELOCITY = 4.5
 @export var horiz_sens = 0.25
 @export var vert_sens = 0.25
 var playerCam
+var playerVisuals
 
 # Get the gravity from the project settings to be synced with RigidBody nodes.
 var gravity = ProjectSettings.get_setting("physics/3d/default_gravity")
@@ -13,6 +14,7 @@ var gravity = ProjectSettings.get_setting("physics/3d/default_gravity")
 func _ready():
 	Input.mouse_mode = Input.MOUSE_MODE_CAPTURED
 	playerCam = get_node("CameraMount") as Node3D
+	playerVisuals = get_node("grape_man") as Node3D
 	
 	
 func _process(delta):
@@ -25,7 +27,8 @@ func _input(event):
 	# Handle the rotation of the camera using mouse movement.
 	if event is InputEventMouseMotion:
 		rotate_y(deg_to_rad(-event.relative.x * horiz_sens))
-		playerCam.rotate_x(deg_to_rad(-event.relative.y * vert_sens))
+		playerVisuals.rotate_y(deg_to_rad(event.relative.x * horiz_sens))
+		playerCam.rotate_x(deg_to_rad(event.relative.y * vert_sens))
 
 func _physics_process(delta):
 	# Add the gravity.
diff --git a/godot/player.tscn b/godot/player.tscn
index 54be7c5..be3f28d 100644
--- a/godot/player.tscn
+++ b/godot/player.tscn
@@ -1,28 +1,25 @@
-[gd_scene load_steps=6 format=3 uid="uid://csqyxbjumla33"]
+[gd_scene load_steps=4 format=3 uid="uid://csqyxbjumla33"]
 
 [ext_resource type="Script" path="res://Player.gd" id="1_7gpdp"]
-[ext_resource type="Texture2D" uid="uid://vw0x1higed4d" path="res://Default Orange.png" id="2_s5i4o"]
+[ext_resource type="PackedScene" uid="uid://bmx4xpa5svia3" path="res://Models/grape_man.tscn" id="2_hha22"]
 
-[sub_resource type="CapsuleShape3D" id="CapsuleShape3D_kb4ms"]
-
-[sub_resource type="CapsuleMesh" id="CapsuleMesh_1e11l"]
-
-[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_npbs0"]
-albedo_texture = ExtResource("2_s5i4o")
+[sub_resource type="CapsuleShape3D" id="CapsuleShape3D_1yhh3"]
+radius = 1.2
+height = 5.8
 
 [node name="Player" type="CharacterBody3D"]
 script = ExtResource("1_7gpdp")
 
 [node name="CollisionShape3D" type="CollisionShape3D" parent="."]
-shape = SubResource("CapsuleShape3D_kb4ms")
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 3, 0)
+shape = SubResource("CapsuleShape3D_1yhh3")
 
-[node name="MeshInstance3D" type="MeshInstance3D" parent="."]
-mesh = SubResource("CapsuleMesh_1e11l")
-surface_material_override/0 = SubResource("StandardMaterial3D_npbs0")
+[node name="grape_man" parent="." instance=ExtResource("2_hha22")]
+transform = Transform3D(-1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, 0, 0, 0)
 
 [node name="CameraMount" type="Node3D" parent="."]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.3, 0)
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 4.45879, 0)
 
 [node name="PlayerCam" type="Camera3D" parent="CameraMount"]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 4)
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1, 7)
 fov = 105.5