Commit 342eb562 authored by Ruben Jesus Garcia Hernandez's avatar Ruben Jesus Garcia Hernandez
parents d5d879d3 2f4cee19
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
*/ */
#include <math.h> #include <math.h>
#include "aux.h" #include "auxiliary.h"
gvr::Mat4f TranslationMatrix (float x, float y, float z) gvr::Mat4f TranslationMatrix (float x, float y, float z)
{ {
......
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
#include "NOMADVRLib/polyhedron.h" #include "NOMADVRLib/polyhedron.h"
#include "NOMADVRLib/IsosurfacesGL.h" #include "NOMADVRLib/IsosurfacesGL.h"
#include "GoogleCardboard/aux.h" #include "GoogleCardboard/auxiliary.h"
#define LOG_TAG "NOMADgvrT" #define LOG_TAG "NOMADgvrT"
#define LOGW(...) __android_log_print(ANDROID_LOG_WARN, LOG_TAG, __VA_ARGS__) #define LOGW(...) __android_log_print(ANDROID_LOG_WARN, LOG_TAG, __VA_ARGS__)
......
...@@ -2,7 +2,7 @@ This repository contains the demos for Google cardboard using GVR Android SDK v1 ...@@ -2,7 +2,7 @@ This repository contains the demos for Google cardboard using GVR Android SDK v1
https://github.com/googlevr/gvr-android-sdk https://github.com/googlevr/gvr-android-sdk
Clone that repository and add the content of this one inside the Samples directory. 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 NOMADgvrT/src/main/jni
Enable support for ndk (tested: android-ndk-r10d) in settings.gradle: Enable support for ndk (tested: android-ndk-r10d) in settings.gradle:
...@@ -13,5 +13,3 @@ List of directories ...@@ -13,5 +13,3 @@ List of directories
NOMADgvrT: NOMADgvrT:
This program can load prepared molecular dynamics simulations, and is This program can load prepared molecular dynamics simulations, and is
compatible with the TimestepData OpenVR demo. compatible with the TimestepData OpenVR demo.
Ply support is not yet implemented
\ No newline at end of file
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
#include "NOMADVRLib/IsosurfacesGL.h" #include "NOMADVRLib/IsosurfacesGL.h"
#include "NOMADVRLib/eprintf.h" #include "NOMADVRLib/eprintf.h"
#include "GoogleCardboard/aux.h" #include "GoogleCardboard/auxiliary.h"
#define LOG_TAG "NOMADVRIOS" #define LOG_TAG "NOMADVRIOS"
#define LOGW(...) NSLog(@__VA_ARGS__) #define LOGW(...) NSLog(@__VA_ARGS__)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment