Removed Git LFS

This commit is contained in:
2024-02-02 20:12:14 +01:00
parent 3e2329c3b9
commit d6843621ce
17 changed files with 136 additions and 308 deletions

View File

@ -0,0 +1,56 @@
extends Node
@export var animation_player: AnimationPlayer
@export var blend_time: float
var next_animation: StringName = "RESET"
func _ready():
assert(animation_player)
assert(blend_time >= 0.0)
func _process(_delta):
play("idle")
if animation_player.current_animation == next_animation:
return
animation_player.play(next_animation, blend_time)
func play(action_name: StringName):
next_animation = action_name
# func air(y_velocity: float):
# if y_velocity > 0:
# play("rifle_jump")
# else:
# play("falling")
# func aim(move: Vector2, is_shooting: bool):
# if move.x > 0:
# play("rifle_aim_strafe_right")
# elif move.x < 0:
# play("rifle_aim_strafe_left")
# elif move.y < 0:
# play("rifle_aim_walk_forward")
# elif move.y > 0:
# play("rifle_aim_walk_backward")
# else:
# play("rifle_aim")
# if is_shooting:
# play("rifle_shoot")
# func run(move: Vector2, is_shooting: bool):
# if move.y < 0:
# play("rifle_run_forward")
# elif move.y > 0:
# play("rifle_run_backward")
# elif move.x > 0:
# play("rifle_run_right")
# elif move.x < 0:
# play("rifle_run_left")
# elif is_shooting:
# play("rifle_shoot")
# else:
# play("rifle_idle")

View File

@ -1,8 +1,9 @@
[gd_scene load_steps=5 format=3 uid="uid://2lcnu3dy54lx"]
[gd_scene load_steps=6 format=3 uid="uid://2lcnu3dy54lx"]
[ext_resource type="Script" path="res://player/Player.gd" id="1_8gebs"]
[ext_resource type="PackedScene" uid="uid://dglu2uaewno0p" path="res://player/model/FemaleBase.blend" id="2_24ena"]
[ext_resource type="PackedScene" uid="uid://dnr3o1rbkqpgu" path="res://assets/models/female/Female.blend" id="2_8nah6"]
[ext_resource type="PackedScene" uid="uid://2bbycjulf00g" path="res://character/health/HealthComponent.tscn" id="2_np5ag"]
[ext_resource type="FontFile" uid="uid://b7mov13kwi8u8" path="res://assets/ui/font/ubuntu_nf_regular.ttf" id="4_76ehj"]
[sub_resource type="CapsuleShape3D" id="CapsuleShape3D_2f50n"]
radius = 0.25
@ -14,18 +15,16 @@ model = NodePath("Model")
[node name="Model" type="Node3D" parent="."]
[node name="FemaleBase" parent="Model" instance=ExtResource("2_24ena")]
transform = Transform3D(0.33, 0, 0, 0, 0.33, 0, 0, 0, 0.33, 0, 0, 0)
[node name="Female" parent="Model" instance=ExtResource("2_8nah6")]
[node name="Collision" type="CollisionShape3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.8, 0)
shape = SubResource("CapsuleShape3D_2f50n")
[node name="Animation" type="AnimationPlayer" parent="."]
[node name="Health" parent="." instance=ExtResource("2_np5ag")]
[node name="Label" type="Label3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2, 0)
billboard = 1
text = "Player"
font = ExtResource("4_76ehj")

View File

@ -5,9 +5,7 @@ extends Controller
var server_position: Vector3
func _ready():
print(character.name, ".old: ", server_position)
server_position = character.position
print(character.name, ".new: ", server_position)
func _process(_delta):
var move := server_position - character.position

View File

@ -1,50 +0,0 @@
[remap]
importer="scene"
importer_version=1
type="PackedScene"
uid="uid://dglu2uaewno0p"
path="res://.godot/imported/FemaleBase.blend-ffb0211788dfb291cbc8516269a785f5.scn"
[deps]
source_file="res://player/model/FemaleBase.blend"
dest_files=["res://.godot/imported/FemaleBase.blend-ffb0211788dfb291cbc8516269a785f5.scn"]
[params]
nodes/root_type=""
nodes/root_name=""
nodes/apply_root_scale=true
nodes/root_scale=1.0
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
import_script/path=""
_subresources={}
gltf/naming_version=1
gltf/embedded_image_handling=1
blender/nodes/visible=0
blender/nodes/punctual_lights=true
blender/nodes/cameras=true
blender/nodes/custom_properties=true
blender/nodes/modifiers=1
blender/meshes/colors=false
blender/meshes/uvs=true
blender/meshes/normals=true
blender/meshes/tangents=true
blender/meshes/skins=2
blender/meshes/export_bones_deforming_mesh_only=false
blender/materials/unpack_enabled=true
blender/materials/export_materials=1
blender/animation/limit_playback=true
blender/animation/always_sample=true
blender/animation/group_tracks=true