diff --git a/Demon_v0.19/art/succubus/infernal_v01/infernal_game.glb b/Demon_v0.19/art/succubus/infernal_v01/infernal_game.glb new file mode 100644 index 0000000..a79a12f --- /dev/null +++ b/Demon_v0.19/art/succubus/infernal_v01/infernal_game.glb @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c677685dac4a327e00fe69e657745fcfe7899007b7d933db38df9c6464ac7c90 +size 19143820 diff --git a/Demon_v0.19/art/succubus/infernal_v01/infernal_game.glb.import b/Demon_v0.19/art/succubus/infernal_v01/infernal_game.glb.import new file mode 100644 index 0000000..175e4a6 --- /dev/null +++ b/Demon_v0.19/art/succubus/infernal_v01/infernal_game.glb.import @@ -0,0 +1,36 @@ +[remap] + +importer="scene" +importer_version=1 +type="PackedScene" +uid="uid://bp2h37q5xsbmh" +path="res://.godot/imported/infernal_game.glb-784a16c52d1a54cac75b033abdf77181.scn" + +[deps] + +source_file="res://art/succubus/infernal_v01/infernal_game.glb" +dest_files=["res://.godot/imported/infernal_game.glb-784a16c52d1a54cac75b033abdf77181.scn"] + +[params] + +nodes/root_type="" +nodes/root_name="" +nodes/apply_root_scale=true +nodes/root_scale=1.0 +nodes/import_as_skeleton_bones=false +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="" +_subresources={} +gltf/naming_version=1 +gltf/embedded_image_handling=1 diff --git a/Demon_v0.19/art/succubus/infernal_v01/infernal_game_infernal_basecolor.png b/Demon_v0.19/art/succubus/infernal_v01/infernal_game_infernal_basecolor.png new file mode 100644 index 0000000..4d2bc2d Binary files /dev/null and b/Demon_v0.19/art/succubus/infernal_v01/infernal_game_infernal_basecolor.png differ diff --git a/Demon_v0.19/art/succubus/infernal_v01/infernal_game_infernal_basecolor.png.import b/Demon_v0.19/art/succubus/infernal_v01/infernal_game_infernal_basecolor.png.import new file mode 100644 index 0000000..89057a7 --- /dev/null +++ b/Demon_v0.19/art/succubus/infernal_v01/infernal_game_infernal_basecolor.png.import @@ -0,0 +1,37 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://3ewf2ue5ec7x" +path="res://.godot/imported/infernal_game_infernal_basecolor.png-176bfc5cb66a1a16f6a9562cbd0a57c2.ctex" +metadata={ +"vram_texture": false +} +generator_parameters={ +"md5": "ec06996f35d03b5dff4ef74214143a93" +} + +[deps] + +source_file="res://art/succubus/infernal_v01/infernal_game_infernal_basecolor.png" +dest_files=["res://.godot/imported/infernal_game_infernal_basecolor.png-176bfc5cb66a1a16f6a9562cbd0a57c2.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=true +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/Demon_v0.19/art/succubus/infernal_v01/infernal_game_infernal_normal.png b/Demon_v0.19/art/succubus/infernal_v01/infernal_game_infernal_normal.png new file mode 100644 index 0000000..286c7d6 Binary files /dev/null and b/Demon_v0.19/art/succubus/infernal_v01/infernal_game_infernal_normal.png differ diff --git a/Demon_v0.19/art/succubus/infernal_v01/infernal_game_infernal_normal.png.import b/Demon_v0.19/art/succubus/infernal_v01/infernal_game_infernal_normal.png.import new file mode 100644 index 0000000..1b28178 --- /dev/null +++ b/Demon_v0.19/art/succubus/infernal_v01/infernal_game_infernal_normal.png.import @@ -0,0 +1,37 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://dwy7syq0fx6th" +path="res://.godot/imported/infernal_game_infernal_normal.png-2ffc28f6cf680dfae1d9df37d99308df.ctex" +metadata={ +"vram_texture": false +} +generator_parameters={ +"md5": "1fd5b6ab6d56b8a97cd3149923cfd9b1" +} + +[deps] + +source_file="res://art/succubus/infernal_v01/infernal_game_infernal_normal.png" +dest_files=["res://.godot/imported/infernal_game_infernal_normal.png-2ffc28f6cf680dfae1d9df37d99308df.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=true +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/Demon_v0.19/art/succubus/infernal_v01/infernal_game_infernal_orm.png b/Demon_v0.19/art/succubus/infernal_v01/infernal_game_infernal_orm.png new file mode 100644 index 0000000..d3ef95a Binary files /dev/null and b/Demon_v0.19/art/succubus/infernal_v01/infernal_game_infernal_orm.png differ diff --git a/Demon_v0.19/art/succubus/infernal_v01/infernal_game_infernal_orm.png.import b/Demon_v0.19/art/succubus/infernal_v01/infernal_game_infernal_orm.png.import new file mode 100644 index 0000000..6e14d4c --- /dev/null +++ b/Demon_v0.19/art/succubus/infernal_v01/infernal_game_infernal_orm.png.import @@ -0,0 +1,37 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://vn6snu2s5d24" +path="res://.godot/imported/infernal_game_infernal_orm.png-5a89109bbf41773a273250e3f34517c8.ctex" +metadata={ +"vram_texture": false +} +generator_parameters={ +"md5": "e403e04738838a82a634d99ad78bcb53" +} + +[deps] + +source_file="res://art/succubus/infernal_v01/infernal_game_infernal_orm.png" +dest_files=["res://.godot/imported/infernal_game_infernal_orm.png-5a89109bbf41773a273250e3f34517c8.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=true +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/Demon_v0.19/infernal_gait.gd b/Demon_v0.19/infernal_gait.gd new file mode 100644 index 0000000..0818447 --- /dev/null +++ b/Demon_v0.19/infernal_gait.gd @@ -0,0 +1,35 @@ +extends "res://catwalk.gd" +# Approved Infernal locomotion: grounded heels and gentle secondary motion. +var secondary_time=0.0 + +func _init(): + stride_min=.95;stride_max=1.15;track_width=.09;swing_height=.11 + +func ground_height(f): + return actor.get_parent().global_position.y+f.rest.y*actor.global_basis.get_scale().y+.004 + +func update(dt): + super.update(dt) + secondary_time+=dt + for side in ["L","R"]: + var sign_x=1.0 if side=="L" else -1.0 + rotate_world("Wing."+side,actor.global_basis.y,sign_x*sin(phase*TAU-.7)*.035*walk_weight) + rotate_world("Wing."+side,actor.global_basis.z,sign_x*sin(phase*TAU*2-.5)*.022*walk_weight) + rotate_world("Wing."+side,actor.global_basis.y,sign_x*sin(secondary_time*.8)*.010) + var tail_angle=sin(secondary_time*.95)*.012+sin(phase*TAU-.9)*.024*walk_weight + rotate_world("Tail",actor.global_basis.y,tail_angle) + rotate_world("Tail",actor.global_basis.x,sin(secondary_time*.7)*.006) + +func foot_orientation(f,dt): + var body_yaw=actor.global_rotation.y + # The planted shoe may pivot, but the ankle must never remain twisted behind + # a turning shin. Keep its heading within an anatomical range of the pelvis. + var difference=wrapf(f.yaw-body_yaw,-PI,PI) + if absf(difference)>deg_to_rad(22):f.yaw=body_yaw+clampf(difference,-deg_to_rad(22),deg_to_rad(22)) + var yaw=f.yaw if f.grounded else lerp_angle(f.yaw,body_yaw,minf(1,dt*18)) + if not f.grounded:f.yaw=yaw + var orientation=Quaternion(Vector3.UP,yaw)*f.rotation + # A high heel has a rigid arch. Lift the whole shoe with the leg rather than + # sharply flexing its toe or rolling it onto the outer edge during swing. + var roll=sin(clampf((f.last_phase-.5)*2,0,1)*PI)*-.045 if not f.grounded else 0.0 + return Quaternion(actor.global_basis.x.normalized(),roll)*orientation diff --git a/Demon_v0.19/reviews/infernal_v01/README.md b/Demon_v0.19/reviews/infernal_v01/README.md index aebe1b3..fd0deaf 100644 --- a/Demon_v0.19/reviews/infernal_v01/README.md +++ b/Demon_v0.19/reviews/infernal_v01/README.md @@ -5,8 +5,9 @@ красная кожа, чёрные волосы, корсет, сапоги, рога, крылья и хвост. STL не содержал цветов, UV или скелета: материалы и UV подготовлены заново. -Модель пока **не подключена** к главной героине и помощницам. Игровой -`art/succubus/succubus_v02.glb` сохранён; сначала согласовывается этот образец. +Модель **согласована и подключена** к героине и помощницам. Игровая копия: +`art/succubus/infernal_v01/infernal_game.glb`, походка — `infernal_gait.gd`. +Игровая копия GLB идентична этому образцу. Старый succubus_v02 сохранён. ## Содержимое @@ -58,7 +59,9 @@ Blender: `validate_infernal.py` PASS — три клипа, нормализов 0,00234 м, Walk 0,03596 м, Whip 0,06717 м. Результаты — в validation.json. GIF сняты с настоящей 3D-модели в Godot, 24 fps. Это образец для визуального -согласования покраски, пропорций и движений, а не смена модели в игровой сцене. +согласования покраски, пропорций и движений. После согласования включена +идентичная игровая копия. Генератор по-прежнему пишет новый кандидат в reviews; +при дальнейшей переработке игровую копию обновлять после проверки. ## Воспроизведение diff --git a/Demon_v0.19/reviews/infernal_v01/infernal_gait.gd b/Demon_v0.19/reviews/infernal_v01/infernal_gait.gd index e3eaca2..a192a1e 100644 --- a/Demon_v0.19/reviews/infernal_v01/infernal_gait.gd +++ b/Demon_v0.19/reviews/infernal_v01/infernal_gait.gd @@ -1,17 +1,2 @@ -extends "res://reviews/heels_v01/review_gait.gd" - -var secondary_time=0.0 -func _init(): - stride_min=.95;stride_max=1.15;track_width=.09;swing_height=.11 -func ground_height(f):return actor.get_parent().global_position.y+f.rest.y*actor.global_basis.get_scale().y+.004 - -func update(dt): - super.update(dt) - secondary_time+=dt - # Small delayed motion at rest and after each step, rooted at the back. - var tail_angle=sin(secondary_time*.95)*.012+sin(phase*TAU-.9)*.024*walk_weight - rotate_world("Tail",actor.global_basis.y,tail_angle) - rotate_world("Tail",actor.global_basis.x,sin(secondary_time*.7)*.006) - for side in ["L","R"]: - var sign_x=1.0 if side=="L" else -1.0 - rotate_world("Wing."+side,actor.global_basis.y,sign_x*sin(secondary_time*.8)*.010) +extends "res://infernal_gait.gd" +# The approval studio uses the same gait as the live heroine and helpers. diff --git a/Demon_v0.19/reviews/infernal_v01/manifest.json b/Demon_v0.19/reviews/infernal_v01/manifest.json index 4ba0827..bd02c6a 100644 --- a/Demon_v0.19/reviews/infernal_v01/manifest.json +++ b/Demon_v0.19/reviews/infernal_v01/manifest.json @@ -16,5 +16,7 @@ "facial_paint": "aligned to sculpt: eyes z1.889, lips z1.817", "paint_boundary_reference": "tools/model_sources/approved_paint_boundary.png", "whip_radius_added_m": 0.008, - "approval_status": "awaiting_visual_approval" + "approval_status": "approved_and_enabled", + "runtime_model": "res://art/succubus/infernal_v01/infernal_game.glb", + "runtime_gait": "res://infernal_gait.gd" } \ No newline at end of file diff --git a/Demon_v0.19/succubus_actor.gd b/Demon_v0.19/succubus_actor.gd index 0a56202..1c86e54 100644 --- a/Demon_v0.19/succubus_actor.gd +++ b/Demon_v0.19/succubus_actor.gd @@ -5,16 +5,16 @@ var cinematic_idle=false var walking=false var striking=false var clips={} -var gait=preload("res://catwalk.gd").new() +var gait=preload("res://infernal_gait.gd").new() var animation_pose: Array[Transform3D]=[] var skeleton: Skeleton3D func _init(review_model: PackedScene=null): name="ApprovedSuccubus" - set_meta("approved_model","succubus_v01") - set_meta("wardrobe_revision","corset_thigh_boots_v02") - var model=(review_model if review_model else preload("res://art/succubus/succubus_v02.glb")).instantiate() + set_meta("approved_model","infernal_v01") + set_meta("wardrobe_revision","infernal_sculpt_painted_v01") + var model=(review_model if review_model else preload("res://art/succubus/infernal_v01/infernal_game.glb")).instantiate() add_child(model) model.scale=Vector3.ONE*1.20 for node in model.find_children("*","AnimationPlayer",true,false): diff --git a/Demon_v0.19/tests.gd b/Demon_v0.19/tests.gd index ebe9e6a..24a0bfd 100644 --- a/Demon_v0.19/tests.gd +++ b/Demon_v0.19/tests.gd @@ -28,7 +28,7 @@ func prepare_work(g): func run(g): check(g.paused and not g.game_started and not g.hud.visible) check(g.menu.current_page=="main" and g.souls.is_empty()) - check(g.avatar.get_meta("approved_model")=="succubus_v01") + check(g.avatar.get_meta("approved_model")=="infernal_v01") check(g.avatar.clips.size()==3) var skeleton=g.avatar.find_children("*","Skeleton3D",true,false)[0] check(skeleton.get_bone_count()==166) diff --git a/HANDOFF.md b/HANDOFF.md index 35413ba..0d0a854 100644 --- a/HANDOFF.md +++ b/HANDOFF.md @@ -35,13 +35,17 @@ `Missing code in response; could not read Username`. Локальный коммит сохранён, вступление ещё не опубликовано в origin. -- **STL INFERNAL: образец готов, согласование внешнего вида ожидается.** +- **STL INFERNAL: согласован пользователем и включён в игру.** Коммит образца сохранён локально. Push этой задачи также заблокирован авторизацией GCM/OAuth: `Missing code in response; could not read Username`. В origin новые изменения ещё не опубликованы. `reviews/infernal_v01/` содержит GLB, три карты 4K, GIF ходьбы/оборота/удара/лица, - manifest, validation и отдельную сцену просмотра. В рабочую игру НЕ включён: - по умолчанию по-прежнему `art/succubus/succubus_v02.glb`. + manifest, validation и отдельную сцену просмотра. По просьбе «добавляй и запусти» + игровая копия включена в art/succubus/infernal_v01/infernal_game.glb; SHA256 + совпадает с согласованным образцом. succubus_actor.gd использует её по умолчанию + для героини и помощниц, с модельной меткой infernal_v01. + infernal_gait.gd содержит согласованную походку, стопы, крылья и хвост; + игровой код не зависит от сцен просмотра. Старые модели сохранены. - Сохранены пользовательские исходники `tools/model_sources/infernal.stl` (1 569 740 треугольников; байты сверены с infernal.zip), color_reference.png, SOURCES.json, редактируемый infernal_game.blend. Новая игровая сетка: @@ -67,6 +71,10 @@ три карты 4096²; max edge growth Idle .00234 / Walk .03596 / Whip .06717 м. GIF сняты заново с окончательного GLB в Godot; дальнейшая правка должна повторять запись, а не использовать кадры от прежних вариантов. +- Проверки включения в игровую сцену: импорт Godot 4.3 PASS, `--test-gait` + PASS (героиня + три помощницы, пять скоростей, повороты, остановка, удары, + пауза, телепорт). `--test-intro` PASS с новой героиней и полной записью. + Кадр облёта просмотрен. Запускается актуальный проект, EXE не пересобирался. - Сборка: tools/build_infernal.py -- --bake, модули infernal_skinning/surface/ facepaint/bake/whip/seams.py. Локально finish_infernal.py повторяет покраску из checkpoint в captures. encode_infernal_review.py кодирует GIF. Полные команды