diff --git a/GoogleCardboard/aux.cpp b/GoogleCardboard/auxiliary.cpp similarity index 99% rename from GoogleCardboard/aux.cpp rename to GoogleCardboard/auxiliary.cpp index b850ae34c75e3035044afd8991e44afd39978942..0356f445bf78140a7f27ce8be323a230e4852df9 100644 --- a/GoogleCardboard/aux.cpp +++ b/GoogleCardboard/auxiliary.cpp @@ -15,7 +15,7 @@ */ #include <math.h> -#include "aux.h" +#include "auxiliary.h" gvr::Mat4f TranslationMatrix (float x, float y, float z) { diff --git a/GoogleCardboard/aux.h b/GoogleCardboard/auxiliary.h similarity index 100% rename from GoogleCardboard/aux.h rename to GoogleCardboard/auxiliary.h diff --git a/GoogleCardboardAndroid/NOMADgvrT/src/main/jni/treasure_hunt_renderer.cc b/GoogleCardboardAndroid/NOMADgvrT/src/main/jni/treasure_hunt_renderer.cc index 910f0b778fb24841ef5189045f2046285bb2864a..b37047f30e5427b9dffe18ba5995369d65c211e9 100644 --- a/GoogleCardboardAndroid/NOMADgvrT/src/main/jni/treasure_hunt_renderer.cc +++ b/GoogleCardboardAndroid/NOMADgvrT/src/main/jni/treasure_hunt_renderer.cc @@ -39,7 +39,7 @@ #include "NOMADVRLib/polyhedron.h" #include "NOMADVRLib/IsosurfacesGL.h" -#include "GoogleCardboard/aux.h" +#include "GoogleCardboard/auxiliary.h" #define LOG_TAG "NOMADgvrT" #define LOGW(...) __android_log_print(ANDROID_LOG_WARN, LOG_TAG, __VA_ARGS__) diff --git a/GoogleCardboardAndroid/readme.md b/GoogleCardboardAndroid/readme.md index 8d5a32c564da50d587ecf37fc2c3d25952b9d280..b6fad1b5d89821b2e41459173bfa94b6355fae64 100644 --- a/GoogleCardboardAndroid/readme.md +++ b/GoogleCardboardAndroid/readme.md @@ -2,7 +2,7 @@ This repository contains the demos for Google cardboard using GVR Android SDK v1 https://github.com/googlevr/gvr-android-sdk Clone that repository and add the content of this one inside the Samples directory. -Copy the content of the ../libs directory (happyhttp, rapidjson) and NOMADVRLib into +Copy the content of the ../libs directory (happyhttp, rapidjson, rply) and NOMADVRLib and GoogleCardboard into NOMADgvrT/src/main/jni Enable support for ndk (tested: android-ndk-r10d) in settings.gradle: @@ -13,5 +13,3 @@ List of directories NOMADgvrT: This program can load prepared molecular dynamics simulations, and is compatible with the TimestepData OpenVR demo. - Ply support is not yet implemented - \ No newline at end of file diff --git a/GoogleCardboardIOS/NOMADVRIOS/treasure_hunt_renderer.mm b/GoogleCardboardIOS/NOMADVRIOS/treasure_hunt_renderer.mm index 67c7b1ce509f8390ae5a81c568f2bd9e48a41925..bddfa12bdb21d5bd643a4c5a09c96057b0b97baf 100644 --- a/GoogleCardboardIOS/NOMADVRIOS/treasure_hunt_renderer.mm +++ b/GoogleCardboardIOS/NOMADVRIOS/treasure_hunt_renderer.mm @@ -31,7 +31,7 @@ #include "NOMADVRLib/IsosurfacesGL.h" #include "NOMADVRLib/eprintf.h" -#include "GoogleCardboard/aux.h" +#include "GoogleCardboard/auxiliary.h" #define LOG_TAG "NOMADVRIOS" #define LOGW(...) NSLog(@__VA_ARGS__)