Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
nomad-lab
VR-demos
Commits
b7f69000
Commit
b7f69000
authored
Apr 26, 2018
by
Ruben Jesus Garcia Hernandez
Browse files
Add updated copyright notice
Add default marker colour Add atom selection
parent
47e8857e
Changes
53
Hide whitespace changes
Inline
Side-by-side
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.
...
...
Prev
1
2
3
Next
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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