diff options
| author | Charles Lohr <lohr85@gmail.com> | 2018-04-04 04:34:08 +0000 |
|---|---|---|
| committer | Charles Lohr <lohr85@gmail.com> | 2018-04-04 04:34:08 +0000 |
| commit | 170f5cbb19d0c599c5a9da0ea64445ff12158e22 (patch) | |
| tree | 36efaad9031feeb0974f3d77282a5ff73d598bbe /src/poser_charlesrefine.c | |
| parent | 736443dca52d6800224db4d0646b9617f79a219b (diff) | |
| parent | 22301a092b4009c4f2ca2bc8be4511d75e3082b6 (diff) | |
| download | libsurvive-170f5cbb19d0c599c5a9da0ea64445ff12158e22.tar.gz libsurvive-170f5cbb19d0c599c5a9da0ea64445ff12158e22.tar.bz2 | |
Merge branch 'new_config_mode' of https://github.com/cnlohr/libsurvive into new_config_mode
Diffstat (limited to 'src/poser_charlesrefine.c')
| -rw-r--r-- | src/poser_charlesrefine.c | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/src/poser_charlesrefine.c b/src/poser_charlesrefine.c index 372ccb1..266248c 100644 --- a/src/poser_charlesrefine.c +++ b/src/poser_charlesrefine.c @@ -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,10 +328,24 @@ 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; + 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); +>>>>>>> 22301a092b4009c4f2ca2bc8be4511d75e3082b6 dd->ptsweep = 0; } |