Integrate painted Meshy succubus, fix arm skinning and add grounded idle
This commit is contained in:
@@ -0,0 +1,36 @@
|
||||
# Active Meshy succubus v02
|
||||
|
||||
Approved painted source: tools/model_sources/meshy_v01/painted_v02/succubus_painted.glb.
|
||||
Meshy parent generation multi-image-to-3d / 01a18440-82d5-70e3-bd4f-720763eae473;
|
||||
paint retexture / 01a18454-81f3-762f-b9b7-57b5e54af4a9. No new paid stages for integration.
|
||||
|
||||
Prepared locally with tools/build_meshy_succubus.py (Blender 5.0). Inputs include
|
||||
existing tools/model_sources/infernal_game.blend and the committed skin ownership mask.
|
||||
Run Blender with --background --python-exit-code 1 --python tools/build_meshy_succubus.py.
|
||||
The optimized mesh keeps original face-corner UVs and PBR maps, receives the existing
|
||||
166-bone rig, Idle/Walk/Whip tracks and the animated whip. Shoes and sculpture contacts
|
||||
are separated. Exposed arm ownership uses the approved skin mask, rather than proximity
|
||||
to a wing; arm geometry stays intact. Coincident shoulder seam weights are equalized
|
||||
and smoothed so the forearm strips and shoulder tears do not reappear on movement.
|
||||
Build checks finite animated coordinates, normalized weights and edge growth <0.12m.
|
||||
Measured results are in manifest.json.
|
||||
|
||||
Runtime: succubus_actor.gd uses this GLB for heroine and helpers. meshy_gait.gd extends
|
||||
the approved grounded gait: smooth 4.8s breathing, relaxed arm/head motion, existing
|
||||
wing/tail secondary motion; idle fades on walking/striking and freezes on pause.
|
||||
Foot anchors remain fixed. No lip-sync added.
|
||||
|
||||
QA: --test-gait PASS including idle movement, grounded idle feet and paused idle,
|
||||
heroine + three helpers, five speeds, turns, strikes, stopping, pause and teleport.
|
||||
Intro test PASS with the model and idle. Local in-game idle/walk/strike captures inspected.
|
||||
The final Windows EXE also passes --test-gait without SCRIPT ERROR/ERROR.
|
||||
|
||||
Windows build was made from a snapshot of 49cf962 plus this task's runtime changes,
|
||||
because equipment/main scripts were concurrently being edited in the working checkout.
|
||||
Those uncommitted equipment changes were not included or overwritten. Build output:
|
||||
Demon_v0.19_Windows/Demon.exe (local only). Full rebuild command after the working tree
|
||||
is ready: tools/build_v19.ps1 with the Godot 4.3 console executable path.
|
||||
|
||||
Generated staging sources, editable checkpoint, frames and logs stay under ignored
|
||||
Demon_v0.19/captures/meshy-integration. Original high-poly painted Meshy source stays
|
||||
in tools/model_sources/meshy_v01/painted_v02 for future texture/geometry edits.
|
||||
@@ -0,0 +1,50 @@
|
||||
{
|
||||
"source_triangles": 1351422,
|
||||
"game_vertices": 80237,
|
||||
"game_triangles": 100405,
|
||||
"bones": 166,
|
||||
"clips": [
|
||||
"Idle",
|
||||
"Walk",
|
||||
"Whip"
|
||||
],
|
||||
"max_nearest_source_distance": 0.27485957741737366,
|
||||
"textures": [
|
||||
[
|
||||
8192,
|
||||
8192
|
||||
],
|
||||
[
|
||||
4096,
|
||||
4096
|
||||
],
|
||||
[
|
||||
4096,
|
||||
4096
|
||||
],
|
||||
[
|
||||
4096,
|
||||
4096
|
||||
],
|
||||
[
|
||||
4096,
|
||||
4096
|
||||
],
|
||||
[
|
||||
4096,
|
||||
4096
|
||||
]
|
||||
],
|
||||
"source_task": "01a18454-81f3-762f-b9b7-57b5e54af4a9",
|
||||
"deformation_checks": {
|
||||
"Idle": {
|
||||
"max_edge_growth_m": 2.2243854526371454e-07
|
||||
},
|
||||
"Walk": {
|
||||
"max_edge_growth_m": 2.385202800929409e-07
|
||||
},
|
||||
"Whip": {
|
||||
"max_edge_growth_m": 0.05535165758474635
|
||||
}
|
||||
}
|
||||
}
|
||||
Binary file not shown.
@@ -0,0 +1,36 @@
|
||||
[remap]
|
||||
|
||||
importer="scene"
|
||||
importer_version=1
|
||||
type="PackedScene"
|
||||
uid="uid://b4jx0om4p8tqk"
|
||||
path="res://.godot/imported/succubus_game.glb-371cf14b682e8237a655f82acd3ceb7b.scn"
|
||||
|
||||
[deps]
|
||||
|
||||
source_file="res://art/succubus/meshy_v02/succubus_game.glb"
|
||||
dest_files=["res://.godot/imported/succubus_game.glb-371cf14b682e8237a655f82acd3ceb7b.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
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 21 MiB |
@@ -0,0 +1,37 @@
|
||||
[remap]
|
||||
|
||||
importer="texture"
|
||||
type="CompressedTexture2D"
|
||||
uid="uid://lgtbfpkpxokg"
|
||||
path="res://.godot/imported/succubus_game_Image_0.jpg-cec9ee0b6063a4ed57257d2acf1b244b.ctex"
|
||||
metadata={
|
||||
"vram_texture": false
|
||||
}
|
||||
generator_parameters={
|
||||
"md5": "3bda756cc39262596720cd6398cdb83c"
|
||||
}
|
||||
|
||||
[deps]
|
||||
|
||||
source_file="res://art/succubus/meshy_v02/succubus_game_Image_0.jpg"
|
||||
dest_files=["res://.godot/imported/succubus_game_Image_0.jpg-cec9ee0b6063a4ed57257d2acf1b244b.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
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 3.3 MiB |
@@ -0,0 +1,37 @@
|
||||
[remap]
|
||||
|
||||
importer="texture"
|
||||
type="CompressedTexture2D"
|
||||
uid="uid://df5dubp7tpa2d"
|
||||
path="res://.godot/imported/succubus_game_Image_1.jpg-c8a69432c00266d27fb55ac429807b82.ctex"
|
||||
metadata={
|
||||
"vram_texture": false
|
||||
}
|
||||
generator_parameters={
|
||||
"md5": "17b15cb310d64a13af5c439cb855c271"
|
||||
}
|
||||
|
||||
[deps]
|
||||
|
||||
source_file="res://art/succubus/meshy_v02/succubus_game_Image_1.jpg"
|
||||
dest_files=["res://.godot/imported/succubus_game_Image_1.jpg-c8a69432c00266d27fb55ac429807b82.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
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 4.7 MiB |
@@ -0,0 +1,37 @@
|
||||
[remap]
|
||||
|
||||
importer="texture"
|
||||
type="CompressedTexture2D"
|
||||
uid="uid://d15nujrupbplf"
|
||||
path="res://.godot/imported/succubus_game_Image_2.jpg-618758e2eaa20e2547d077b691b3c6ef.ctex"
|
||||
metadata={
|
||||
"vram_texture": false
|
||||
}
|
||||
generator_parameters={
|
||||
"md5": "d569dc1c1ba7ab16f41c0115ff63134e"
|
||||
}
|
||||
|
||||
[deps]
|
||||
|
||||
source_file="res://art/succubus/meshy_v02/succubus_game_Image_2.jpg"
|
||||
dest_files=["res://.godot/imported/succubus_game_Image_2.jpg-618758e2eaa20e2547d077b691b3c6ef.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
|
||||
@@ -10,6 +10,18 @@ func run(g):
|
||||
var actors=[g.avatar]
|
||||
for h in g.workshop.helpers:actors.append(h.model)
|
||||
for actor in actors:
|
||||
actor.reset_gait()
|
||||
for frame in range(10):actor._process(1.0/60)
|
||||
var hand_start=actor.gait.point("wrist.L")
|
||||
var feet_start=[actor.gait.point("foot.L"),actor.gait.point("foot.R")]
|
||||
var idle_motion=0.0
|
||||
for frame in range(240):
|
||||
actor._process(1.0/60)
|
||||
idle_motion=maxf(idle_motion,actor.gait.point("wrist.L").distance_to(hand_start))
|
||||
check(idle_motion>.004,"idle breathing and relaxed arm motion")
|
||||
for i in range(2):check(actor.gait.point("foot."+actor.gait.feet[i].side).distance_to(feet_start[i])<.003,"idle feet stay grounded")
|
||||
var idle_time=actor.gait.idle_time
|
||||
g.paused=true;actor._process(.05);check(is_equal_approx(actor.gait.idle_time,idle_time),"pause freezes idle animation");g.paused=false
|
||||
for speed in [1.0,2.5,3.3,4.375,5.775]:
|
||||
actor.get_parent().position=Vector3.ZERO;actor.rotation=Vector3.ZERO;actor.striking=false;actor.refresh();actor.animator.advance(0);actor.reset_gait()
|
||||
var max_slide=0.0;var max_error=0.0;var max_lift=0.0;var min_contact=10.0;var planted_frames=0
|
||||
|
||||
@@ -0,0 +1,20 @@
|
||||
extends "res://infernal_gait.gd"
|
||||
# Grounded idle breathing layered after the approved locomotion.
|
||||
var idle_time=0.0
|
||||
var idle_weight=0.0
|
||||
|
||||
func update(dt):
|
||||
super.update(dt)
|
||||
idle_time+=dt
|
||||
var target=(1.0-walk_weight) if not actor.striking else 0.0
|
||||
idle_weight=move_toward(idle_weight,target,dt*3.0)
|
||||
var breath=sin(idle_time*TAU/4.8)
|
||||
var drift=sin(idle_time*TAU/7.2)
|
||||
rotate_world("spine02",actor.global_basis.x,breath*.010*idle_weight)
|
||||
rotate_world("spine01",actor.global_basis.z,drift*.006*idle_weight)
|
||||
rotate_world("head",actor.global_basis.x,-breath*.006*idle_weight)
|
||||
rotate_world("head",actor.global_basis.y,drift*.012*idle_weight)
|
||||
for side in ["L","R"]:
|
||||
var sign_x=1.0 if side=="L" else -1.0
|
||||
rotate_world("upperarm01."+side,actor.global_basis.z,-sign_x*(.075+breath*.007)*idle_weight)
|
||||
rotate_world("lowerarm01."+side,actor.global_basis.x,sin(idle_time*TAU/6.4+sign_x*.4)*.010*idle_weight)
|
||||
@@ -5,16 +5,16 @@ var cinematic_idle=false
|
||||
var walking=false
|
||||
var striking=false
|
||||
var clips={}
|
||||
var gait=preload("res://infernal_gait.gd").new()
|
||||
var gait=preload("res://meshy_gait.gd").new()
|
||||
var animation_pose: Array[Transform3D]=[]
|
||||
var skeleton: Skeleton3D
|
||||
|
||||
|
||||
func _init(review_model: PackedScene=null):
|
||||
name="ApprovedSuccubus"
|
||||
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()
|
||||
set_meta("approved_model","meshy_v02")
|
||||
set_meta("wardrobe_revision","meshy_reference_painted_v02")
|
||||
var model=(review_model if review_model else preload("res://art/succubus/meshy_v02/succubus_game.glb")).instantiate()
|
||||
add_child(model)
|
||||
model.scale=Vector3.ONE*1.20
|
||||
for node in model.find_children("*","AnimationPlayer",true,false):
|
||||
|
||||
Reference in New Issue
Block a user