Changes in mouse control

Author: Geskawary234

Assets/shaders/Fire.gdshader

@@ -19,7 +19,7 @@ uniform float fire_aperture : hint_range( 0.0, 3.0 ) = 0.22;
 	noise_texを使わないパターン
 
 float random( vec2 pos )
-{ 
+{
 	return fract(sin(dot(pos, vec2(12.9898,78.233))) * 43758.5453);
 }
 

Assets/shaders/Glass.gdshader

@@ -42,22 +42,22 @@ void vertex() {
 void fragment() {
 	NORMAL_MAP = texture(normal_map, UV).xyz;
 	NORMAL_MAP_DEPTH = normal_strength;
-	
+
 	float VdotN = dot(VIEW, NORMAL);
 	float fresnel = clamp(SchlickFresnel(VdotN), 0.0, 1.0);
-	
+
 	vec4 albedo_mix = texture(albedo_texture, UV) * albedo;
 	float roughness_mix = texture(roughness_texture, UV).r * roughness;
-	
+
 	float a = mix(0.001, 1.0, albedo_mix.a);
 	float a_factor_0 = mix(fresnel * edge_color.a, 1.0, a);
 	float a_factor_1 = 0.5 * sqrt(a);
 	float a_factor_2 = a_factor_0 + a_factor_1;
-	
+
 	ALBEDO = mix(edge_color.rgb * edge_color.a, albedo_mix.rgb * surface_contribution, a);
 	ROUGHNESS = roughness_mix;
 	SPECULAR = 0.5 * inversesqrt(specular_contribution);
-	
+
 	vec3 unpacked_normal = NORMAL_MAP;
 	unpacked_normal.xy = unpacked_normal.xy * 2.0 - 1.0;
 	unpacked_normal.z = sqrt(max(0.0, 1.0 - dot(unpacked_normal.xy, unpacked_normal.xy)));

DotCrossTesting.tscn

@@ -0,0 +1,16 @@
+[gd_scene load_steps=2 format=3 uid="uid://vv2d7cmpsbp2"]
+
+[ext_resource type="Script" uid="uid://pv3xir7ljyi2" path="res://src/testing/dot_cross_testing.gd" id="1_2grvy"]
+
+[node name="Node3D" type="Node3D"]
+script = ExtResource("1_2grvy")
+
+[node name="RayCast3D" type="RayCast3D" parent="."]
+target_position = Vector3(0.985, 1.715, 0)
+debug_shape_custom_color = Color(0, 1, 0, 1)
+debug_shape_thickness = 5
+
+[node name="RayCast3D2" type="RayCast3D" parent="."]
+target_position = Vector3(0.985, -0.13, 0)
+debug_shape_custom_color = Color(1, 0, 0, 1)
+debug_shape_thickness = 5

Global.gd

@@ -1,5 +1,5 @@
 extends Node
 
 var saw_comix : bool = false
-var did_tutorial : bool = false
+var did_tutorial : bool = true
 var score : int = 0

Scenes/Game.tscn

@@ -121,7 +121,7 @@ spot_range = 51.5012
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 22.8314, 4, -5.33556)
 
 [node name="Camera3D" type="Camera3D" parent="Game/CamPivot"]
-transform = Transform3D(0.852677, -0.169995, 0.494008, 0, 0.945581, 0.325387, -0.522439, -0.27745, 0.806275, 7.14477, 8.9441, 11.9304)
+transform = Transform3D(1, 0, 0, 0, 0.893348, 0.449366, 0, -0.449366, 0.893348, 0, 8.944, 11.93)
 current = true
 fov = 58.5
 script = ExtResource("2_kldst")
@@ -180,34 +180,21 @@ anchor_left = 0.5
 anchor_top = 1.0
 anchor_right = 0.5
 anchor_bottom = 1.0
-offset_left = -251.0
-offset_top = -95.0
-offset_right = 251.0
+offset_left = -283.0
+offset_top = -46.0
+offset_right = 284.0
 grow_horizontal = 2
 grow_vertical = 0
-text = "Use W/S to move
-Use A/D to turn"
+text = "Use WASD to move around"
 
-[node name="WS progress" type="ProgressBar" parent="Game/CamPivot/Camera3D/Tutorial/Label"]
+[node name="WASD progress" type="ProgressBar" parent="Game/CamPivot/Camera3D/Tutorial/Label"]
 z_index = -1
 layout_mode = 1
-anchors_preset = 10
-anchor_right = 1.0
-offset_bottom = 50.0
-grow_horizontal = 2
-theme = ExtResource("10_acvyw")
-show_percentage = false
-
-[node name="AD progress" type="ProgressBar" parent="Game/CamPivot/Camera3D/Tutorial/Label"]
-z_index = -1
-layout_mode = 1
-anchors_preset = -1
-anchor_top = 0.516
+anchors_preset = 15
 anchor_right = 1.0
 anchor_bottom = 1.0
-offset_top = -0.0200043
 grow_horizontal = 2
-grow_vertical = 0
+grow_vertical = 2
 theme = ExtResource("10_acvyw")
 show_percentage = false
 
@@ -265,7 +252,7 @@ show_percentage = false
 
 [node name="Mouse" parent="Game" instance=ExtResource("3_b2bpf")]
 unique_name_in_owner = true
-transform = Transform3D(0.997917, 0, -0.064515, 0, 1, 0, 0.064515, 0, 0.997917, 23.9156, 18.3147, -5.46594)
+transform = Transform3D(0.997917, 0, -0.064515, 0, 1, 0, 0.064515, 0, 0.997917, 24.2401, 9.40695, -2.85862)
 
 [node name="KillArea" type="Area3D" parent="Game"]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.015552, 0)

Scenes/Player/mouse/mouse.gd

@@ -36,18 +36,18 @@ func hit(other):
 		if other is Powerup:
 			return
 
-		if other is Item:
-			health -= 5
-			mouse_model.take_damage()
-			hit_cooldown = 1
-		if other is HeavyItem:
-			health = 0
-		elif other is Shard:
-			health -= 1
-			mouse_model.take_damage()
-			hit_cooldown = 1
-		
-		
+		if other is Item or other is Shard:
+			
+			var k = -other.linear_velocity.normalized().dot(velocity.normalized())
+			
+			var res_damage : float = other.max_damage + other.max_damage * k
+			
+			if res_damage>0:
+				hit_cooldown = 1
+				health -= res_damage
+				mouse_model.take_damage()
+			
+			
 			#await get_tree().create_timer(0.5).timeout
 			#get_tree().change_scene_to_file('res://ui/died_menu.tscn')
 
@@ -70,18 +70,21 @@ func _physics_process(delta: float) -> void:
 
 	# Get the input direction and handle the movement/deceleration.
 	# As good practice, you should replace UI actions with custom gameplay actions.
-	var input_dir := Input.get_vector("w", "s", "d", "a")
+	var input_dir := Input.get_vector("d", "a", "s", "w")
 	mouse_model.direction = input_dir
 
-	rotation.y += input_dir.y * delta * 4
+	#rotation.y += input_dir.y * delta * 4
+	var direction := -(cam.global_transform.basis * Vector3(input_dir.x, 0, input_dir.y)).normalized()
 
-	var direction := -(transform.basis * Vector3(input_dir.x, 0, 0)).normalized()
 
 
 	#var direction := Vector3(input_dir.x, 0, input_dir.y).normalized()
 	if direction:
 		velocity.x = direction.x * SPEED
 		velocity.z = direction.z * SPEED
+		var ang := Vector2(direction.x,-direction.z).angle()
+		rotation.y = lerp_angle(rotation.y,ang,0.1)
+		
 	else:
 		velocity.x = move_toward(velocity.x, 0, SPEED)
 		velocity.z = move_toward(velocity.z, 0, SPEED)

Scenes/Player/mouse/mouse.tscn

@@ -22,7 +22,6 @@ transform = Transform3D(1, 0, -2.98023e-08, 0, 1, 0, 2.98023e-08, 0, 1, -0.37121
 shape = SubResource("BoxShape3D_tpibb")
 
 [node name="RigidBody3D" type="RigidBody3D" parent="."]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0)
 top_level = true
 mass = 25.0
 script = ExtResource("2_3xyak")

Scenes/Player/mouse/mouse_model.gd

@@ -11,13 +11,14 @@ var direction : Vector2
 func reset_position():
 	head_target.position = def_position
 '''
+'''
 var turn_speed : float = 5
 func _process(delta: float) -> void:
 	if direction:
-		head_target.position.z = move_toward(head_target.position.z,-3*direction.y,delta*turn_speed)
+		head_target.position.z = move_toward(head_target.position.z,-3*direction.x,delta*turn_speed)
 	else:
 		head_target.position.z = move_toward(head_target.position.z,def_position.z,delta*turn_speed)
-
+'''
 @onready var ap: AnimationPlayer = $AnimationPlayer2
 func jump():
 	ap.play("Jump")

default_bus_layout.tres

@@ -1,4 +1,3 @@
 [gd_resource type="AudioBusLayout" format=3 uid="uid://dof2uoju1igv4"]
 
 [resource]
-bus/0/volume_db = 0.0694828

project.godot

@@ -77,9 +77,9 @@ destroy_all={
 "events": [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":65,"key_label":0,"unicode":97,"location":0,"echo":false,"script":null)
 ]
 }
-p={
+esc={
 "deadzone": 0.2,
-"events": [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":80,"key_label":0,"unicode":112,"location":0,"echo":false,"script":null)
+"events": [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":4194305,"key_label":0,"unicode":0,"location":0,"echo":false,"script":null)
 ]
 }