diff --git a/Demon_v0.19/gait_tests.gd b/Demon_v0.19/gait_tests.gd index b9f744a..026af66 100644 --- a/Demon_v0.19/gait_tests.gd +++ b/Demon_v0.19/gait_tests.gd @@ -31,6 +31,7 @@ func run(g): 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 + var hand_sum=Vector2.ZERO;var samples=0;var elbow_min=INF;var elbow_max=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)}) @@ -44,7 +45,10 @@ func run(g): 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) + 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 angle=upper.angle_to(forearm);elbow_min=minf(elbow_min,angle);elbow_max=maxf(elbow_max,angle) + cross_sum+=hand_offsets.x*hand_offsets.y;hand_sum+=hand_offsets;samples+=1 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)) @@ -57,7 +61,8 @@ func run(g): 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") + 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