From 7d1d930dcb99559eee95fc8a94cc68d12a968353 Mon Sep 17 00:00:00 2001
From: Justin Berger <j.david.berger@gmail.com>
Date: Tue, 3 Apr 2018 16:08:00 -0600
Subject: Added simple API

---
 winbuild/libsurvive.sln                        | 23 +++++++++++++++++++++++
 winbuild/libsurvive/libsurvive.vcxproj         |  2 ++
 winbuild/libsurvive/libsurvive.vcxproj.filters |  6 ++++++
 3 files changed, 31 insertions(+)

(limited to 'winbuild')

diff --git a/winbuild/libsurvive.sln b/winbuild/libsurvive.sln
index b525975..1872a5a 100644
--- a/winbuild/libsurvive.sln
+++ b/winbuild/libsurvive.sln
@@ -11,6 +11,10 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "data_recorder", "data_recor
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test", "test\test.vcxproj", "{EF083B79-F1D7-408A-9902-502B9A0639E0}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "simple_pose_test", "simple_pose_test\simple_pose_test.vcxproj", "{308708B5-DDC9-49EE-BF31-C83E187AFE15}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "api_example", "api_example\api_example.vcxproj", "{545316AE-4E07-49DD-A2B8-7A2DE9676EFF}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|x64 = Debug|x64
@@ -51,8 +55,27 @@ Global
 		{EF083B79-F1D7-408A-9902-502B9A0639E0}.Release|x64.Build.0 = Release|x64
 		{EF083B79-F1D7-408A-9902-502B9A0639E0}.Release|x86.ActiveCfg = Release|Win32
 		{EF083B79-F1D7-408A-9902-502B9A0639E0}.Release|x86.Build.0 = Release|Win32
+		{308708B5-DDC9-49EE-BF31-C83E187AFE15}.Debug|x64.ActiveCfg = Debug|x64
+		{308708B5-DDC9-49EE-BF31-C83E187AFE15}.Debug|x64.Build.0 = Debug|x64
+		{308708B5-DDC9-49EE-BF31-C83E187AFE15}.Debug|x86.ActiveCfg = Debug|Win32
+		{308708B5-DDC9-49EE-BF31-C83E187AFE15}.Debug|x86.Build.0 = Debug|Win32
+		{308708B5-DDC9-49EE-BF31-C83E187AFE15}.Release|x64.ActiveCfg = Release|x64
+		{308708B5-DDC9-49EE-BF31-C83E187AFE15}.Release|x64.Build.0 = Release|x64
+		{308708B5-DDC9-49EE-BF31-C83E187AFE15}.Release|x86.ActiveCfg = Release|Win32
+		{308708B5-DDC9-49EE-BF31-C83E187AFE15}.Release|x86.Build.0 = Release|Win32
+		{545316AE-4E07-49DD-A2B8-7A2DE9676EFF}.Debug|x64.ActiveCfg = Debug|x64
+		{545316AE-4E07-49DD-A2B8-7A2DE9676EFF}.Debug|x64.Build.0 = Debug|x64
+		{545316AE-4E07-49DD-A2B8-7A2DE9676EFF}.Debug|x86.ActiveCfg = Debug|Win32
+		{545316AE-4E07-49DD-A2B8-7A2DE9676EFF}.Debug|x86.Build.0 = Debug|Win32
+		{545316AE-4E07-49DD-A2B8-7A2DE9676EFF}.Release|x64.ActiveCfg = Release|x64
+		{545316AE-4E07-49DD-A2B8-7A2DE9676EFF}.Release|x64.Build.0 = Release|x64
+		{545316AE-4E07-49DD-A2B8-7A2DE9676EFF}.Release|x86.ActiveCfg = Release|Win32
+		{545316AE-4E07-49DD-A2B8-7A2DE9676EFF}.Release|x86.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {EA7B8D68-188A-4190-B011-8A7F4EC52C38}
+	EndGlobalSection
 EndGlobal
diff --git a/winbuild/libsurvive/libsurvive.vcxproj b/winbuild/libsurvive/libsurvive.vcxproj
index 4b76c99..85e9f5a 100644
--- a/winbuild/libsurvive/libsurvive.vcxproj
+++ b/winbuild/libsurvive/libsurvive.vcxproj
@@ -178,6 +178,7 @@
     <ClCompile Include="..\..\src\poser_sba.c" />
     <ClCompile Include="..\..\src\poser_turveytori.c" />
     <ClCompile Include="..\..\src\survive.c" />
+    <ClCompile Include="..\..\src\survive_api.c" />
     <ClCompile Include="..\..\src\survive_cal.c" />
     <ClCompile Include="..\..\src\survive_charlesbiguator.c" />
     <ClCompile Include="..\..\src\survive_config.c" />
@@ -197,6 +198,7 @@
   <ItemGroup>
     <ClInclude Include="..\..\include\libsurvive\poser.h" />
     <ClInclude Include="..\..\include\libsurvive\survive.h" />
+    <ClInclude Include="..\..\include\libsurvive\survive_api.h" />
     <ClInclude Include="..\..\include\libsurvive\survive_types.h" />
     <ClInclude Include="..\..\redist\crc32.h" />
     <ClInclude Include="..\..\redist\jsmn.h" />
diff --git a/winbuild/libsurvive/libsurvive.vcxproj.filters b/winbuild/libsurvive/libsurvive.vcxproj.filters
index 1f98c68..61cec4c 100644
--- a/winbuild/libsurvive/libsurvive.vcxproj.filters
+++ b/winbuild/libsurvive/libsurvive.vcxproj.filters
@@ -135,6 +135,9 @@
     <ClCompile Include="..\..\redist\sba\sba_chkjac.c">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\survive_api.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\src\ootx_decoder.h">
@@ -188,6 +191,9 @@
     <ClInclude Include="..\..\redist\sba\sba.h">
       <Filter>Source Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\include\libsurvive\survive_api.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />
-- 
cgit v1.3.1


From 7f4385538d6b19ea5dd3f00c4a0eb49385798031 Mon Sep 17 00:00:00 2001
From: Justin Berger <j.david.berger@gmail.com>
Date: Mon, 9 Apr 2018 09:33:40 -0600
Subject: Made new posers work in windows

---
 src/poser_epnp.c                               |  2 +-
 src/poser_general_optimizer.c                  |  3 ++-
 src/poser_mpfit.c                              | 15 ++++-----------
 src/poser_sba.c                                |  2 +-
 src/survive.c                                  |  2 ++
 winbuild/libsurvive/libsurvive.vcxproj         |  6 ++++++
 winbuild/libsurvive/libsurvive.vcxproj.filters | 18 ++++++++++++++++++
 7 files changed, 34 insertions(+), 14 deletions(-)

(limited to 'winbuild')

diff --git a/src/poser_epnp.c b/src/poser_epnp.c
index 615c01c..851ce29 100644
--- a/src/poser_epnp.c
+++ b/src/poser_epnp.c
@@ -129,7 +129,7 @@ int PoserEPNP(SurviveObject *so, PoserData *pd) {
 	case POSERDATA_LIGHT: {
 		PoserDataLight *lightData = (PoserDataLight *)pd;
 
-		SurvivePose posers[2] = {};
+		SurvivePose posers[2] = { 0 };
 		int meas[2] = {0, 0};
 		for (int lh = 0; lh < so->ctx->activeLighthouses; lh++) {
 			if (so->ctx->bsd[lh].PositionSet) {
diff --git a/src/poser_general_optimizer.c b/src/poser_general_optimizer.c
index 313e378..b3c4e65 100644
--- a/src/poser_general_optimizer.c
+++ b/src/poser_general_optimizer.c
@@ -1,6 +1,7 @@
 #include "poser_general_optimizer.h"
 #include "string.h"
-#include <alloca.h>
+
+#include <malloc.h>
 #include <assert.h>
 #include <stdio.h>
 
diff --git a/src/poser_mpfit.c b/src/poser_mpfit.c
index 03ef522..439d151 100644
--- a/src/poser_mpfit.c
+++ b/src/poser_mpfit.c
@@ -167,22 +167,15 @@ static double run_mpfit_find_3d_structure(MPFITData *d, PoserDataLight *pdl, Sur
 	}
 	failure_count = 0;
 
-	SurvivePose soLocation = {};
+	SurvivePose soLocation = { 0 };
 
 	if (!general_optimizer_data_record_current_pose(&d->opt, &pdl->hdr, sizeof(*pdl), &soLocation)) {
 		return -1;
 	}
 
-	mp_result result = {};
-	mp_par pars[7] = {};
-	pars[0].parname = "X";
-	pars[1].parname = "Y";
-	pars[2].parname = "Z";
-	pars[3].parname = "w";
-	pars[4].parname = "i";
-	pars[5].parname = "j";
-	pars[6].parname = "k";
-
+	mp_result result = { 0 };
+	mp_par pars[7] = { 0 };
+	
 	const bool debug_jacobian = false;
 	if (d->use_jacobian_function) {
 		for (int i = 0; i < 7; i++) {
diff --git a/src/poser_sba.c b/src/poser_sba.c
index 4c7fcd1..5166951 100644
--- a/src/poser_sba.c
+++ b/src/poser_sba.c
@@ -230,7 +230,7 @@ static double run_sba_find_3d_structure(SBAData *d, PoserDataLight *pdl, Survive
 	}
 	failure_count = 0;
 
-	SurvivePose soLocation = {};
+	SurvivePose soLocation = { 0 };
 
 	if (!general_optimizer_data_record_current_pose(&d->opt, &pdl->hdr, sizeof(*pdl), &soLocation)) {
 		return -1;
diff --git a/src/survive.c b/src/survive.c
index 9e750f9..1ab09da 100644
--- a/src/survive.c
+++ b/src/survive.c
@@ -114,6 +114,8 @@ SurviveContext *survive_init_internal(int argc, char *const *argv) {
 		MANUAL_DRIVER_REGISTRATION(PoserDummy)
 		MANUAL_DRIVER_REGISTRATION(PoserEPNP)
 		MANUAL_DRIVER_REGISTRATION(PoserSBA)
+		MANUAL_DRIVER_REGISTRATION(PoserCharlesRefine)
+		MANUAL_DRIVER_REGISTRATION(PoserMPFIT)
 
 		MANUAL_DRIVER_REGISTRATION(DriverRegHTCVive)
 		MANUAL_DRIVER_REGISTRATION(DriverRegPlayback)
diff --git a/winbuild/libsurvive/libsurvive.vcxproj b/winbuild/libsurvive/libsurvive.vcxproj
index fb1b9a5..8a0aaf1 100644
--- a/winbuild/libsurvive/libsurvive.vcxproj
+++ b/winbuild/libsurvive/libsurvive.vcxproj
@@ -244,6 +244,7 @@
     <ClCompile Include="..\..\redist\json_helpers.c" />
     <ClCompile Include="..\..\redist\linmath.c" />
     <ClCompile Include="..\..\redist\minimal_opencv.c" />
+    <ClCompile Include="..\..\redist\mpfit\mpfit.c" />
     <ClCompile Include="..\..\redist\puff.c" />
     <ClCompile Include="..\..\redist\sba\sba_chkjac.c" />
     <ClCompile Include="..\..\redist\sba\sba_crsm.c" />
@@ -254,10 +255,13 @@
     <ClCompile Include="..\..\src\epnp\epnp.c" />
     <ClCompile Include="..\..\src\ootx_decoder.c" />
     <ClCompile Include="..\..\src\poser.c" />
+    <ClCompile Include="..\..\src\poser_charlesrefine.c" />
     <ClCompile Include="..\..\src\poser_charlesslow.c" />
     <ClCompile Include="..\..\src\poser_daveortho.c" />
     <ClCompile Include="..\..\src\poser_dummy.c" />
     <ClCompile Include="..\..\src\poser_epnp.c" />
+    <ClCompile Include="..\..\src\poser_general_optimizer.c" />
+    <ClCompile Include="..\..\src\poser_mpfit.c" />
     <ClCompile Include="..\..\src\poser_octavioradii.c" />
     <ClCompile Include="..\..\src\poser_sba.c" />
     <ClCompile Include="..\..\src\poser_turveytori.c" />
@@ -288,11 +292,13 @@
     <ClInclude Include="..\..\redist\json_helpers.h" />
     <ClInclude Include="..\..\redist\linmath.h" />
     <ClInclude Include="..\..\redist\minimal_opencv.h" />
+    <ClInclude Include="..\..\redist\mpfit\mpfit.h" />
     <ClInclude Include="..\..\redist\os_generic.h" />
     <ClInclude Include="..\..\redist\sba\sba.h" />
     <ClInclude Include="..\..\redist\symbol_enumerator.h" />
     <ClInclude Include="..\..\src\epnp\epnp.h" />
     <ClInclude Include="..\..\src\ootx_decoder.h" />
+    <ClInclude Include="..\..\src\poser_general_optimizer.h" />
     <ClInclude Include="..\..\src\survive_cal.h" />
     <ClInclude Include="..\..\src\survive_config.h" />
     <ClInclude Include="..\..\src\survive_default_devices.h" />
diff --git a/winbuild/libsurvive/libsurvive.vcxproj.filters b/winbuild/libsurvive/libsurvive.vcxproj.filters
index d06f083..019631b 100644
--- a/winbuild/libsurvive/libsurvive.vcxproj.filters
+++ b/winbuild/libsurvive/libsurvive.vcxproj.filters
@@ -138,6 +138,18 @@
     <ClCompile Include="..\..\src\survive_imu.c">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\redist\mpfit\mpfit.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\poser_general_optimizer.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\poser_mpfit.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\poser_charlesrefine.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\src\ootx_decoder.h">
@@ -191,6 +203,12 @@
     <ClInclude Include="..\..\redist\sba\sba.h">
       <Filter>Source Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\redist\mpfit\mpfit.h">
+      <Filter>Source Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\poser_general_optimizer.h">
+      <Filter>Source Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />
-- 
cgit v1.3.1