Merge pull request #104 from Turupawn/devel

Road to v0.12.0

.travis.yml

@@ -11,10 +11,9 @@ script:
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
       cmake -D test=on . ;
     else
-      CXX=/usr/bin/g++-5 CC=/usr/bin/gcc-5 cmake -Dtest=on . ;
+      CXX=/usr/bin/g++-5 CC=/usr/bin/gcc-5 cmake . ;
     fi
   - make -j2
-  - make test
   - if [[ "$TRAVIS_TAG" ]]; then
       cmake -D BUILD_SHARED_LIBS=OFF . ;
       make -j2 ;
@@ -43,4 +42,4 @@ deploy:
     skip_cleanup: true
     on:
       tags: true
-      condition: $TRAVIS_OS_NAME == "osx"
+      condition: $TRAVIS_OS_NAME == "osx"

CMakeLists.txt

@@ -35,6 +35,8 @@ ENDIF()
 
 IF (UNIX AND NOT APPLE)
   add_definitions(-D_LARGEFILE64_SOURCE)
+  set(CMAKE_POSITION_INDEPENDENT_CODE ON)
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
   target_link_libraries (modio curl)
 ENDIF ()
 

README.md

@@ -88,6 +88,18 @@ modio_instance.galaxyAuth(appdata, [&](const modio::Response &response)
 });
 ```
 
+#### Oculus Auth
+
+```c++
+modio_instance.oculusAuth(nonce, oculus_user_id, access_token, email, date_expires, [&](const modio::Response &response)
+{
+  if (response.code == 200)
+  {
+    // Successful Oculus authentication
+  }
+});
+```
+
 #### Steam Auth
 
 ```c++

examples/code-samples/c++/57_GetInstalledMod.cpp

@@ -0,0 +1,28 @@
+#include "modio.h"
+
+int main(void)
+{
+  modio::Instance modio_instance(MODIO_ENVIRONMENT_TEST, 7, "e91c01b8882f4affeddd56c96111977b");
+
+  u32 mod_id;
+  std::cout << "Enter the mod id: " << std::endl;
+  std::cin >> mod_id;
+
+  modio::InstalledMod installed_mod = modio_instance.getInstalledMod(mod_id);
+
+  // First, let's check if there is at least one modfile installed
+  if (installed_mod.mod_id != 0)
+  {
+    // Now we delete the local modfile folder by providing the modfile id
+    std::cout << "Mod name: " << installed_mod.mod.name << std::endl;
+    std::cout << "Mod path: " << installed_mod.path << std::endl;
+  }
+  else
+  {
+    std::cout << "That mod is not installed." << std::endl;
+  }
+
+  std::cout << "Process finished" << std::endl;
+
+  return 0;
+}

examples/code-samples/c++/58_OculusAuth.cpp

@@ -0,0 +1,42 @@
+#include "modio.h"
+
+int main()
+{
+  modio::Instance modio_instance(MODIO_ENVIRONMENT_TEST, 7, "e91c01b8882f4affeddd56c96111977b");
+
+  volatile static bool finished = false;
+
+  auto wait = [&]() {
+    while (!finished)
+    {
+      modio_instance.sleep(10);
+      modio_instance.process();
+    }
+  };
+
+  auto finish = [&]() {
+    finished = true;
+  };
+
+  // Auth works by providing the Appdata param given by the Oculus SDK
+  std::string appdata = "";
+  std::string nonce = "GALAXY NONCE PROOF HERE";
+  std::string oculus_user_id = "123123";
+  std::string access_token = "GALAXY AUTH TOKEN HERE";
+  std::string email = ""; // Optional email param, "" will be ignored
+  u32 date_expires = 0; // Optional expiration date param, 0 will be ignored
+  modio_instance.oculusAuth(nonce, oculus_user_id, access_token, email, date_expires, [&](const modio::Response &response) {
+    std::cout << "Response code: " << response.code << std::endl;
+
+    if (response.code == 200)
+      std::cout << "Successful Oculus authentication";
+    else
+      std::cout << "Error while authenticating to Oculus" << std::endl;
+
+    finish();
+  });
+  wait();
+
+  std::cout << "Process finished" << std::endl;
+  return 0;
+}

examples/code-samples/c/01_Authentication.c

@@ -42,7 +42,7 @@ void onEmailRequest(void *object, ModioResponse response)
 
 int main(void)
 {
-  modioInit(MODIO_ENVIRONMENT_TEST, 7, "e91c01b8882f4affeddd56c96111977b", NULL);
+  modioInit(MODIO_ENVIRONMENT_TEST, 7, false, "e91c01b8882f4affeddd56c96111977b", NULL);
 
   bool wait = true;
 

examples/code-samples/c/02_BrowseMods.c

@@ -29,7 +29,7 @@ void onGetAllMods(void *object, ModioResponse response, ModioMod *mods, u32 mods
 
 int main(void)
 {
-  modioInit(MODIO_ENVIRONMENT_TEST, 7, "e91c01b8882f4affeddd56c96111977b", NULL);
+  modioInit(MODIO_ENVIRONMENT_TEST, 7, false, "e91c01b8882f4affeddd56c96111977b", NULL);
 
   bool wait = true;
 

examples/code-samples/c/03_GetUserMods.c

@@ -29,7 +29,7 @@ void onGetAllMods(void *object, ModioResponse response, ModioMod *mods, u32 mods
 
 int main(void)
 {
-  modioInit(MODIO_ENVIRONMENT_TEST, 7, "e91c01b8882f4affeddd56c96111977b", NULL);
+  modioInit(MODIO_ENVIRONMENT_TEST, 7, false, "e91c01b8882f4affeddd56c96111977b", NULL);
 
   bool wait = true;
 

examples/code-samples/c/04_ErrorResponse.c

@@ -30,7 +30,7 @@ void onGetAllMods(void *object, ModioResponse response, ModioMod *mods, u32 mods
 
 int main(void)
 {
-  modioInit(MODIO_ENVIRONMENT_TEST, 7, "e91c01b8882f4affeddd56c96111977b", NULL);
+  modioInit(MODIO_ENVIRONMENT_TEST, 7, false, "e91c01b8882f4affeddd56c96111977b", NULL);
 
   bool wait = true;
 

examples/code-samples/c/05_DownloadModfile.c

@@ -20,7 +20,7 @@ void onDownloadMod(u32 response_code, u32 mod_id)
 
 int main(void)
 {
-  modioInit(MODIO_ENVIRONMENT_TEST, 7, "e91c01b8882f4affeddd56c96111977b", NULL);
+  modioInit(MODIO_ENVIRONMENT_TEST, 7, false, "e91c01b8882f4affeddd56c96111977b", NULL);
 
   // Let's start by requesting a single mod
   printf("Please enter the mod id: \n");

examples/code-samples/c/06_DownloadImages.c

@@ -36,7 +36,7 @@ void onGetMod(void *object, ModioResponse response, ModioMod mod)
 
 int main(void)
 {
-  modioInit(MODIO_ENVIRONMENT_TEST, 7, "e91c01b8882f4affeddd56c96111977b", NULL);
+  modioInit(MODIO_ENVIRONMENT_TEST, 7, false, "e91c01b8882f4affeddd56c96111977b", NULL);
 
   bool wait = true;
 

examples/code-samples/c/07_RemoveModfile.c

@@ -4,7 +4,7 @@
 
 int main(void)
 {
-  modioInit(MODIO_ENVIRONMENT_TEST, 7, "e91c01b8882f4affeddd56c96111977b", NULL);
+  modioInit(MODIO_ENVIRONMENT_TEST, 7, false, "e91c01b8882f4affeddd56c96111977b", NULL);
 
   // First, let's check if there is at least one mod installed
   u32 installed_mods_count = modioGetAllInstalledModsCount();

examples/code-samples/c/08_AddMod.c

@@ -18,7 +18,7 @@ void onAddMod(void *object, ModioResponse response, ModioMod mod)
 
 int main(void)
 {
-  modioInit(MODIO_ENVIRONMENT_TEST, 7, "e91c01b8882f4affeddd56c96111977b", NULL);
+  modioInit(MODIO_ENVIRONMENT_TEST, 7, false, "e91c01b8882f4affeddd56c96111977b", NULL);
 
   if (!modioIsLoggedIn())
   {

examples/code-samples/c/09_GetMod.c

@@ -28,7 +28,7 @@ void onGetMod(void *object, ModioResponse response, ModioMod mod)
 
 int main(void)
 {
-  modioInit(MODIO_ENVIRONMENT_TEST, 7, "e91c01b8882f4affeddd56c96111977b", NULL);
+  modioInit(MODIO_ENVIRONMENT_TEST, 7, false, "e91c01b8882f4affeddd56c96111977b", NULL);
 
   bool wait = true;
 

examples/code-samples/c/10_AddModfile.c

@@ -18,7 +18,7 @@ void onAddModfile(u32 response_code, u32 mod_id)
 
 int main(void)
 {
-  modioInit(MODIO_ENVIRONMENT_TEST, 7, "e91c01b8882f4affeddd56c96111977b", NULL);
+  modioInit(MODIO_ENVIRONMENT_TEST, 7, false, "e91c01b8882f4affeddd56c96111977b", NULL);
 
   if (!modioIsLoggedIn())
   {

examples/code-samples/c/11_EditMod.c

@@ -15,7 +15,7 @@ void onEditMod(void *object, ModioResponse response, ModioMod mod)
 
 int main(void)
 {
-  modioInit(MODIO_ENVIRONMENT_TEST, 7, "e91c01b8882f4affeddd56c96111977b", NULL);
+  modioInit(MODIO_ENVIRONMENT_TEST, 7, false, "e91c01b8882f4affeddd56c96111977b", NULL);
 
   bool wait = true;
 

examples/code-samples/c/12_EditModfile.c

@@ -15,7 +15,7 @@ void onEditModfile(void *object, ModioResponse response, ModioModfile modfile)
 
 int main(void)
 {
-  modioInit(MODIO_ENVIRONMENT_TEST, 7, "e91c01b8882f4affeddd56c96111977b", NULL);
+  modioInit(MODIO_ENVIRONMENT_TEST, 7, false, "e91c01b8882f4affeddd56c96111977b", NULL);
 
   bool wait = true;
 

examples/code-samples/c/13_DeleteModfile.c

@@ -15,7 +15,7 @@ void onDeleteModfile(void *object, ModioResponse response)
 
 int main(void)
 {
-  modioInit(MODIO_ENVIRONMENT_TEST, 7, "e91c01b8882f4affeddd56c96111977b", NULL);
+  modioInit(MODIO_ENVIRONMENT_TEST, 7, false, "e91c01b8882f4affeddd56c96111977b", NULL);
 
   bool wait = true;
 

examples/code-samples/c/14_AddModLogo.c

@@ -15,7 +15,7 @@ void onAddModLogo(void *object, ModioResponse response)
 
 int main(void)
 {
-  modioInit(MODIO_ENVIRONMENT_TEST, 7, "e91c01b8882f4affeddd56c96111977b", NULL);
+  modioInit(MODIO_ENVIRONMENT_TEST, 7, false, "e91c01b8882f4affeddd56c96111977b", NULL);
 
   bool wait = true;
 

examples/code-samples/c/15_AddModImages.c

@@ -15,7 +15,7 @@ void onAddModImages(void *object, ModioResponse response)
 
 int main(void)
 {
-  modioInit(MODIO_ENVIRONMENT_TEST, 7, "e91c01b8882f4affeddd56c96111977b", NULL);
+  modioInit(MODIO_ENVIRONMENT_TEST, 7, false, "e91c01b8882f4affeddd56c96111977b", NULL);
 
   bool wait = true;
 

examples/code-samples/c/16_AddModYoutubeLinks.c

@@ -15,7 +15,7 @@ void onAddModYoutubeLinks(void *object, ModioResponse response)
 
 int main(void)
 {
-  modioInit(MODIO_ENVIRONMENT_TEST, 7, "e91c01b8882f4affeddd56c96111977b", NULL);
+  modioInit(MODIO_ENVIRONMENT_TEST, 7, false, "e91c01b8882f4affeddd56c96111977b", NULL);
 
   bool wait = true;
 

examples/code-samples/c/17_AddModSketchfabLinks.c

@@ -15,7 +15,7 @@ void onAddModSketchfabLinks(void *object, ModioResponse response)
 
 int main(void)
 {
-  modioInit(MODIO_ENVIRONMENT_TEST, 7, "e91c01b8882f4affeddd56c96111977b", NULL);
+  modioInit(MODIO_ENVIRONMENT_TEST, 7, false, "e91c01b8882f4affeddd56c96111977b", NULL);
 
   bool wait = true;
 

examples/code-samples/c/18_DeleteModImages.c

@@ -15,7 +15,7 @@ void onDeleteModImages(void *object, ModioResponse response)
 
 int main(void)
 {
-  modioInit(MODIO_ENVIRONMENT_TEST, 7, "e91c01b8882f4affeddd56c96111977b", NULL);
+  modioInit(MODIO_ENVIRONMENT_TEST, 7, false, "e91c01b8882f4affeddd56c96111977b", NULL);
 
   bool wait = true;
 

examples/code-samples/c/19_DeleteModYoutubeLinks.c

@@ -15,7 +15,7 @@ void onDeleteModYoutubeLinks(void *object, ModioResponse response)
 
 int main(void)
 {
-  modioInit(MODIO_ENVIRONMENT_TEST, 7, "e91c01b8882f4affeddd56c96111977b", NULL);
+  modioInit(MODIO_ENVIRONMENT_TEST, 7, false, "e91c01b8882f4affeddd56c96111977b", NULL);
 
   bool wait = true;
 

examples/code-samples/c/20_DeleteModSketchfabLinks.c

@@ -15,7 +15,7 @@ void onDeleteModSketchfabLinks(void *object, ModioResponse response)
 
 int main(void)
 {
-  modioInit(MODIO_ENVIRONMENT_TEST, 7, "e91c01b8882f4affeddd56c96111977b", NULL);
+  modioInit(MODIO_ENVIRONMENT_TEST, 7, false, "e91c01b8882f4affeddd56c96111977b", NULL);
 
   bool wait = true;
 

examples/code-samples/c/21_DeleteMod.c

@@ -15,7 +15,7 @@ void onModDeleted(void *object, ModioResponse response)
 
 int main(void)
 {
-  modioInit(MODIO_ENVIRONMENT_TEST, 7, "e91c01b8882f4affeddd56c96111977b", NULL);
+  modioInit(MODIO_ENVIRONMENT_TEST, 7, false, "e91c01b8882f4affeddd56c96111977b", NULL);
 
   bool wait = true;
 

examples/code-samples/c/22_GetTags.c

@@ -19,7 +19,7 @@ void onGetModTags(void *object, ModioResponse response, ModioTag *tags_array, u3
 
 int main(void)
 {
-  modioInit(MODIO_ENVIRONMENT_TEST, 7, "e91c01b8882f4affeddd56c96111977b", NULL);
+  modioInit(MODIO_ENVIRONMENT_TEST, 7, false, "e91c01b8882f4affeddd56c96111977b", NULL);
 
   bool wait = true;
 

examples/code-samples/c/23_AddTags.c

@@ -15,7 +15,7 @@ void onAddModTags(void *object, ModioResponse response)
 
 int main(void)
 {
-  modioInit(MODIO_ENVIRONMENT_TEST, 7, "e91c01b8882f4affeddd56c96111977b", NULL);
+  modioInit(MODIO_ENVIRONMENT_TEST, 7, false, "e91c01b8882f4affeddd56c96111977b", NULL);
 
   bool wait = true;
 

examples/code-samples/c/24_DeleteTags.c

@@ -15,7 +15,7 @@ void onDeleteModTags(void *object, ModioResponse response)
 
 int main(void)
 {
-  modioInit(MODIO_ENVIRONMENT_TEST, 7, "e91c01b8882f4affeddd56c96111977b", NULL);
+  modioInit(MODIO_ENVIRONMENT_TEST, 7, false, "e91c01b8882f4affeddd56c96111977b", NULL);
 
   bool wait = true;
 

examples/code-samples/c/25_SubscribeToMod.c

@@ -18,7 +18,7 @@ void onSubscribeToMod(void *object, ModioResponse response, ModioMod mod)
 
 int main(void)
 {
-  modioInit(MODIO_ENVIRONMENT_TEST, 7, "e91c01b8882f4affeddd56c96111977b", NULL);
+  modioInit(MODIO_ENVIRONMENT_TEST, 7, false, "e91c01b8882f4affeddd56c96111977b", NULL);
 
   bool wait = true;
 

examples/code-samples/c/26_UnsubscribeFromMod.c

@@ -16,7 +16,7 @@ void onModUnsubscribed(void *object, ModioResponse response)
 
 int main(void)
 {
-  modioInit(MODIO_ENVIRONMENT_TEST, 7, "e91c01b8882f4affeddd56c96111977b", NULL);
+  modioInit(MODIO_ENVIRONMENT_TEST, 7, false, "e91c01b8882f4affeddd56c96111977b", NULL);
 
   bool wait = true;
 

examples/code-samples/c/27_Ratings.c

@@ -16,7 +16,7 @@ void onAddModRating(void *object, ModioResponse response)
 
 int main(void)
 {
-  modioInit(MODIO_ENVIRONMENT_TEST, 7, "e91c01b8882f4affeddd56c96111977b", NULL);
+  modioInit(MODIO_ENVIRONMENT_TEST, 7, false, "e91c01b8882f4affeddd56c96111977b", NULL);
 
   bool wait = true;
 

examples/code-samples/c/28_GetMetadataKVP.c

@@ -19,7 +19,7 @@ void onGetAllMetadataKVP(void *object, ModioResponse response, ModioMetadataKVP
 
 int main(void)
 {
-  modioInit(MODIO_ENVIRONMENT_TEST, 7, "e91c01b8882f4affeddd56c96111977b", NULL);
+  modioInit(MODIO_ENVIRONMENT_TEST, 7, false, "e91c01b8882f4affeddd56c96111977b", NULL);
 
   bool wait = true;
 

examples/code-samples/c/29_AddMetadataKVP.c

@@ -15,7 +15,7 @@ void onAddMetadataKVP(void *object, ModioResponse response)
 
 int main(void)
 {
-  modioInit(MODIO_ENVIRONMENT_TEST, 7, "e91c01b8882f4affeddd56c96111977b", NULL);
+  modioInit(MODIO_ENVIRONMENT_TEST, 7, false, "e91c01b8882f4affeddd56c96111977b", NULL);
 
   bool wait = true;
 

examples/code-samples/c/30_DeleteMetadataKVP.c

@@ -15,7 +15,7 @@ void onDeleteMetadataKVP(void *object, ModioResponse response)
 
 int main(void)
 {
-  modioInit(MODIO_ENVIRONMENT_TEST, 7, "e91c01b8882f4affeddd56c96111977b", NULL);
+  modioInit(MODIO_ENVIRONMENT_TEST, 7, false, "e91c01b8882f4affeddd56c96111977b", NULL);
 
   bool wait = true;
 

examples/code-samples/c/31_EventsListener.c

@@ -41,7 +41,7 @@ void onEvent(ModioResponse response, ModioModEvent *events_array, u32 events_arr
 
 int main(void)
 {
-  modioInit(MODIO_ENVIRONMENT_TEST, 7, "e91c01b8882f4affeddd56c96111977b", NULL);
+  modioInit(MODIO_ENVIRONMENT_TEST, 7, false, "e91c01b8882f4affeddd56c96111977b", NULL);
 
   bool wait = true;