From 3ba4b54c45f1602f539d0a8513e07d31851124cb Mon Sep 17 00:00:00 2001 From: Leonardo <321501@studenti.unimore.it> Date: Sat, 25 Nov 2023 19:39:22 +0100 Subject: [PATCH] edit bullet model --- Root.tscn | 8 ++++---- obstacles/bullet.tscn | 12 +++++------- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/Root.tscn b/Root.tscn index d5142cc..bf60af3 100644 --- a/Root.tscn +++ b/Root.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=31 format=3 uid="uid://4whij2hmts0t"] [ext_resource type="Script" path="res://Player.gd" id="1_wt4gx"] -[ext_resource type="Material" uid="uid://dondfiavgo2ws" path="res://Unshaded.material" id="2_upp15"] +[ext_resource type="Material" path="res://Unshaded.material" id="2_upp15"] [ext_resource type="Texture2D" uid="uid://uogmi4pvp64t" path="res://addons/bisio.png" id="3_27tel"] [ext_resource type="FontFile" uid="uid://cseshyj4yw2f5" path="res://fonts/FiraSans-Medium.ttf" id="3_p3wyc"] [ext_resource type="Script" path="res://GameTimer.gd" id="3_y362g"] @@ -11,11 +11,11 @@ [ext_resource type="Script" path="res://Camera3D.gd" id="8_auifr"] [ext_resource type="Texture2D" uid="uid://ct6sngef76p35" path="res://addons/grass.png" id="9_i8cb1"] [ext_resource type="PackedScene" uid="uid://bxj354o6rycsf" path="res://obstacles/house_c.tscn" id="9_xyam4"] -[ext_resource type="PackedScene" uid="uid://ccs202pcy4pce" path="res://obstacles/dialog.tscn" id="10_6ihn6"] +[ext_resource type="PackedScene" path="res://obstacles/dialog.tscn" id="10_6ihn6"] [ext_resource type="PlaneMesh" uid="uid://jy4q18wf2j41" path="res://road_mesh_something.tres" id="10_7jwjs"] [ext_resource type="Texture2D" uid="uid://bx05lcriqc602" path="res://addons/asphalt_blank.png" id="11_kxmgb"] -[ext_resource type="PackedScene" uid="uid://d3ikq1a6muafo" path="res://obstacles/goal_billboard.tscn" id="14_0ikhl"] -[ext_resource type="PackedScene" uid="uid://crbal5m8uhcd5" path="res://obstacles/vent.tscn" id="15_hwvsi"] +[ext_resource type="PackedScene" path="res://obstacles/goal_billboard.tscn" id="14_0ikhl"] +[ext_resource type="PackedScene" path="res://obstacles/vent.tscn" id="15_hwvsi"] [ext_resource type="PackedScene" uid="uid://cbmkrd5kwiujt" path="res://obstacles/torretta.tscn" id="17_6hms3"] [ext_resource type="PackedScene" uid="uid://mahsivqsy3oo" path="res://obstacles/panchina.tscn" id="18_ijdrl"] [ext_resource type="PackedScene" uid="uid://c1p6udf66lht2" path="res://obstacles/bullet.tscn" id="19_fskgs"] diff --git a/obstacles/bullet.tscn b/obstacles/bullet.tscn index c96f998..87c94fb 100644 --- a/obstacles/bullet.tscn +++ b/obstacles/bullet.tscn @@ -1,8 +1,7 @@ [gd_scene load_steps=4 format=3 uid="uid://c1p6udf66lht2"] [ext_resource type="Script" path="res://obstacles/bullet.gd" id="1_dawle"] - -[sub_resource type="CylinderMesh" id="CylinderMesh_nnt0g"] +[ext_resource type="PackedScene" uid="uid://cis3y8bj1x60j" path="res://models/can.glb" id="2_jdw1w"] [sub_resource type="CylinderShape3D" id="CylinderShape3D_rk7k5"] radius = 0.58729 @@ -17,12 +16,11 @@ max_contacts_reported = 1 contact_monitor = true script = ExtResource("1_dawle") -[node name="MeshInstance3D" type="MeshInstance3D" parent="."] -transform = Transform3D(0.4, 0, 0, 0, 0.4, 0, 0, 0, 0.4, 0, 0, 0) -mesh = SubResource("CylinderMesh_nnt0g") - [node name="CollisionShape3D" type="CollisionShape3D" parent="."] -transform = Transform3D(0.4, 0, 0, 0, 0.4, -3.34074e-23, 0, 3.34074e-23, 0.4, 0, 0, 0) +transform = Transform3D(0.488, 0, 2.90929e-22, 0, 0.331, 0, -2.90929e-22, 0, 0.488, 0, 0, 0) shape = SubResource("CylinderShape3D_rk7k5") +[node name="can" parent="." instance=ExtResource("2_jdw1w")] +transform = Transform3D(0.267232, 8.88178e-16, -5.29396e-23, -8.88178e-16, 0.267232, 8.88178e-16, -2.11758e-22, -8.88178e-16, 0.267232, 0, 0, 0) + [connection signal="body_entered" from="." to="." method="_on_body_entered"]