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
b7f69000
Commit
b7f69000
authored
Apr 26, 2018
by
Ruben Jesus Garcia Hernandez
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add updated copyright notice
Add default marker colour Add atom selection
parent
47e8857e
Changes
53
Hide whitespace changes
Inline
Side-by-side
Showing
53 changed files
with
95 additions
and
62 deletions
+95
-62
CAVE/NOMADCaveT/src/defines.h
CAVE/NOMADCaveT/src/defines.h
+1
-1
CAVE/NOMADCaveT/src/main.cpp
CAVE/NOMADCaveT/src/main.cpp
+1
-1
CAVE/NOMADCaveT/src/main_server.cpp
CAVE/NOMADCaveT/src/main_server.cpp
+1
-1
CAVE/NOMADCaveT/src/selectedPoints.hpp
CAVE/NOMADCaveT/src/selectedPoints.hpp
+1
-1
CAVE/NOMADCaveT/src/textRendering.cpp
CAVE/NOMADCaveT/src/textRendering.cpp
+1
-1
CAVE/NOMADCaveT/src/textRendering.hpp
CAVE/NOMADCaveT/src/textRendering.hpp
+1
-1
GoogleCardboard/auxiliary.cpp
GoogleCardboard/auxiliary.cpp
+1
-1
GoogleCardboard/auxiliary.h
GoogleCardboard/auxiliary.h
+1
-1
GoogleCardboardAndroid/NOMADgvrT/src/main/java/com/google/vr/ndk/samples/treasurehunt/Filepath.java
...java/com/google/vr/ndk/samples/treasurehunt/Filepath.java
+1
-1
GoogleCardboardAndroid/NOMADgvrT/src/main/java/com/google/vr/ndk/samples/treasurehunt/MainActivity.java
.../com/google/vr/ndk/samples/treasurehunt/MainActivity.java
+1
-1
GoogleCardboardAndroid/NOMADgvrT/src/main/jni/treasure_hunt_jni.cc
...dboardAndroid/NOMADgvrT/src/main/jni/treasure_hunt_jni.cc
+1
-1
GoogleCardboardAndroid/NOMADgvrT/src/main/jni/treasure_hunt_renderer.cc
...dAndroid/NOMADgvrT/src/main/jni/treasure_hunt_renderer.cc
+1
-1
GoogleCardboardIOS/NOMADVRIOS/TreasureHuntViewController.mm
GoogleCardboardIOS/NOMADVRIOS/TreasureHuntViewController.mm
+1
-1
GoogleCardboardIOS/NOMADVRIOS/treasure_hunt_renderer.mm
GoogleCardboardIOS/NOMADVRIOS/treasure_hunt_renderer.mm
+1
-1
NOMADVRLib/CompileGLShader.cpp
NOMADVRLib/CompileGLShader.cpp
+1
-1
NOMADVRLib/CompileGLShader.h
NOMADVRLib/CompileGLShader.h
+1
-1
NOMADVRLib/ConfigFile.cpp
NOMADVRLib/ConfigFile.cpp
+13
-4
NOMADVRLib/ConfigFile.h
NOMADVRLib/ConfigFile.h
+1
-1
NOMADVRLib/ConfigFileAtoms.cpp
NOMADVRLib/ConfigFileAtoms.cpp
+1
-1
NOMADVRLib/ConfigFileAtoms.h
NOMADVRLib/ConfigFileAtoms.h
+1
-1
NOMADVRLib/Grid.cpp
NOMADVRLib/Grid.cpp
+1
-1
NOMADVRLib/Grid.h
NOMADVRLib/Grid.h
+1
-1
NOMADVRLib/IsoShaders.cpp
NOMADVRLib/IsoShaders.cpp
+1
-1
NOMADVRLib/IsoShaders.h
NOMADVRLib/IsoShaders.h
+1
-1
NOMADVRLib/IsosurfacesGL.cpp
NOMADVRLib/IsosurfacesGL.cpp
+1
-1
NOMADVRLib/IsosurfacesGL.h
NOMADVRLib/IsosurfacesGL.h
+1
-1
NOMADVRLib/LoadPNG.cpp
NOMADVRLib/LoadPNG.cpp
+1
-1
NOMADVRLib/LoadPNG.h
NOMADVRLib/LoadPNG.h
+1
-1
NOMADVRLib/MyGL.h
NOMADVRLib/MyGL.h
+1
-1
NOMADVRLib/TessShaders.cpp
NOMADVRLib/TessShaders.cpp
+16
-2
NOMADVRLib/TessShaders.h
NOMADVRLib/TessShaders.h
+1
-1
NOMADVRLib/TexturedShaders.cpp
NOMADVRLib/TexturedShaders.cpp
+1
-1
NOMADVRLib/TexturedShaders.h
NOMADVRLib/TexturedShaders.h
+1
-1
NOMADVRLib/UnitCellShaders.cpp
NOMADVRLib/UnitCellShaders.cpp
+1
-1
NOMADVRLib/UnitCellShaders.h
NOMADVRLib/UnitCellShaders.h
+1
-1
NOMADVRLib/atoms.cpp
NOMADVRLib/atoms.cpp
+1
-1
NOMADVRLib/atoms.hpp
NOMADVRLib/atoms.hpp
+1
-1
NOMADVRLib/atomsGL.cpp
NOMADVRLib/atomsGL.cpp
+10
-5
NOMADVRLib/atomsGL.h
NOMADVRLib/atomsGL.h
+3
-3
NOMADVRLib/eprintf.h
NOMADVRLib/eprintf.h
+1
-1
NOMADVRLib/markerShaders.cpp
NOMADVRLib/markerShaders.cpp
+1
-1
NOMADVRLib/markerShaders.h
NOMADVRLib/markerShaders.h
+1
-1
NOMADVRLib/polyhedron.cpp
NOMADVRLib/polyhedron.cpp
+1
-1
NOMADVRLib/polyhedron.h
NOMADVRLib/polyhedron.h
+1
-1
OculusMobile/NOMADGearvrT/Projects/Android/src/oculus/Filepath.java
...le/NOMADGearvrT/Projects/Android/src/oculus/Filepath.java
+1
-1
OpenVR/TimestepData/LoadPNG.cpp
OpenVR/TimestepData/LoadPNG.cpp
+1
-1
OpenVR/TimestepData/LoadPNG.h
OpenVR/TimestepData/LoadPNG.h
+1
-1
OpenVR/TimestepData/hellovr_opengl_main.cpp
OpenVR/TimestepData/hellovr_opengl_main.cpp
+1
-1
README.md
README.md
+5
-0
RemoteVisualization/eprintf.cpp
RemoteVisualization/eprintf.cpp
+1
-1
RemoteVisualization/main.cpp
RemoteVisualization/main.cpp
+1
-1
libs/rply/rply.c
libs/rply/rply.c
+1
-1
webserver/cgi-bin/NOMAD/material
webserver/cgi-bin/NOMAD/material
+1
-1
No files found.
CAVE/NOMADCaveT/src/defines.h
View file @
b7f69000
/*
# Copyright 2016-2018
The NOMAD Developers Group
# Copyright 2016-2018
Ruben Jesus Garcia Hernandez
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
...
...
CAVE/NOMADCaveT/src/main.cpp
View file @
b7f69000
/*
# Copyright 2016-2018
The NOMAD Developers Group
# Copyright 2016-2018
Ruben Jesus Garcia Hernandez
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
...
...
CAVE/NOMADCaveT/src/main_server.cpp
View file @
b7f69000
/*
# Copyright 2016-2018
The NOMAD Developers Group
# Copyright 2016-2018
Ruben Jesus Garcia Hernandez
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
...
...
CAVE/NOMADCaveT/src/selectedPoints.hpp
View file @
b7f69000
/*
# Copyright 2016-2018
The NOMAD Developers Group
# Copyright 2016-2018
Ruben Jesus Garcia Hernandez
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
...
...
CAVE/NOMADCaveT/src/textRendering.cpp
View file @
b7f69000
/*
# Copyright 2016-2018
The NOMAD Developers Group
# Copyright 2016-2018
Ruben Jesus Garcia Hernandez
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
...
...
CAVE/NOMADCaveT/src/textRendering.hpp
View file @
b7f69000
/*
# Copyright 2016-2018
The NOMAD Developers Group
# Copyright 2016-2018
Ruben Jesus Garcia Hernandez
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
...
...
GoogleCardboard/auxiliary.cpp
View file @
b7f69000
/*
# Copyright 2016-2018
The NOMAD Developers Group
# Copyright 2016-2018
Ruben Jesus Garcia Hernandez
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
...
...
GoogleCardboard/auxiliary.h
View file @
b7f69000
/*
# Copyright 2016-2018
The NOMAD Developers Group
# Copyright 2016-2018
Ruben Jesus Garcia Hernandez
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
...
...
GoogleCardboardAndroid/NOMADgvrT/src/main/java/com/google/vr/ndk/samples/treasurehunt/Filepath.java
View file @
b7f69000
...
...
@@ -2,7 +2,7 @@
/*These licenses are compatible with Apache 2.0*/
/*
# Copyright 2016-2018
The NOMAD Developers Group
# Copyright 2016-2018
Ruben Jesus Garcia Hernandez
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
...
...
GoogleCardboardAndroid/NOMADgvrT/src/main/java/com/google/vr/ndk/samples/treasurehunt/MainActivity.java
View file @
b7f69000
...
...
@@ -2,7 +2,7 @@
/*These licenses are compatible with Apache 2.0*/
/*
# Copyright 2016-2018
The NOMAD Developers Group
# Copyright 2016-2018
Ruben Jesus Garcia Hernandez
*/
/* Copyright 2017 Google Inc. All rights reserved.
...
...
GoogleCardboardAndroid/NOMADgvrT/src/main/jni/treasure_hunt_jni.cc
View file @
b7f69000
...
...
@@ -2,7 +2,7 @@
/*These licenses are compatible with Apache 2.0*/
/*
# Copyright 2016-2018
The NOMAD Developers Group
# Copyright 2016-2018
Ruben Jesus Garcia Hernandez
*/
/* Copyright 2017 Google Inc. All rights reserved.
...
...
GoogleCardboardAndroid/NOMADgvrT/src/main/jni/treasure_hunt_renderer.cc
View file @
b7f69000
...
...
@@ -2,7 +2,7 @@
/*These licenses are compatible with Apache 2.0*/
/*
# Copyright 2016-2018
The NOMAD Developers Group
# Copyright 2016-2018
Ruben Jesus Garcia Hernandez
*/
/* Copyright 2017 Google Inc. All rights reserved.
*
...
...
GoogleCardboardIOS/NOMADVRIOS/TreasureHuntViewController.mm
View file @
b7f69000
/*# Copyright 2016-2018
The NOMAD Developers Group
*/
/*# Copyright 2016-2018
Ruben Jesus Garcia Hernandez
*/
/*
* Copyright 2016 Google Inc. All Rights Reserved.
*
...
...
GoogleCardboardIOS/NOMADVRIOS/treasure_hunt_renderer.mm
View file @
b7f69000
/*# Copyright 2016-2018
The NOMAD Developers Group
*/
/*# Copyright 2016-2018
Ruben Jesus Garcia Hernandez
*/
/* Copyright 2016 Google Inc. All rights reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
...
...
NOMADVRLib/CompileGLShader.cpp
View file @
b7f69000
/*
# Copyright 2016-2018
The NOMAD Developers Group
# Copyright 2016-2018
Ruben Jesus Garcia Hernandez
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
...
...
NOMADVRLib/CompileGLShader.h
View file @
b7f69000
/*
# Copyright 2016-2018
The NOMAD Developers Group
# Copyright 2016-2018
Ruben Jesus Garcia Hernandez
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
...
...
NOMADVRLib/ConfigFile.cpp
View file @
b7f69000
/*
# Copyright 2016-2018
The NOMAD Developers Group
# Copyright 2016-2018
Ruben Jesus Garcia Hernandez
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
...
...
@@ -735,12 +735,21 @@ int loadConfigFile(const char * f)
if
(
markers
&&
!
markercolours
)
{
markercolours
=
new
float
*
[
TIMESTEPS
];
float
mc
[
4
];
if
(
fabs
(
BACKGROUND
[
0
]
-
0.5
)
<
0.1
&&
fabs
(
BACKGROUND
[
1
]
-
0.5
)
<
0.1
&&
fabs
(
BACKGROUND
[
2
]
-
0.5
)
<
0.1
)
//almost grey
for
(
int
j
=
0
;
j
<
3
;
j
++
)
{
mc
[
j
]
=
0.0
f
;
}
else
for
(
int
j
=
0
;
j
<
3
;
j
++
)
{
mc
[
j
]
=
1
-
BACKGROUND
[
j
];
}
mc
[
3
]
=
0.5
;
for
(
int
i
=
0
;
i
<
TIMESTEPS
;
i
++
)
{
markercolours
[
i
]
=
new
float
[
4
];
for
(
int
j
=
0
;
j
<
3
;
j
++
)
{
markercolours
[
i
][
j
]
=
1
-
BACKGROUND
[
j
];
for
(
int
j
=
0
;
j
<
4
;
j
++
)
{
markercolours
[
i
][
j
]
=
mc
[
j
];
}
markercolours
[
i
][
3
]
=
0.5
;
}
}
...
...
NOMADVRLib/ConfigFile.h
View file @
b7f69000
/*
# Copyright 2016-2018
The NOMAD Developers Group
# Copyright 2016-2018
Ruben Jesus Garcia Hernandez
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
...
...
NOMADVRLib/ConfigFileAtoms.cpp
View file @
b7f69000
/*
# Copyright 2016-2018
The NOMAD Developers Group
# Copyright 2016-2018
Ruben Jesus Garcia Hernandez
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
...
...
NOMADVRLib/ConfigFileAtoms.h
View file @
b7f69000
/*
# Copyright 2016-2018
The NOMAD Developers Group
# Copyright 2016-2018
Ruben Jesus Garcia Hernandez
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
...
...
NOMADVRLib/Grid.cpp
View file @
b7f69000
/*
# Copyright 2016-2018
The NOMAD Developers Group
# Copyright 2016-2018
Ruben Jesus Garcia Hernandez
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
...
...
NOMADVRLib/Grid.h
View file @
b7f69000
/*
# Copyright 2016-2018
The NOMAD Developers Group
# Copyright 2016-2018
Ruben Jesus Garcia Hernandez
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
...
...
NOMADVRLib/IsoShaders.cpp
View file @
b7f69000
/*
# Copyright 2016-2018
The NOMAD Developers Group
# Copyright 2016-2018
Ruben Jesus Garcia Hernandez
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
...
...
NOMADVRLib/IsoShaders.h
View file @
b7f69000
/*
# Copyright 2016-2018
The NOMAD Developers Group
# Copyright 2016-2018
Ruben Jesus Garcia Hernandez
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
...
...
NOMADVRLib/IsosurfacesGL.cpp
View file @
b7f69000
...
...
@@ -3,7 +3,7 @@
/*This license is compatible with Apache 2.0*/
/*
# Copyright 2016-2018
The NOMAD Developers Group
# Copyright 2016-2018
Ruben Jesus Garcia Hernandez
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
...
...
NOMADVRLib/IsosurfacesGL.h
View file @
b7f69000
/*
# Copyright 2016-2018
The NOMAD Developers Group
# Copyright 2016-2018
Ruben Jesus Garcia Hernandez
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
...
...
NOMADVRLib/LoadPNG.cpp
View file @
b7f69000
/*
# Copyright 2016-2018
The NOMAD Developers Group
# Copyright 2016-2018
Ruben Jesus Garcia Hernandez
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
...
...
NOMADVRLib/LoadPNG.h
View file @
b7f69000
/*
# Copyright 2016-2018
The NOMAD Developers Group
# Copyright 2016-2018
Ruben Jesus Garcia Hernandez
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
...
...
NOMADVRLib/MyGL.h
View file @
b7f69000
/*
# Copyright 2016-2018
The NOMAD Developers Group
# Copyright 2016-2018
Ruben Jesus Garcia Hernandez
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
...
...
NOMADVRLib/TessShaders.cpp
View file @
b7f69000
/*
# Copyright 2016-2018
The NOMAD Developers Group
# Copyright 2016-2018
Ruben Jesus Garcia-Hernandez
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
...
...
@@ -33,14 +33,17 @@ const char * const AtomShaders [] = {
#endif
"uniform sampler2D atomData;
\n
"
"uniform float totalatoms;
\n
"
//(float)atomsInPeriodicTable
"uniform int selectedAtom;
\n
"
"layout(location = 0) in vec3 center;
\n
"
"layout(location = 1) in float atomIn;
\n
"
"out vec4 vcolor;
\n
"
//color , radius
"out vec3 vcen;"
"out float vselected;"
"void main()
\n
"
"{
\n
"
"float coord=atomIn/totalatoms+0.5/totalatoms;
\n
"
"vcolor=vec4(texture(atomData, vec2(coord, 0)));
\n
"
"vselected=float(gl_VertexID==selectedAtom);
\n
"
"vcen=center;
\n
"
"}
\n
"
,
...
...
@@ -52,13 +55,21 @@ const char * const AtomShaders [] = {
#endif
"in lowp vec4 color;
\n
"
"in highp vec3 normal;"
"in float selected;"
"out lowp vec4 outputColor;
\n
"
"void main()
\n
"
"{
\n
"
"highp vec3 nn = normalize(normal);"
"lowp float a=abs(dot(nn, vec3(0,sqrt(2.0)/2.0,sqrt(2.0)/2.0)));
\n
"
"lowp float b=max(0.0, dot(nn, vec3(0,0,1)));
\n
"
"highp vec4 res=color;
\n
"
"highp vec4 res;
\n
"
"bool s=abs(normal.x)<0.2;"
"s=s||(abs(normal.y)<0.2);"
"s=s||(abs(normal.z)<0.2);"
"if (selected>0.5 && s)"
" res=vec4(1.0, 0.5, 0.0, 1.0);"
"else
\n
"
" res=color;
\n
"
" outputColor = vec4 ((res.rgb) * (0.4 + 0.3*a + 0.3*b), color.a);
\n
"
"}
\n
"
,
...
...
@@ -73,8 +84,10 @@ const char * const AtomShaders [] = {
"uniform mat4 matrix;
\n
"
"in vec4 vcolor[];
\n
"
//color , radius
"in vec3 vcen[];"
"in float vselected[];"
"out vec4 color;
\n
"
//color
"out vec3 normal;
\n
"
"out float selected;
\n
"
"void main()
\n
"
"{
\n
"
...
...
@@ -83,6 +96,7 @@ const char * const AtomShaders [] = {
"sin((gl_TessCoord.y-0.5)*pi));"
"vec3 vertex = normal * vcolor[0].w + vcen[0];
\n
"
"color=vec4(vcolor[0].xyz, 1);"
"selected=vselected[0];
\n
"
"gl_Position = matrix * vec4(vertex, 1);
\n
"
"}
\n
"
...
...
NOMADVRLib/TessShaders.h
View file @
b7f69000
/*
# Copyright 2016-2018
The NOMAD Developers Group
# Copyright 2016-2018
Ruben Jesus Garcia Hernandez
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
...
...
NOMADVRLib/TexturedShaders.cpp
View file @
b7f69000
/*
# Copyright 2016-2018
The NOMAD Developers Group
# Copyright 2016-2018
Ruben Jesus Garcia Hernandez
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
...
...
NOMADVRLib/TexturedShaders.h
View file @
b7f69000
/*
# Copyright 2016-2018
The NOMAD Developers Group
# Copyright 2016-2018
Ruben Jesus Garcia Hernandez
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
...
...
NOMADVRLib/UnitCellShaders.cpp
View file @
b7f69000
/*
# Copyright 2016-2018
The NOMAD Developers Group
# Copyright 2016-2018
Ruben Jesus Garcia Hernandez
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
...
...
NOMADVRLib/UnitCellShaders.h
View file @
b7f69000
/*
# Copyright 2016-2018
The NOMAD Developers Group
# Copyright 2016-2018
Ruben Jesus Garcia Hernandez
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
...
...
NOMADVRLib/atoms.cpp
View file @
b7f69000
/*
# Copyright 2016-2018
The NOMAD Developers Group
# Copyright 2016-2018
Ruben Jesus Garcia Hernandez
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
...
...
NOMADVRLib/atoms.hpp
View file @
b7f69000
/*
# Copyright 2016-2018
The NOMAD Developers Group
# Copyright 2016-2018
Ruben Jesus Garcia Hernandez
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
...
...
NOMADVRLib/atomsGL.cpp
View file @
b7f69000
/*
# Copyright 2016-2018
The NOMAD Developers Group
# Copyright 2016-2018
Ruben Jesus Garcia Hernandez
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
...
...
@@ -736,8 +736,8 @@ GLenum SetupUnitCell(GLuint *UnitCellVAO, GLuint *UnitCellVertBuffer, GLuint *Un
bool
PrepareUnitCellAtomShader
(
GLuint
*
AtomP
,
GLuint
*
cellP
,
GLuint
*
MarkerP
,
GLint
*
AtomMatrixLocation
,
GLint
*
UnitCellMatrixLocation
,
GLint
*
UnitCellColourLocation
,
GLint
*
MarkerMatrixLocation
,
GLint
*
totalatomsLocation
){
if
(
!
PrepareAtomShader
(
AtomP
,
AtomMatrixLocation
,
totalatomsLocation
))
GLint
*
MarkerMatrixLocation
,
GLint
*
totalatomsLocation
,
GLint
*
selectedAtomLocation
){
if
(
!
PrepareAtomShader
(
AtomP
,
AtomMatrixLocation
,
totalatomsLocation
,
selectedAtomLocation
))
return
false
;
if
(
!
PrepareUnitCellShader
(
cellP
,
UnitCellMatrixLocation
,
UnitCellColourLocation
))
...
...
@@ -749,7 +749,7 @@ bool PrepareUnitCellAtomShader (GLuint *AtomP, GLuint *cellP, GLuint *MarkerP,
return
true
;
}
bool
PrepareAtomShader
(
GLuint
*
AtomP
,
GLint
*
AtomMatrixLocation
,
GLint
*
totalatomsLocation
){
bool
PrepareAtomShader
(
GLuint
*
AtomP
,
GLint
*
AtomMatrixLocation
,
GLint
*
totalatomsLocation
,
GLint
*
selectedAtomLocation
){
//https://www.gamedev.net/topic/591110-geometry-shader-point-sprites-to-spheres/
//no rotation, only translations means we can do directional lighting in the shader.
//FIXME
...
...
@@ -772,7 +772,12 @@ bool PrepareAtomShader (GLuint *AtomP, GLint *AtomMatrixLocation, GLint *totalat
eprintf
(
"Unable to find matrix uniform in atom shader
\n
"
);
return
false
;
}
*
selectedAtomLocation
=
glGetUniformLocation
(
*
AtomP
,
"selectedAtom"
);
if
(
*
totalatomsLocation
==
-
1
)
{
eprintf
(
"Unable to find selectedAtom uniform in atom shader
\n
"
);
return
false
;
}
return
true
;
}
...
...
NOMADVRLib/atomsGL.h
View file @
b7f69000
...
...
@@ -5,7 +5,7 @@
/*This code is therefore licensed under Apache 2.0*/
/*
# Copyright 2016-2018
The NOMAD Developers Group
# Copyright 2016-2018
Ruben Jesus Garcia Hernandez
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
...
...
@@ -36,8 +36,8 @@ GLenum SetupInfoCube (GLuint *VAO, GLuint *VertBuffer, GLuint *IndexBuffer);
bool
PrepareUnitCellAtomShader
(
GLuint
*
AtomP
,
GLuint
*
cellP
,
GLuint
*
MarkerP
,
GLint
*
AtomMatrixLocation
,
GLint
*
UnitCellMatrixLocation
,
GLint
*
UnitCellColourLocation
,
GLint
*
MarkerMatrixLocation
,
GLint
*
totalatomsLocation
);
bool
PrepareAtomShader
(
GLuint
*
AtomP
,
GLint
*
AtomMatrixLocation
,
GLint
*
totalatomsLocation
);
GLint
*
MarkerMatrixLocation
,
GLint
*
totalatomsLocation
,
GLint
*
selectedAtomLocation
);
bool
PrepareAtomShader
(
GLuint
*
AtomP
,
GLint
*
AtomMatrixLocation
,
GLint
*
totalatomsLocation
,
GLint
*
selectedAtomLocation
);
bool
PrepareAtomShaderNoTess
(
GLuint
*
AtomP
,
GLint
*
AtomMatrixLocation
,
GLint
*
totalatomsLocation
);
bool
PrepareUnitCellShader
(
GLuint
*
cellP
,
GLint
*
UnitCellMatrixLocation
,
GLint
*
UnitCellColourLocation
);
bool
PrepareMarkerShader
(
GLuint
*
MP
,
GLint
*
MMatrixLocation
);
...
...
NOMADVRLib/eprintf.h
View file @
b7f69000
/*
# Copyright 2016-2018
The NOMAD Developers Group
# Copyright 2016-2018
Ruben Jesus Garcia Hernandez
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
...
...
NOMADVRLib/markerShaders.cpp
View file @
b7f69000
/*
# Copyright 2016-2018
The NOMAD Developers Group
# Copyright 2016-2018
Ruben Jesus Garcia Hernandez
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
...
...
NOMADVRLib/markerShaders.h
View file @
b7f69000
/*
# Copyright 2016-2018
The NOMAD Developers Group
# Copyright 2016-2018
Ruben Jesus Garcia Hernandez
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
...
...
NOMADVRLib/polyhedron.cpp
View file @
b7f69000
...
...
@@ -3,7 +3,7 @@
/*This license is compatible with Apache 2.0*/
/*
# Copyright 2016-2018
The NOMAD Developers Group
# Copyright 2016-2018
Ruben Jesus Garcia Hernandez
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
...
...
NOMADVRLib/polyhedron.h
View file @
b7f69000
...
...
@@ -2,7 +2,7 @@
/*These licenses are compatible with Apache 2.0*/
/*
# Copyright 2016-2018
The NOMAD Developers Group
# Copyright 2016-2018
Ruben Jesus Garcia Hernandez
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
...
...
OculusMobile/NOMADGearvrT/Projects/Android/src/oculus/Filepath.java
View file @
b7f69000
...
...
@@ -2,7 +2,7 @@
/*These licenses are compatible with Apache 2.0*/
/*
# Copyright 2016-2018
The NOMAD Developers Group
# Copyright 2016-2018
Ruben Jesus Garcia Hernandez
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
...
...
OpenVR/TimestepData/LoadPNG.cpp
View file @
b7f69000
/*
# Copyright 2016-2018
The NOMAD Developers Group
# Copyright 2016-2018
Ruben Jesus Garcia Hernandez
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
...
...
OpenVR/TimestepData/LoadPNG.h
View file @
b7f69000
/*
# Copyright 2016-2018
The NOMAD Developers Group
# Copyright 2016-2018
Ruben Jesus Garcia Hernandez
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
...
...
OpenVR/TimestepData/hellovr_opengl_main.cpp
View file @
b7f69000
...
...
@@ -5,7 +5,7 @@
/*This code is therefore licensed under Apache 2.0*/
/*
# Copyright 2016-2018
The NOMAD Developers Group
# Copyright 2016-2018
Ruben Jesus Garcia Hernandez
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
...
...
README.md
View file @
b7f69000
Purpose of this code:
The NOMADVR application can be used to visualize in virtual reality
different materials science datasets provided by NOMAD or final users.
Multiple platforms are supported by this code.
Context:
NOMADVR is provided in the context of the NOMAD Center of Excellence.
Datasets from the Encyclopedia and Archive are supported by NOMADVR.
Requirements:
-Supported virtual reality hardware: HTC Vive or Oculus Rift, GearVR,
Google Cardboard for Android or IOS, or the LRZ CAVE
environment.
Usage Instructions:
See https://www.nomad-coe.eu/the-project/graphics/VR-prototype
Subdirectories:
OpenVR: Demos for HTC Vive.
OculusMobile: Demos for GearVR.
GoogleCardboardAndroid: Demos for Google Cardboard (android)
...
...
RemoteVisualization/eprintf.cpp
View file @
b7f69000
/*
# Copyright 2016-2018
The NOMAD Developers Group
# Copyright 2016-2018
Ruben Jesus Garcia Hernandez
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
...
...
RemoteVisualization/main.cpp
View file @
b7f69000
/*
# Copyright 2016-2018
The NOMAD Developers Group
# Copyright 2016-2018
Ruben Jesus Garcia Hernandez
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
...
...
libs/rply/rply.c
View file @
b7f69000
...
...
@@ -6,7 +6,7 @@ Rub
Fix missing initialization, lines 379, 482
/*
# Copyright 2016-2018
The NOMAD Developers Group
# Copyright 2016-2018
Ruben Jesus Garcia Hernandez
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
...
...
webserver/cgi-bin/NOMAD/material
View file @
b7f69000
#!/bin/bash
# Copyright 2016-2018
The NOMAD Developers Group
# Copyright 2016-2018
Ruben Jesus Garcia Hernandez
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
...
...
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