From 7d45ad3842bd9b078dec55da2bdef40ef4a05df3 Mon Sep 17 00:00:00 2001 From: teatov Date: Tue, 22 Jul 2025 02:40:21 +1000 Subject: [PATCH] reorganize models --- assets/models/characters/{ => batrix}/batrix.glb | 0 .../characters/{ => batrix}/batrix.glb.import | 6 +++--- .../characters/batrix/textures}/batrix_albedo.png | 0 .../batrix/textures}/batrix_albedo.png.import | 8 ++++---- .../batrix/textures}/batrix_bat_albedo.png | 0 .../batrix/textures}/batrix_bat_albedo.png.import | 8 ++++---- resources/materials/characters/batrix_bat_mat.tres | 2 +- resources/materials/characters/batrix_mat.tres | 2 +- scenes/player.tscn | 13 ++++++++++++- 9 files changed, 25 insertions(+), 14 deletions(-) rename assets/models/characters/{ => batrix}/batrix.glb (100%) rename assets/models/characters/{ => batrix}/batrix.glb.import (99%) rename assets/{textures/characters => models/characters/batrix/textures}/batrix_albedo.png (100%) rename assets/{textures/characters => models/characters/batrix/textures}/batrix_albedo.png.import (57%) rename assets/{textures/characters => models/characters/batrix/textures}/batrix_bat_albedo.png (100%) rename assets/{textures/characters => models/characters/batrix/textures}/batrix_bat_albedo.png.import (56%) diff --git a/assets/models/characters/batrix.glb b/assets/models/characters/batrix/batrix.glb similarity index 100% rename from assets/models/characters/batrix.glb rename to assets/models/characters/batrix/batrix.glb diff --git a/assets/models/characters/batrix.glb.import b/assets/models/characters/batrix/batrix.glb.import similarity index 99% rename from assets/models/characters/batrix.glb.import rename to assets/models/characters/batrix/batrix.glb.import index a88e1c7..9e082af 100644 --- a/assets/models/characters/batrix.glb.import +++ b/assets/models/characters/batrix/batrix.glb.import @@ -4,12 +4,12 @@ importer="scene" importer_version=1 type="PackedScene" uid="uid://b4q85h3ndkh5u" -path="res://.godot/imported/batrix.glb-2a26ce30df79829d9ecd076dc9b45214.scn" +path="res://.godot/imported/batrix.glb-c602050c05ed4c1987d92233c21a6bb5.scn" [deps] -source_file="res://assets/models/characters/batrix.glb" -dest_files=["res://.godot/imported/batrix.glb-2a26ce30df79829d9ecd076dc9b45214.scn"] +source_file="res://assets/models/characters/batrix/batrix.glb" +dest_files=["res://.godot/imported/batrix.glb-c602050c05ed4c1987d92233c21a6bb5.scn"] [params] diff --git a/assets/textures/characters/batrix_albedo.png b/assets/models/characters/batrix/textures/batrix_albedo.png similarity index 100% rename from assets/textures/characters/batrix_albedo.png rename to assets/models/characters/batrix/textures/batrix_albedo.png diff --git a/assets/textures/characters/batrix_albedo.png.import b/assets/models/characters/batrix/textures/batrix_albedo.png.import similarity index 57% rename from assets/textures/characters/batrix_albedo.png.import rename to assets/models/characters/batrix/textures/batrix_albedo.png.import index bc1998d..7a422ab 100644 --- a/assets/textures/characters/batrix_albedo.png.import +++ b/assets/models/characters/batrix/textures/batrix_albedo.png.import @@ -3,8 +3,8 @@ importer="texture" type="CompressedTexture2D" uid="uid://cv5cnlgxx3rud" -path.s3tc="res://.godot/imported/batrix_albedo.png-743731fb2d7110c5f98136267bea0d4e.s3tc.ctex" -path.etc2="res://.godot/imported/batrix_albedo.png-743731fb2d7110c5f98136267bea0d4e.etc2.ctex" +path.s3tc="res://.godot/imported/batrix_albedo.png-ce3e7dbafb8955802ab790eda82f6593.s3tc.ctex" +path.etc2="res://.godot/imported/batrix_albedo.png-ce3e7dbafb8955802ab790eda82f6593.etc2.ctex" metadata={ "imported_formats": ["s3tc_bptc", "etc2_astc"], "vram_texture": true @@ -12,8 +12,8 @@ metadata={ [deps] -source_file="res://assets/textures/characters/batrix_albedo.png" -dest_files=["res://.godot/imported/batrix_albedo.png-743731fb2d7110c5f98136267bea0d4e.s3tc.ctex", "res://.godot/imported/batrix_albedo.png-743731fb2d7110c5f98136267bea0d4e.etc2.ctex"] +source_file="res://assets/models/characters/batrix/textures/batrix_albedo.png" +dest_files=["res://.godot/imported/batrix_albedo.png-ce3e7dbafb8955802ab790eda82f6593.s3tc.ctex", "res://.godot/imported/batrix_albedo.png-ce3e7dbafb8955802ab790eda82f6593.etc2.ctex"] [params] diff --git a/assets/textures/characters/batrix_bat_albedo.png b/assets/models/characters/batrix/textures/batrix_bat_albedo.png similarity index 100% rename from assets/textures/characters/batrix_bat_albedo.png rename to assets/models/characters/batrix/textures/batrix_bat_albedo.png diff --git a/assets/textures/characters/batrix_bat_albedo.png.import b/assets/models/characters/batrix/textures/batrix_bat_albedo.png.import similarity index 56% rename from assets/textures/characters/batrix_bat_albedo.png.import rename to assets/models/characters/batrix/textures/batrix_bat_albedo.png.import index 5046547..6c47bc8 100644 --- a/assets/textures/characters/batrix_bat_albedo.png.import +++ b/assets/models/characters/batrix/textures/batrix_bat_albedo.png.import @@ -3,8 +3,8 @@ importer="texture" type="CompressedTexture2D" uid="uid://fj76wlr61buq" -path.s3tc="res://.godot/imported/batrix_bat_albedo.png-f9ef1bba8255c631276ec0816e8c41a9.s3tc.ctex" -path.etc2="res://.godot/imported/batrix_bat_albedo.png-f9ef1bba8255c631276ec0816e8c41a9.etc2.ctex" +path.s3tc="res://.godot/imported/batrix_bat_albedo.png-9e75e5e0e9b083fe803a347c29ad3060.s3tc.ctex" +path.etc2="res://.godot/imported/batrix_bat_albedo.png-9e75e5e0e9b083fe803a347c29ad3060.etc2.ctex" metadata={ "imported_formats": ["s3tc_bptc", "etc2_astc"], "vram_texture": true @@ -12,8 +12,8 @@ metadata={ [deps] -source_file="res://assets/textures/characters/batrix_bat_albedo.png" -dest_files=["res://.godot/imported/batrix_bat_albedo.png-f9ef1bba8255c631276ec0816e8c41a9.s3tc.ctex", "res://.godot/imported/batrix_bat_albedo.png-f9ef1bba8255c631276ec0816e8c41a9.etc2.ctex"] +source_file="res://assets/models/characters/batrix/textures/batrix_bat_albedo.png" +dest_files=["res://.godot/imported/batrix_bat_albedo.png-9e75e5e0e9b083fe803a347c29ad3060.s3tc.ctex", "res://.godot/imported/batrix_bat_albedo.png-9e75e5e0e9b083fe803a347c29ad3060.etc2.ctex"] [params] diff --git a/resources/materials/characters/batrix_bat_mat.tres b/resources/materials/characters/batrix_bat_mat.tres index 43201dd..b03c6b3 100644 --- a/resources/materials/characters/batrix_bat_mat.tres +++ b/resources/materials/characters/batrix_bat_mat.tres @@ -1,6 +1,6 @@ [gd_resource type="ShaderMaterial" load_steps=3 format=3 uid="uid://b685alw05nef"] -[ext_resource type="Texture2D" uid="uid://fj76wlr61buq" path="res://assets/textures/characters/batrix_bat_albedo.png" id="1_p4uo6"] +[ext_resource type="Texture2D" uid="uid://fj76wlr61buq" path="res://assets/models/characters/batrix/textures/batrix_bat_albedo.png" id="1_p4uo6"] [ext_resource type="Shader" uid="uid://dq4ha5ax33l2" path="res://shaders/cel_shader/cel_shader_base.gdshader" id="1_vv82l"] [resource] diff --git a/resources/materials/characters/batrix_mat.tres b/resources/materials/characters/batrix_mat.tres index 81ecd5d..7ab196f 100644 --- a/resources/materials/characters/batrix_mat.tres +++ b/resources/materials/characters/batrix_mat.tres @@ -1,7 +1,7 @@ [gd_resource type="ShaderMaterial" load_steps=3 format=3 uid="uid://ouhs42rmw6h6"] [ext_resource type="Shader" uid="uid://d06tpkplvte12" path="res://shaders/cel_shader/cel_shader_no_culling.gdshader" id="1_3ide7"] -[ext_resource type="Texture2D" uid="uid://cv5cnlgxx3rud" path="res://assets/textures/characters/batrix_albedo.png" id="1_8x1pe"] +[ext_resource type="Texture2D" uid="uid://cv5cnlgxx3rud" path="res://assets/models/characters/batrix/textures/batrix_albedo.png" id="1_8x1pe"] [resource] render_priority = 0 diff --git a/scenes/player.tscn b/scenes/player.tscn index cc3269c..51abb11 100644 --- a/scenes/player.tscn +++ b/scenes/player.tscn @@ -3,7 +3,7 @@ [ext_resource type="Script" uid="uid://bvvmaqn1fp6nq" path="res://scripts/player/player.gd" id="1_xt3i8"] [ext_resource type="Material" uid="uid://cc18ee0wbfoud" path="res://resources/materials/debug/debug_player.tres" id="2_0p422"] [ext_resource type="Script" uid="uid://dmu2tkt0wo7d1" path="res://scripts/player/player_attack.gd" id="3_8pbtx"] -[ext_resource type="PackedScene" uid="uid://b4q85h3ndkh5u" path="res://assets/models/characters/batrix.glb" id="3_ld2i8"] +[ext_resource type="PackedScene" uid="uid://b4q85h3ndkh5u" path="res://assets/models/characters/batrix/batrix.glb" id="3_ld2i8"] [ext_resource type="Script" uid="uid://dqxvdi3i2ejs" path="res://scripts/player/player_animator.gd" id="4_adlgp"] [ext_resource type="Script" uid="uid://c8ocu8tvf2l6k" path="res://scripts/effects/discrete_animation_player.gd" id="4_i3gf3"] [ext_resource type="Material" uid="uid://bdi02rpvdukem" path="res://resources/materials/debug/debug_attack.tres" id="4_ll2ct"] @@ -96,6 +96,7 @@ _collision_debug_material = ExtResource("2_0p422") [node name="Skeleton3D" parent="Model/Armature" index="0"] bones/7/scale = Vector3(1, 1, 1) +bones/9/scale = Vector3(1, 1, 1) bones/21/scale = Vector3(1, 1, 1) bones/25/scale = Vector3(1, 1, 1) bones/29/scale = Vector3(1, 1, 1) @@ -104,9 +105,12 @@ bones/35/scale = Vector3(1, 1, 1) bones/36/scale = Vector3(1, 1, 1) bones/37/scale = Vector3(1, 1, 1) bones/48/rotation = Quaternion(-0.19747, 0.678974, 0.678974, 0.19747) +bones/58/scale = Vector3(1, 1, 1) bones/59/scale = Vector3(1, 1, 1) +bones/61/scale = Vector3(1, 1, 1) bones/67/rotation = Quaternion(-0.0266082, 0.706555, -0.0266833, 0.706654) bones/67/scale = Vector3(1, 1, 1) +bones/68/scale = Vector3(1, 1, 1) bones/69/scale = Vector3(1, 1, 1) bones/75/scale = Vector3(1, 1, 1) bones/76/scale = Vector3(1, 1, 1) @@ -115,9 +119,16 @@ bones/88/rotation = Quaternion(0.0569009, 0.704803, 0.0568902, 0.704825) bones/88/scale = Vector3(1, 1, 1) bones/100/scale = Vector3(1, 1, 1) bones/101/scale = Vector3(1, 1, 1) +bones/102/scale = Vector3(1, 1, 1) +bones/104/scale = Vector3(1, 1, 1) bones/110/rotation = Quaternion(-0.0266082, -0.706555, 0.0266833, 0.706654) bones/110/scale = Vector3(1, 1, 1) +bones/111/scale = Vector3(1, 1, 1) +bones/112/scale = Vector3(1, 1, 1) +bones/118/scale = Vector3(1, 1, 1) +bones/119/scale = Vector3(1, 1, 1) bones/124/rotation = Quaternion(0.0361992, -0.706123, -0.0361283, 0.70624) +bones/125/scale = Vector3(1, 1, 1) bones/131/rotation = Quaternion(0.0569009, -0.704803, -0.0568902, 0.704825) bones/131/scale = Vector3(1, 1, 1) bones/143/rotation = Quaternion(0.0323581, -3.23524e-09, 4.47963e-09, 0.999476)