Reduce walking arm swing and elbow flexion amplitude by twenty percent
This commit is contained in:
@@ -66,7 +66,7 @@ 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(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(elbow_min<deg_to_rad(23) and elbow_max>deg_to_rad(43) and elbow_max<deg_to_rad(59),"reduced swing still extends beside body and flexes forward")
|
||||||
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")
|
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
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
extends "res://infernal_gait.gd"
|
extends "res://infernal_gait.gd"
|
||||||
# Grounded idle breathing layered after the approved locomotion.
|
# Grounded idle breathing layered after the approved locomotion.
|
||||||
|
const ARM_WALK_AMPLITUDE=0.8
|
||||||
var idle_time=0.0
|
var idle_time=0.0
|
||||||
var idle_weight=0.0
|
var idle_weight=0.0
|
||||||
var relaxed_weight=0.0
|
var relaxed_weight=0.0
|
||||||
@@ -41,7 +42,7 @@ func relax_arm(side,breath):
|
|||||||
var length_lower=point(lower).distance_to(point(wrist))
|
var length_lower=point(lower).distance_to(point(wrist))
|
||||||
var forward=actor.global_basis.z.normalized();var right=actor.global_basis.x.normalized()
|
var forward=actor.global_basis.z.normalized();var right=actor.global_basis.x.normalized()
|
||||||
var down=-actor.global_basis.y.normalized()
|
var down=-actor.global_basis.y.normalized()
|
||||||
var swing=sign_x*sin(phase*TAU)*.32*walk_weight
|
var swing=sign_x*sin(phase*TAU)*.32*ARM_WALK_AMPLITUDE*walk_weight
|
||||||
var bend=deg_to_rad(14.0)+sin(idle_time*TAU/6.4+sign_x*.4)*.025*idle_weight
|
var bend=deg_to_rad(14.0)+sin(idle_time*TAU/6.4+sign_x*.4)*.025*idle_weight
|
||||||
# The Meshy arm surface has a wider sculpted rest pose than the inherited rig.
|
# The Meshy arm surface has a wider sculpted rest pose than the inherited rig.
|
||||||
# Retarget its lateral offset so the visible arms, not just the bones, hang down.
|
# Retarget its lateral offset so the visible arms, not just the bones, hang down.
|
||||||
@@ -52,7 +53,7 @@ func relax_arm(side,breath):
|
|||||||
# Human arm swing: flex on the forward half of the step, then extend while
|
# Human arm swing: flex on the forward half of the step, then extend while
|
||||||
# returning through the relaxed side position and the small backswing.
|
# returning through the relaxed side position and the small backswing.
|
||||||
var forward_reach=smoothstep(0.0,1.0,maxf(0.0,sin(phase*TAU)*sign_x))
|
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_bend=lerpf(bend,deg_to_rad(60.0),forward_reach*ARM_WALK_AMPLITUDE)
|
||||||
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()
|
||||||
|
|||||||
+8
-1
@@ -1,6 +1,6 @@
|
|||||||
# Handoff — Diabolo / DEMON
|
# Handoff — Diabolo / DEMON
|
||||||
|
|
||||||
Обновлено: 2026-10-28. Рабочая версия: `Demon_v0.19`.
|
Обновлено: 2026-10-29. Рабочая версия: `Demon_v0.19`.
|
||||||
|
|
||||||
## С чего продолжать
|
## С чего продолжать
|
||||||
|
|
||||||
@@ -15,6 +15,13 @@
|
|||||||
|
|
||||||
## Последние выполненные задачи
|
## Последние выполненные задачи
|
||||||
|
|
||||||
|
- **Амплитуда рук −20% (2026-10-29):** ARM_WALK_AMPLITUDE=0.8 уменьшает мах
|
||||||
|
плеча и добавочный сгиб локтя относительно положения покоя. Цикл сгибания
|
||||||
|
вперёд/разгибания назад сохранён; максимум сгиба теперь около 50,8° вместо
|
||||||
|
60°. Принятый айдл не менялся. `--test-gait` PASS: героиня/3 помощницы,
|
||||||
|
5 скоростей, мах, углы локтей, опора, остановка, удар, пауза, телепорт.
|
||||||
|
Изменения в исходниках; EXE не пересобирался.
|
||||||
|
|
||||||
- **Человеческий цикл рук, итерация 3 (2026-10-28):** локоть больше не остаётся
|
- **Человеческий цикл рук, итерация 3 (2026-10-28):** локоть больше не остаётся
|
||||||
постоянно согнутым. На передней половине маха плавное сгибание от прежних
|
постоянно согнутым. На передней половине маха плавное сгибание от прежних
|
||||||
14° к 60°, при возврате к бедру и небольшом заднем махе — разгибание.
|
14° к 60°, при возврате к бедру и небольшом заднем махе — разгибание.
|
||||||
|
|||||||
Reference in New Issue
Block a user