From 2f4cee19f5ddf671908626e1c33a3ad9167e98e2 Mon Sep 17 00:00:00 2001
From: LRZ Admin <lrzadmin@badwlrz-cm22692.local>
Date: Wed, 11 Apr 2018 18:28:20 +0200
Subject: [PATCH] aux.* is a reserved filename in Windows. Rename to auxiliary.
Update the documentation.
---
GoogleCardboard/{aux.cpp => auxiliary.cpp} | 2 +-
GoogleCardboard/{aux.h => auxiliary.h} | 0
.../NOMADgvrT/src/main/jni/treasure_hunt_renderer.cc | 2 +-
GoogleCardboardAndroid/readme.md | 4 +---
GoogleCardboardIOS/NOMADVRIOS/treasure_hunt_renderer.mm | 2 +-
5 files changed, 4 insertions(+), 6 deletions(-)
rename GoogleCardboard/{aux.cpp => auxiliary.cpp} (99%)
rename GoogleCardboard/{aux.h => auxiliary.h} (100%)
diff --git a/GoogleCardboard/aux.cpp b/GoogleCardboard/auxiliary.cpp
similarity index 99%
rename from GoogleCardboard/aux.cpp
rename to GoogleCardboard/auxiliary.cpp
index b850ae3..0356f44 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 910f0b7..b37047f 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 8d5a32c..b6fad1b 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 67c7b1c..bddfa12 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__)
--
GitLab