From 736443dca52d6800224db4d0646b9617f79a219b Mon Sep 17 00:00:00 2001 From: Charles Lohr Date: Wed, 4 Apr 2018 04:33:01 +0000 Subject: Fix Merge --- src/poser_charlesrefine.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) (limited to 'src/poser_charlesrefine.c') diff --git a/src/poser_charlesrefine.c b/src/poser_charlesrefine.c index c1cc6de..372ccb1 100644 --- a/src/poser_charlesrefine.c +++ b/src/poser_charlesrefine.c @@ -1,4 +1,4 @@ -//EXPERIMENTAL DRIVER - DO NOT USE +//Driver works, but you _must_ start it near the origin looking in +Z. #include #include @@ -50,7 +50,7 @@ int PoserCharlesRefine(SurviveObject *so, PoserData *pd) { SurvivePose object_pose_out; quatrotateabout(object_pose_out.Rot, object_pose->Rot, applymotion ); copy3d( object_pose_out.Pos, object_pose->Pos ); - PoserData_poser_raw_pose_func(pd, so, 0, &object_pose_out); + PoserData_poser_pose_func(pd, so, &object_pose_out); return 0; } @@ -324,17 +324,10 @@ int PoserCharlesRefine(SurviveObject *so, PoserData *pd) { if( so->PoseConfidence < .01 ) { memcpy( &object_pose_out, &LinmathPose_Identity, sizeof( LinmathPose_Identity ) ); - object_pose_out.Pos[0] = -0.14372776; - object_pose_out.Pos[1] = 0.06856518; - object_pose_out.Pos[2] = 0.01960009; - object_pose_out.Rot[0] = 1.0; - object_pose_out.Rot[1] = -0.0; - object_pose_out.Rot[2] = 0.0; - object_pose_out.Rot[3] = 0.0; so->PoseConfidence = 1.0; } - PoserData_poser_raw_pose_func(pd, so, lhid, &object_pose_out); + PoserData_poser_pose_func(pd, so, &object_pose_out); dd->ptsweep = 0; } -- cgit v1.2.3