diff --git a/3d_test.tscn b/3d_test.tscn new file mode 100644 index 0000000..d4fc957 --- /dev/null +++ b/3d_test.tscn @@ -0,0 +1,18 @@ +[gd_scene load_steps=3 format=3 uid="uid://b6qd2ja2kaul8"] + +[ext_resource type="PackedScene" uid="uid://ctgbbvgfnocql" path="res://player3d.tscn" id="1_osef0"] +[ext_resource type="PackedScene" uid="uid://fjxeinktml2j" path="res://map_3d_test.tscn" id="2_3miw1"] + +[node name="Node3D" type="Node3D"] + +[node name="Player" parent="." instance=ExtResource("1_osef0")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.58914, 0) + +[node name="Camera3D" type="Camera3D" parent="Player"] +transform = Transform3D(1, 0, 0, 0, 0.979855, 0.19971, 0, -0.19971, 0.979855, 0, 1.43735, 2.24099) + +[node name="TestTerrain" parent="." instance=ExtResource("2_3miw1")] + +[node name="DirectionalLight3D" type="DirectionalLight3D" parent="TestTerrain"] +transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, 0, 9.82951, 0) +shadow_enabled = true diff --git a/map_3d_test.tscn b/map_3d_test.tscn new file mode 100644 index 0000000..ef6f1c0 --- /dev/null +++ b/map_3d_test.tscn @@ -0,0 +1,9 @@ +[gd_scene load_steps=2 format=3 uid="uid://fjxeinktml2j"] + +[sub_resource type="PlaneMesh" id="PlaneMesh_763vg"] +size = Vector2(100, 100) + +[node name="Terrain" type="StaticBody3D"] + +[node name="MeshInstance3D" type="MeshInstance3D" parent="."] +mesh = SubResource("PlaneMesh_763vg") diff --git a/player.gd b/player.gd index 7d5215b..97a91a9 100644 --- a/player.gd +++ b/player.gd @@ -6,15 +6,11 @@ var heldFrisbee :CharacterBody2D= null var remote_player :bool= false -var max_walk :float= 10 -var accel_walk :float= 100 - -var max_run :float= 20 -var accel_run :float= 2 * accel_walk - -var friction_tonic :float= 1e-1 - var move_dir :Vector2= Vector2.ZERO +var move_force :float= 500 +var max_speed :float= 500 +var move_friction :float= 1000 +var tonic_friction :float= 100 # Called when the node enters the scene tree for the first time. func _ready(): @@ -24,7 +20,8 @@ func set_move_direction(dir): move_dir = dir func move_player(delta): - move_and_collide(move_dir * max_walk) + velocity = max_speed * move_dir + move_and_slide() # Called every frame. 'delta' is the elapsed time since the previous frame. func _process(delta): diff --git a/player3d.tscn b/player3d.tscn new file mode 100644 index 0000000..95097ba --- /dev/null +++ b/player3d.tscn @@ -0,0 +1,14 @@ +[gd_scene load_steps=3 format=3 uid="uid://ctgbbvgfnocql"] + +[sub_resource type="BoxShape3D" id="BoxShape3D_vyj2w"] +size = Vector3(1, 2, 1) + +[sub_resource type="CapsuleMesh" id="CapsuleMesh_8g2hv"] + +[node name="Player" type="CharacterBody3D"] + +[node name="CollisionShape3D" type="CollisionShape3D" parent="."] +shape = SubResource("BoxShape3D_vyj2w") + +[node name="MeshInstance3D" type="MeshInstance3D" parent="."] +mesh = SubResource("CapsuleMesh_8g2hv") diff --git a/project.godot b/project.godot index 266390f..6e563c3 100644 --- a/project.godot +++ b/project.godot @@ -18,8 +18,8 @@ config/icon="res://icon.svg" [display] -window/size/viewport_width=1280 -window/size/viewport_height=720 +window/size/viewport_width=1920 +window/size/viewport_height=1080 window/stretch/mode="viewport" [editor] diff --git a/title_screen.gd b/title_screen.gd index 520353c..7a038f7 100644 --- a/title_screen.gd +++ b/title_screen.gd @@ -1,6 +1,6 @@ extends Node2D -var game_arena :PackedScene= preload("res://game_arena.tscn") +var game_arena :PackedScene= preload("res://3d_test.tscn") var scene_ref = null # Called when the node enters the scene tree for the first time.