Relax succubus arms, strengthen idle and allow Space to skip intro
This commit is contained in:
@@ -18,13 +18,19 @@ func run(g):
|
||||
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")
|
||||
check(idle_motion>.012,"visible idle breathing and relaxed arm motion")
|
||||
for side in ["L","R"]:
|
||||
var upper=actor.gait.point("lowerarm01."+side)-actor.gait.point("upperarm01."+side)
|
||||
var forearm=actor.gait.point("wrist."+side)-actor.gait.point("lowerarm01."+side)
|
||||
check(upper.normalized().dot(Vector3.DOWN)>.96,"retargeted idle arms remain near vertical")
|
||||
check(upper.angle_to(forearm)>deg_to_rad(8) and upper.angle_to(forearm)<deg_to_rad(30),"relaxed elbow bend")
|
||||
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
|
||||
var hand_min=Vector2(INF,INF);var hand_max=Vector2(-INF,-INF);var cross_sum=0.0
|
||||
for frame in range(240):
|
||||
var before=[]
|
||||
for f in actor.gait.feet:before.append({"grounded":f.grounded,"anchor":f.anchor,"position":actor.gait.point("foot."+f.side)})
|
||||
@@ -32,6 +38,13 @@ func run(g):
|
||||
actor.get_parent().position+=direction*speed/60
|
||||
actor.rotation.y=lerp_angle(actor.rotation.y,atan2(direction.x,direction.z),.16)
|
||||
actor._process(1.0/60)
|
||||
if frame>30 and frame<110:
|
||||
var hand_offsets=Vector2.ZERO
|
||||
for side_index in range(2):
|
||||
var side="L" if side_index==0 else "R"
|
||||
hand_offsets[side_index]=(actor.gait.point("wrist."+side)-actor.gait.point("upperarm01."+side)).dot(actor.global_basis.z.normalized())
|
||||
hand_min[side_index]=minf(hand_min[side_index],hand_offsets[side_index]);hand_max[side_index]=maxf(hand_max[side_index],hand_offsets[side_index])
|
||||
cross_sum+=(hand_offsets.x-.12)*(hand_offsets.y-.12)
|
||||
for i in range(2):
|
||||
var f=actor.gait.feet[i];var actual=actor.gait.point("foot."+f.side)
|
||||
max_error=maxf(max_error,actual.distance_to(f.target))
|
||||
@@ -43,6 +56,8 @@ func run(g):
|
||||
check(max_slide<.003,"stance slip "+str(actor.scale.x)+" "+str(speed))
|
||||
check(min_contact>-.002,"ground clearance")
|
||||
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(cross_sum<0,"opposing left/right arm 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}))
|
||||
var phase=actor.gait.phase
|
||||
for frame in range(30):actor._process(1.0/60)
|
||||
|
||||
Reference in New Issue
Block a user