aboutsummaryrefslogtreecommitdiff
path: root/src/poser_charlesrefine.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/poser_charlesrefine.c')
-rw-r--r--src/poser_charlesrefine.c13
1 files changed, 12 insertions, 1 deletions
diff --git a/src/poser_charlesrefine.c b/src/poser_charlesrefine.c
index c1cc6de..266248c 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 <poser.h>
#include <survive.h>
@@ -50,7 +50,11 @@ 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 );
+<<<<<<< HEAD
+ PoserData_poser_pose_func(pd, so, &object_pose_out);
+=======
PoserData_poser_raw_pose_func(pd, so, 0, &object_pose_out);
+>>>>>>> 22301a092b4009c4f2ca2bc8be4511d75e3082b6
return 0;
}
@@ -324,6 +328,12 @@ int PoserCharlesRefine(SurviveObject *so, PoserData *pd) {
if( so->PoseConfidence < .01 )
{
memcpy( &object_pose_out, &LinmathPose_Identity, sizeof( LinmathPose_Identity ) );
+<<<<<<< HEAD
+ so->PoseConfidence = 1.0;
+ }
+
+ PoserData_poser_pose_func(pd, so, &object_pose_out);
+=======
object_pose_out.Pos[0] = -0.14372776;
object_pose_out.Pos[1] = 0.06856518;
object_pose_out.Pos[2] = 0.01960009;
@@ -335,6 +345,7 @@ int PoserCharlesRefine(SurviveObject *so, PoserData *pd) {
}
PoserData_poser_raw_pose_func(pd, so, lhid, &object_pose_out);
+>>>>>>> 22301a092b4009c4f2ca2bc8be4511d75e3082b6
dd->ptsweep = 0;
}