diff --git a/Assets/arena_placeholder_v01.glb b/Assets/arena_placeholder_v01.glb new file mode 100644 index 0000000..23413a1 Binary files /dev/null and b/Assets/arena_placeholder_v01.glb differ diff --git a/Assets/arena_placeholder_v01.glb.import b/Assets/arena_placeholder_v01.glb.import new file mode 100644 index 0000000..7146d3b --- /dev/null +++ b/Assets/arena_placeholder_v01.glb.import @@ -0,0 +1,42 @@ +[remap] + +importer="scene" +importer_version=1 +type="PackedScene" +uid="uid://dio67r8ambe7h" +path="res://.godot/imported/arena_placeholder_v01.glb-fc11365d8ec7ae6778e90b13ba508b8a.scn" + +[deps] + +source_file="res://Assets/arena_placeholder_v01.glb" +dest_files=["res://.godot/imported/arena_placeholder_v01.glb-fc11365d8ec7ae6778e90b13ba508b8a.scn"] + +[params] + +nodes/root_type="" +nodes/root_name="" +nodes/root_script=null +nodes/apply_root_scale=true +nodes/root_scale=1.0 +nodes/import_as_skeleton_bones=false +nodes/use_name_suffixes=true +nodes/use_node_type_suffixes=true +meshes/ensure_tangents=true +meshes/generate_lods=true +meshes/create_shadow_meshes=true +meshes/light_baking=1 +meshes/lightmap_texel_size=0.2 +meshes/force_disable_compression=false +skins/use_named_skins=true +animation/import=true +animation/fps=30 +animation/trimming=false +animation/remove_immutable_tracks=true +animation/import_rest_as_RESET=false +import_script/path="" +materials/extract=0 +materials/extract_format=0 +materials/extract_path="" +_subresources={} +gltf/naming_version=2 +gltf/embedded_image_handling=1 diff --git a/Assets/bull_v10.fbx b/Assets/bull_v10.fbx new file mode 100644 index 0000000..59c1a78 Binary files /dev/null and b/Assets/bull_v10.fbx differ diff --git a/Assets/bull_v10.fbx.import b/Assets/bull_v10.fbx.import new file mode 100644 index 0000000..28ea916 --- /dev/null +++ b/Assets/bull_v10.fbx.import @@ -0,0 +1,44 @@ +[remap] + +importer="scene" +importer_version=1 +type="PackedScene" +uid="uid://qy6qrxdfgx2g" +path="res://.godot/imported/bull_v10.fbx-0bb89c99686d56acf88cf41a200f2277.scn" + +[deps] + +source_file="res://Assets/bull_v10.fbx" +dest_files=["res://.godot/imported/bull_v10.fbx-0bb89c99686d56acf88cf41a200f2277.scn"] + +[params] + +nodes/root_type="" +nodes/root_name="" +nodes/root_script=null +nodes/apply_root_scale=true +nodes/root_scale=1.0 +nodes/import_as_skeleton_bones=false +nodes/use_name_suffixes=true +nodes/use_node_type_suffixes=true +meshes/ensure_tangents=true +meshes/generate_lods=true +meshes/create_shadow_meshes=true +meshes/light_baking=1 +meshes/lightmap_texel_size=0.2 +meshes/force_disable_compression=false +skins/use_named_skins=true +animation/import=true +animation/fps=30 +animation/trimming=true +animation/remove_immutable_tracks=true +animation/import_rest_as_RESET=false +import_script/path="" +materials/extract=0 +materials/extract_format=0 +materials/extract_path="" +_subresources={} +fbx/importer=0 +fbx/allow_geometry_helper_nodes=false +fbx/embedded_image_handling=1 +fbx/naming_version=2 diff --git a/Player.tscn b/Player.tscn index 3099a68..8483650 100644 --- a/Player.tscn +++ b/Player.tscn @@ -3,11 +3,10 @@ [ext_resource type="Script" uid="uid://bn777gguclud5" path="res://player.gd" id="1_xhfnw"] [ext_resource type="Script" uid="uid://b4td4k8yo5y78" path="res://camera_spring_arm.gd" id="2_kpjcp"] [ext_resource type="Script" uid="uid://b720l6m0ehrj3" path="res://camera_follow.gd" id="3_kne1u"] +[ext_resource type="PackedScene" uid="uid://qy6qrxdfgx2g" path="res://Assets/bull_v10.fbx" id="4_e80uo"] -[sub_resource type="BoxShape3D" id="BoxShape3D_xhfnw"] -size = Vector3(1, 1.4072266, 1) - -[sub_resource type="BoxMesh" id="BoxMesh_0rwas"] +[sub_resource type="SphereShape3D" id="SphereShape3D_cxr5p"] +radius = 0.9978615 [sub_resource type="SphereShape3D" id="SphereShape3D_kne1u"] radius = 0.3 @@ -16,37 +15,8 @@ radius = 0.3 script = ExtResource("1_xhfnw") [node name="CollisionShape3D" type="CollisionShape3D" parent="." unique_id=1104396769] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.20361328, 0) -shape = SubResource("BoxShape3D_xhfnw") - -[node name="CubeGuy" type="Node3D" parent="." unique_id=1651396216] - -[node name="MeshInstance3D" type="MeshInstance3D" parent="CubeGuy" unique_id=367855086] -mesh = SubResource("BoxMesh_0rwas") - -[node name="MeshInstance3D2" type="MeshInstance3D" parent="CubeGuy" unique_id=1565560527] -transform = Transform3D(0.22778136, 0, 0, 0, 0.4572928, 0, 0, 0, 0.2800231, 0.36544353, -0.65451574, 0) -mesh = SubResource("BoxMesh_0rwas") - -[node name="MeshInstance3D3" type="MeshInstance3D" parent="CubeGuy" unique_id=2097296241] -transform = Transform3D(0.22778136, 0, 0, 0, 0.4572928, 0, 0, 0, 0.2800231, -0.38543648, -0.65451574, 0) -mesh = SubResource("BoxMesh_0rwas") - -[node name="MeshInstance3D4" type="MeshInstance3D" parent="CubeGuy" unique_id=383816037] -transform = Transform3D(0.14033328, 0.3601992, 0, -0.17941824, 0.28173247, 0, 0, 0, 0.28002307, -0.60614854, -0.07838535, 0) -mesh = SubResource("BoxMesh_0rwas") - -[node name="MeshInstance3D5" type="MeshInstance3D" parent="CubeGuy" unique_id=326472138] -transform = Transform3D(-0.14033328, -0.3601992, 2.4480395e-08, -0.17941824, 0.28173247, 0, -1.2268325e-08, -3.1489616e-08, -0.28002307, 0.6122027, -0.07838535, 0) -mesh = SubResource("BoxMesh_0rwas") - -[node name="MeshInstance3D6" type="MeshInstance3D" parent="CubeGuy" unique_id=1642768377] -transform = Transform3D(-0.113692805, 0, -2.4480393e-08, 0, 0.11736439, 0, 9.939342e-09, 0, -0.28002304, -0.26236355, 0.3103568, 0.42819703) -mesh = SubResource("BoxMesh_0rwas") - -[node name="MeshInstance3D7" type="MeshInstance3D" parent="CubeGuy" unique_id=695468518] -transform = Transform3D(-0.113692805, 0, -2.4480393e-08, 0, 0.11736439, 0, 9.939342e-09, 0, -0.28002304, 0.2908606, 0.28320956, 0.42819703) -mesh = SubResource("BoxMesh_0rwas") +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.06252837, 0.10353303, 0) +shape = SubResource("SphereShape3D_cxr5p") [node name="SpringArmPivot" type="Node3D" parent="." unique_id=1671817680] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.22, 0) @@ -64,3 +34,6 @@ keep_aspect = 0 script = ExtResource("3_kne1u") spring_arm = NodePath("../SpringArm3D/SpringPosition") lerp_power = 6.0 + +[node name="bull_v10" parent="." unique_id=1386495166 instance=ExtResource("4_e80uo")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.655, 0.23) diff --git a/player.gd b/player.gd index dc9fc60..3b7d4f8 100644 --- a/player.gd +++ b/player.gd @@ -6,7 +6,7 @@ const JUMP_VELOCITY = 4.5 @export var turn_speed: float = 10.0 @onready var camera_pivot: Node3D = $SpringArmPivot -@onready var cube_guy: Node3D = $CubeGuy +@onready var cube_guy: Node3D = $bull_v10 func _physics_process(delta: float) -> void: diff --git a/project.godot b/project.godot index 2140a30..f120495 100644 --- a/project.godot +++ b/project.godot @@ -11,7 +11,7 @@ config_version=5 [application] config/name="3rd_person_camera" -config/features=PackedStringArray("4.7", "Forward Plus") +config/features=PackedStringArray("4.6", "Forward Plus") config/icon="res://icon.svg" config/run/main_scene="res://scene.tscn" diff --git a/scene.tscn b/scene.tscn index c5b41d2..3cafe85 100644 --- a/scene.tscn +++ b/scene.tscn @@ -1,8 +1,7 @@ [gd_scene format=3 uid="uid://b7afbx36ltb3f"] [ext_resource type="PackedScene" uid="uid://crtm0xtiql3r8" path="res://Player.tscn" id="1_ulcgi"] - -[sub_resource type="BoxMesh" id="BoxMesh_nxogm"] +[ext_resource type="PackedScene" uid="uid://dio67r8ambe7h" path="res://Assets/arena_placeholder_v01.glb" id="2_nxogm"] [sub_resource type="BoxShape3D" id="BoxShape3D_ulcgi"] @@ -18,13 +17,12 @@ shadow_enabled = true [node name="Node3D" type="Node3D" parent="." unique_id=1081100876] transform = Transform3D(3.5710833, 0, 0, 0, 1, 0, 0, 0, 2.2964425, 0, 0, 0) -[node name="MeshInstance3D" type="MeshInstance3D" parent="Node3D" unique_id=1193968330] -transform = Transform3D(7.6892195, 0, 0, 0, 0.34217757, 0, 0, 0, 8.638922, 0, 0, 0) -mesh = SubResource("BoxMesh_nxogm") - [node name="StaticBody3D" type="StaticBody3D" parent="Node3D" unique_id=2072095624] transform = Transform3D(1.0000001, 0, 0, 0, 1.0000001, 0, 0, 0, 1.0000001, 0, 0, 0) [node name="CollisionShape3D" type="CollisionShape3D" parent="Node3D/StaticBody3D" unique_id=1444198204] transform = Transform3D(7.6892185, 0, 0, 0, 0.34217754, 0, 0, 0, 8.638921, 0, 0, 0) shape = SubResource("BoxShape3D_ulcgi") + +[node name="arena_placeholder_v01" parent="Node3D" unique_id=1341659233 instance=ExtResource("2_nxogm")] +transform = Transform3D(0.28002706, 0, 0, 0, 1, 0, 0, 0, 0.43545616, -0.2506242, 0, 0)