aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJustin Berger <j.david.berger@gmail.com>2018-03-28 21:52:00 -0600
committerJustin Berger <j.david.berger@gmail.com>2018-03-28 22:14:30 -0600
commit08cc0afc797d2225cf23fbc785e6a28cc8667285 (patch)
tree88443149d251316d5ee8946a3b0e393a18146f45 /src
parent91f0cab811e983da63ea49f6e24afae283138a1c (diff)
downloadlibsurvive-08cc0afc797d2225cf23fbc785e6a28cc8667285.tar.gz
libsurvive-08cc0afc797d2225cf23fbc785e6a28cc8667285.tar.bz2
Nuget packaged up dependencies
Diffstat (limited to 'src')
-rw-r--r--src/epnp/epnp.c2
-rw-r--r--src/poser_sba.c1
-rw-r--r--src/survive.c5
-rwxr-xr-xsrc/survive_cal.c2
4 files changed, 7 insertions, 3 deletions
diff --git a/src/epnp/epnp.c b/src/epnp/epnp.c
index 4b888aa..53a1d48 100644
--- a/src/epnp/epnp.c
+++ b/src/epnp/epnp.c
@@ -134,7 +134,7 @@ void epnp_choose_control_points(epnp *self) {
// Take C1, C2, and C3 from PCA on the reference points:
CvMat *PW0 = cvCreateMat(self->number_of_correspondences, 3, CV_64F);
- double pw0tpw0[3 * 3] = {}, dc[3], uct[3 * 3];
+ double pw0tpw0[3 * 3] = {0}, dc[3], uct[3 * 3];
CvMat PW0tPW0 = cvMat(3, 3, CV_64F, pw0tpw0);
CvMat DC = cvMat(3, 1, CV_64F, dc);
CvMat UCt = cvMat(3, 3, CV_64F, uct);
diff --git a/src/poser_sba.c b/src/poser_sba.c
index 0ad38ac..df28a2d 100644
--- a/src/poser_sba.c
+++ b/src/poser_sba.c
@@ -4,6 +4,7 @@
#endif
#include <sba/sba.h>
+#include <malloc.h>
#include "poser.h"
#include <survive.h>
diff --git a/src/survive.c b/src/survive.c
index f46f128..23b1e4c 100644
--- a/src/survive.c
+++ b/src/survive.c
@@ -110,6 +110,9 @@ SurviveContext *survive_init_internal(int argc, char *const *argv) {
MANUAL_DRIVER_REGISTRATION(PoserCharlesSlow)
MANUAL_DRIVER_REGISTRATION(PoserDaveOrtho)
MANUAL_DRIVER_REGISTRATION(PoserDummy)
+ MANUAL_DRIVER_REGISTRATION(PoserEPNP)
+ MANUAL_DRIVER_REGISTRATION(PoserSBA)
+
MANUAL_DRIVER_REGISTRATION(DriverRegHTCVive)
MANUAL_DRIVER_REGISTRATION(DriverRegPlayback)
@@ -260,7 +263,7 @@ int survive_startup(SurviveContext *ctx) {
// start the thread to process button data
ctx->buttonservicethread = OGCreateThread(button_servicer, ctx);
- PoserCB PreferredPoserCB = GetDriverByConfig(ctx, "Poser", "defaultposer", "TurveyTori", 2);
+ PoserCB PreferredPoserCB = GetDriverByConfig(ctx, "Poser", "defaultposer", "SBA", 2);
ctx->lightcapfunction = GetDriverByConfig(ctx, "Disambiguator", "disambiguator", "Turvey", 2);
const char *DriverName;
diff --git a/src/survive_cal.c b/src/survive_cal.c
index 25e43b9..2fc1896 100755
--- a/src/survive_cal.c
+++ b/src/survive_cal.c
@@ -187,7 +187,7 @@ void survive_cal_install( struct SurviveContext * ctx )
}
const char * DriverName;
- cd->ConfigPoserFn = GetDriverByConfig(ctx, "Poser", "configposer", "TurveyTori", 0);
+ cd->ConfigPoserFn = GetDriverByConfig(ctx, "Poser", "configposer", "SBA", 0);
ootx_packet_clbk = ootx_packet_clbk_d;