From 4d5bf6a8ad54f65ee86786180b09281b2807d092 Mon Sep 17 00:00:00 2001
From: Jan Heemstra <heemstrajan@gmail.com>
Date: Mon, 3 May 2021 01:04:32 +0200
Subject: [PATCH] rotated grenade to face the correct way

---
 .../Assets/Weapons/GrenadeLauncher/Grenade.gd |  4 ++++
 .../Weapons/GrenadeLauncher/Grenade.tscn      | 20 +++++++++----------
 .../GrenadeLauncher/GrenadeLauncher.gd        |  2 +-
 .../Weapons/GrenadeLauncher/GrenadeMesh.tscn  |  5 +++++
 4 files changed, 19 insertions(+), 12 deletions(-)
 create mode 100644 Game/Assets/Weapons/GrenadeLauncher/GrenadeMesh.tscn

diff --git a/Game/Assets/Weapons/GrenadeLauncher/Grenade.gd b/Game/Assets/Weapons/GrenadeLauncher/Grenade.gd
index ea7dbc5..c0b28b7 100644
--- a/Game/Assets/Weapons/GrenadeLauncher/Grenade.gd
+++ b/Game/Assets/Weapons/GrenadeLauncher/Grenade.gd
@@ -1,4 +1,8 @@
 extends RigidBody
 
+func _process(delta):
+	# TODO: synchronize position
+	pass
+
 func explode():
 	queue_free()
diff --git a/Game/Assets/Weapons/GrenadeLauncher/Grenade.tscn b/Game/Assets/Weapons/GrenadeLauncher/Grenade.tscn
index 6f4d589..c3afd9d 100644
--- a/Game/Assets/Weapons/GrenadeLauncher/Grenade.tscn
+++ b/Game/Assets/Weapons/GrenadeLauncher/Grenade.tscn
@@ -1,28 +1,26 @@
 [gd_scene load_steps=5 format=2]
 
 [ext_resource path="res://Assets/Weapons/GrenadeLauncher/Grenade.gd" type="Script" id=1]
+[ext_resource path="res://Assets/Weapons/GrenadeLauncher/GrenadeMesh.tscn" type="PackedScene" id=2]
 
 [sub_resource type="PhysicsMaterial" id=3]
 friction = 0.3
 bounce = 0.7
 
-[sub_resource type="SphereShape" id=1]
-radius = 0.1
-
-[sub_resource type="SphereMesh" id=2]
-radius = 0.1
-height = 0.2
+[sub_resource type="CapsuleShape" id=4]
+radius = 0.102523
+height = 0.105712
 
 [node name="Grenade" type="RigidBody"]
 physics_material_override = SubResource( 3 )
 script = ExtResource( 1 )
 
-[node name="CollisionShape" type="CollisionShape" parent="."]
-shape = SubResource( 1 )
+[node name="GrenadeMesh" parent="." instance=ExtResource( 2 )]
+transform = Transform( 4.37114e-08, -1, -3.82137e-15, -1, -4.37114e-08, 8.74228e-08, -8.74228e-08, 0, -1, 0, 0, 0 )
 
-[node name="MeshInstance" type="MeshInstance" parent="."]
-mesh = SubResource( 2 )
-material/0 = null
+[node name="CollisionShape" type="CollisionShape" parent="."]
+transform = Transform( 1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, 0, 0, 0 )
+shape = SubResource( 4 )
 
 [node name="Timer" type="Timer" parent="."]
 wait_time = 2.0
diff --git a/Game/Assets/Weapons/GrenadeLauncher/GrenadeLauncher.gd b/Game/Assets/Weapons/GrenadeLauncher/GrenadeLauncher.gd
index 16fb83e..16f7050 100644
--- a/Game/Assets/Weapons/GrenadeLauncher/GrenadeLauncher.gd
+++ b/Game/Assets/Weapons/GrenadeLauncher/GrenadeLauncher.gd
@@ -23,6 +23,6 @@ sync func fire_weapon():
 	var muzzle_transform = $Model/Muzzle.global_transform
 	grenade_instance.global_transform = muzzle_transform
 	
-	grenade_instance.linear_velocity = muzzle_transform.basis.y * 40 + player.velocity
+	grenade_instance.linear_velocity = muzzle_transform.basis.y * 20 + player.velocity
 	
 	get_tree().root.call_deferred("add_child", grenade_instance)
diff --git a/Game/Assets/Weapons/GrenadeLauncher/GrenadeMesh.tscn b/Game/Assets/Weapons/GrenadeLauncher/GrenadeMesh.tscn
new file mode 100644
index 0000000..0b2fc49
--- /dev/null
+++ b/Game/Assets/Weapons/GrenadeLauncher/GrenadeMesh.tscn
@@ -0,0 +1,5 @@
+[gd_scene load_steps=2 format=2]
+
+[ext_resource path="res://Assets/Weapons/GrenadeLauncher/Grenade.gltf" type="PackedScene" id=1]
+
+[node name="GrenadeMesh" instance=ExtResource( 1 )]