Synchronize elbow flexion and extension with human walking arm swing
This commit is contained in:
@@ -32,6 +32,7 @@ func run(g):
|
|||||||
var max_slide=0.0;var max_error=0.0;var max_lift=0.0;var min_contact=10.0;var planted_frames=0
|
var max_slide=0.0;var max_error=0.0;var max_lift=0.0;var min_contact=10.0;var planted_frames=0
|
||||||
var hand_min=Vector2(INF,INF);var hand_max=Vector2(-INF,-INF);var cross_sum=0.0
|
var hand_min=Vector2(INF,INF);var hand_max=Vector2(-INF,-INF);var cross_sum=0.0
|
||||||
var hand_sum=Vector2.ZERO;var samples=0;var elbow_min=INF;var elbow_max=0.0
|
var hand_sum=Vector2.ZERO;var samples=0;var elbow_min=INF;var elbow_max=0.0
|
||||||
|
var forward_angles=0.0;var back_angles=0.0;var forward_samples=0;var back_samples=0
|
||||||
for frame in range(240):
|
for frame in range(240):
|
||||||
var before=[]
|
var before=[]
|
||||||
for f in actor.gait.feet:before.append({"grounded":f.grounded,"anchor":f.anchor,"position":actor.gait.point("foot."+f.side)})
|
for f in actor.gait.feet:before.append({"grounded":f.grounded,"anchor":f.anchor,"position":actor.gait.point("foot."+f.side)})
|
||||||
@@ -48,6 +49,9 @@ func run(g):
|
|||||||
var upper=actor.gait.point("lowerarm01."+side)-actor.gait.point("upperarm01."+side)
|
var upper=actor.gait.point("lowerarm01."+side)-actor.gait.point("upperarm01."+side)
|
||||||
var forearm=actor.gait.point("wrist."+side)-actor.gait.point("lowerarm01."+side)
|
var forearm=actor.gait.point("wrist."+side)-actor.gait.point("lowerarm01."+side)
|
||||||
var angle=upper.angle_to(forearm);elbow_min=minf(elbow_min,angle);elbow_max=maxf(elbow_max,angle)
|
var angle=upper.angle_to(forearm);elbow_min=minf(elbow_min,angle);elbow_max=maxf(elbow_max,angle)
|
||||||
|
var swing_direction=upper.normalized().dot(actor.global_basis.z.normalized())
|
||||||
|
if swing_direction>.12:forward_angles+=angle;forward_samples+=1
|
||||||
|
if swing_direction<-.12:back_angles+=angle;back_samples+=1
|
||||||
cross_sum+=hand_offsets.x*hand_offsets.y;hand_sum+=hand_offsets;samples+=1
|
cross_sum+=hand_offsets.x*hand_offsets.y;hand_sum+=hand_offsets;samples+=1
|
||||||
for i in range(2):
|
for i in range(2):
|
||||||
var f=actor.gait.feet[i];var actual=actor.gait.point("foot."+f.side)
|
var f=actor.gait.feet[i];var actual=actor.gait.point("foot."+f.side)
|
||||||
@@ -62,7 +66,8 @@ func run(g):
|
|||||||
check(max_lift>.08 and planted_frames>150,"alternating lift/support")
|
check(max_lift>.08 and planted_frames>150,"alternating lift/support")
|
||||||
check(hand_max.x-hand_min.x>.12 and hand_max.y-hand_min.y>.12,"both hands swing during locomotion")
|
check(hand_max.x-hand_min.x>.12 and hand_max.y-hand_min.y>.12,"both hands swing during locomotion")
|
||||||
check(cross_sum/samples-(hand_sum.x/samples)*(hand_sum.y/samples)<0,"opposing left/right arm swing")
|
check(cross_sum/samples-(hand_sum.x/samples)*(hand_sum.y/samples)<0,"opposing left/right arm swing")
|
||||||
check(elbow_min>deg_to_rad(38) and elbow_max<deg_to_rad(68),"pronounced but natural walking elbow flexion")
|
check(elbow_min<deg_to_rad(23) and elbow_max>deg_to_rad(50) and elbow_max<deg_to_rad(68),"elbows extend beside body and flex on forward swing")
|
||||||
|
check(forward_samples>0 and back_samples>0 and forward_angles/maxi(1,forward_samples)>back_angles/maxi(1,back_samples)+deg_to_rad(20),"elbow flexion follows actual forward/backward shoulder swing")
|
||||||
print("GAIT_METRICS ",JSON.stringify({"scale":actor.scale.x,"speed":speed,"max_slide":max_slide,"max_target_error":max_error,"max_lift":max_lift,"min_contact":min_contact}))
|
print("GAIT_METRICS ",JSON.stringify({"scale":actor.scale.x,"speed":speed,"max_slide":max_slide,"max_target_error":max_error,"max_lift":max_lift,"min_contact":min_contact}))
|
||||||
var phase=actor.gait.phase
|
var phase=actor.gait.phase
|
||||||
for frame in range(30):actor._process(1.0/60)
|
for frame in range(30):actor._process(1.0/60)
|
||||||
|
|||||||
@@ -49,9 +49,10 @@ func relax_arm(side,breath):
|
|||||||
aim_blended(upper,lower,a+upper_direction*length_upper)
|
aim_blended(upper,lower,a+upper_direction*length_upper)
|
||||||
var elbow=point(lower)
|
var elbow=point(lower)
|
||||||
var forearm_direction=(down-right*sign_x*.13+forward*(swing+tan(bend)+breath*.012*idle_weight)).normalized()
|
var forearm_direction=(down-right*sign_x*.13+forward*(swing+tan(bend)+breath*.012*idle_weight)).normalized()
|
||||||
# Rotate the forearm relative to its swinging upper arm so flexion does not
|
# Human arm swing: flex on the forward half of the step, then extend while
|
||||||
# collapse when that arm swings forward. The approved idle stays identical.
|
# returning through the relaxed side position and the small backswing.
|
||||||
var walking_bend=deg_to_rad(52.0+8.0*sin(phase*TAU*sign_x-.3))
|
var forward_reach=smoothstep(0.0,1.0,maxf(0.0,sin(phase*TAU)*sign_x))
|
||||||
|
var walking_bend=lerpf(bend,deg_to_rad(60.0),forward_reach)
|
||||||
var walking_base=(down-right*sign_x*.13+forward*swing).normalized()
|
var walking_base=(down-right*sign_x*.13+forward*swing).normalized()
|
||||||
var walking_forearm=Quaternion(right,-walking_bend)*walking_base
|
var walking_forearm=Quaternion(right,-walking_bend)*walking_base
|
||||||
forearm_direction=forearm_direction.slerp(walking_forearm,walk_weight).normalized()
|
forearm_direction=forearm_direction.slerp(walking_forearm,walk_weight).normalized()
|
||||||
|
|||||||
@@ -0,0 +1 @@
|
|||||||
|
|
||||||
@@ -0,0 +1,10 @@
|
|||||||
|
# Human arm swing — iteration 3
|
||||||
|
|
||||||
|
Actual Godot side capture. Elbows flex from the relaxed 14-degree bend toward
|
||||||
|
60 degrees on the forward swing, then extend on the return and small backswing.
|
||||||
|
The hands alternate with the leg cycle. The accepted idle is unchanged.
|
||||||
|
|
||||||
|
`--test-gait` passes: heroine and three helpers, five speeds, actual elbow
|
||||||
|
extension below 23 degrees and flexion above 50, forward flexion at least 20
|
||||||
|
degrees greater than backswing, hand alternation, feet, stop/strike/pause/teleport.
|
||||||
|
No Windows export. Capture tool: `tools/capture_relaxed_arms.gd -- --run-only --side`.
|
||||||
Binary file not shown.
|
After Width: | Height: | Size: 1.6 MiB |
@@ -15,6 +15,15 @@
|
|||||||
|
|
||||||
## Последние выполненные задачи
|
## Последние выполненные задачи
|
||||||
|
|
||||||
|
- **Человеческий цикл рук, итерация 3 (2026-10-28):** локоть больше не остаётся
|
||||||
|
постоянно согнутым. На передней половине маха плавное сгибание от прежних
|
||||||
|
14° к 60°, при возврате к бедру и небольшом заднем махе — разгибание.
|
||||||
|
Фаза общая с шагом, руки и ноги в противофазе. Принятый айдл сохранён.
|
||||||
|
`--test-gait` PASS: героиня/3 помощницы, 5 скоростей, фактические углы
|
||||||
|
разгибания <23° и сгибания >50°, передний сгиб минимум на 20° больше
|
||||||
|
заднего, мах, стопы, остановка, удар, пауза и телепорт. Боковые кадры
|
||||||
|
просмотрены; `reviews/human_arm_swing_v03/walk.gif`. EXE не пересобирался.
|
||||||
|
|
||||||
- **Локти при ходьбе, итерация 2 (2026-10-28):** по отзыву пользователя
|
- **Локти при ходьбе, итерация 2 (2026-10-28):** по отзыву пользователя
|
||||||
усилен только сгиб локтей в движении. Принятый айдл сохранён. Предплечья
|
усилен только сгиб локтей в движении. Принятый айдл сохранён. Предплечья
|
||||||
вращаются относительно маха плеча: центр 52°, вариация ±8° по фазе шага.
|
вращаются относительно маха плеча: центр 52°, вариация ±8° по фазе шага.
|
||||||
|
|||||||
Reference in New Issue
Block a user