Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
VR-demos
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nomad-lab
VR-demos
Commits
342eb562
Commit
342eb562
authored
Apr 11, 2018
by
Ruben Jesus Garcia Hernandez
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of
https://gitlab.mpcdf.mpg.de/nomad-lab/VR-demos
parents
d5d879d3
2f4cee19
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
4 additions
and
6 deletions
+4
-6
GoogleCardboard/auxiliary.cpp
GoogleCardboard/auxiliary.cpp
+1
-1
GoogleCardboard/auxiliary.h
GoogleCardboard/auxiliary.h
+0
-0
GoogleCardboardAndroid/NOMADgvrT/src/main/jni/treasure_hunt_renderer.cc
...dAndroid/NOMADgvrT/src/main/jni/treasure_hunt_renderer.cc
+1
-1
GoogleCardboardAndroid/readme.md
GoogleCardboardAndroid/readme.md
+1
-3
GoogleCardboardIOS/NOMADVRIOS/treasure_hunt_renderer.mm
GoogleCardboardIOS/NOMADVRIOS/treasure_hunt_renderer.mm
+1
-1
No files found.
GoogleCardboard/aux.cpp
→
GoogleCardboard/aux
iliary
.cpp
View file @
342eb562
...
...
@@ -15,7 +15,7 @@
*/
#include <math.h>
#include "aux.h"
#include "aux
iliary
.h"
gvr
::
Mat4f
TranslationMatrix
(
float
x
,
float
y
,
float
z
)
{
...
...
GoogleCardboard/aux.h
→
GoogleCardboard/aux
iliary
.h
View file @
342eb562
File moved
GoogleCardboardAndroid/NOMADgvrT/src/main/jni/treasure_hunt_renderer.cc
View file @
342eb562
...
...
@@ -39,7 +39,7 @@
#include "NOMADVRLib/polyhedron.h"
#include "NOMADVRLib/IsosurfacesGL.h"
#include "GoogleCardboard/aux.h"
#include "GoogleCardboard/aux
iliary
.h"
#define LOG_TAG "NOMADgvrT"
#define LOGW(...) __android_log_print(ANDROID_LOG_WARN, LOG_TAG, __VA_ARGS__)
...
...
GoogleCardboardAndroid/readme.md
View file @
342eb562
...
...
@@ -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
GoogleCardboardIOS/NOMADVRIOS/treasure_hunt_renderer.mm
View file @
342eb562
...
...
@@ -31,7 +31,7 @@
#include "NOMADVRLib/IsosurfacesGL.h"
#include "NOMADVRLib/eprintf.h"
#include "GoogleCardboard/aux.h"
#include "GoogleCardboard/aux
iliary
.h"
#define LOG_TAG "NOMADVRIOS"
#define LOGW(...) NSLog(@__VA_ARGS__)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment