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
b991aadf
Commit
b991aadf
authored
Apr 21, 2017
by
Ruben Jesus Garcia Hernandez
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Proper directory separator both in windows and linux
parent
fea3947f
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
6 deletions
+8
-6
NOMADVRLib/atoms.cpp
NOMADVRLib/atoms.cpp
+5
-5
OpenVR/TimestepData/hellovr_opengl_main.cpp
OpenVR/TimestepData/hellovr_opengl_main.cpp
+3
-1
No files found.
NOMADVRLib/atoms.cpp
View file @
b991aadf
...
...
@@ -408,20 +408,20 @@ int readAtomsJsonURLwget (const char *const f, int **numatoms, int *timesteps, f
char
cmd
[
2048
];
int
ret
;
if
(
token
)
sprintf
(
cmd
,
"wget --no-check-certificate --header
\"
Authorization:Basic %s
\"
%s/cells?pagination=off -O %s
/
material_cells.json"
,
token
,
f
,
TMPDIR
);
sprintf
(
cmd
,
"wget --no-check-certificate --header
\"
Authorization:Basic %s
\"
%s/cells?pagination=off -O %smaterial_cells.json"
,
token
,
f
,
TMPDIR
);
else
sprintf
(
cmd
,
"wget %s/cells?pagination=off -O %s
/
material_cells.json"
,
f
,
TMPDIR
);
sprintf
(
cmd
,
"wget %s/cells?pagination=off -O %smaterial_cells.json"
,
f
,
TMPDIR
);
ret
=
system
(
cmd
);
if
(
ret
!=
0
)
return
(
-
3
);
if
(
token
)
sprintf
(
cmd
,
"wget --no-check-certificate --header
\"
Authorization:Basic %s
\"
%s/elements?pagination=off -O %s
/
material_elements.json"
,
token
,
f
,
TMPDIR
);
sprintf
(
cmd
,
"wget --no-check-certificate --header
\"
Authorization:Basic %s
\"
%s/elements?pagination=off -O %smaterial_elements.json"
,
token
,
f
,
TMPDIR
);
else
sprintf
(
cmd
,
"wget %s/elements?pagination=off -O %s
/
material_elements.json"
,
f
,
TMPDIR
);
sprintf
(
cmd
,
"wget %s/elements?pagination=off -O %smaterial_elements.json"
,
f
,
TMPDIR
);
ret
=
system
(
cmd
);
if
(
ret
!=
0
)
return
(
-
3
);
sprintf
(
cmd
,
"%s
/
material"
,
TMPDIR
);
sprintf
(
cmd
,
"%smaterial"
,
TMPDIR
);
return
readAtomsJson
(
cmd
,
numatoms
,
timesteps
,
pos
,
abc
,
clonedAtoms
,
token
);
}
#endif
...
...
OpenVR/TimestepData/hellovr_opengl_main.cpp
View file @
b991aadf
...
...
@@ -266,6 +266,7 @@ private: // OpenGL bookkeeping
GLuint
m_unRenderModelProgramID
;
GLuint
m_unAtomsProgramID
;
GLuint
m_unUnitCellProgramID
;
GLuint
m_unBlendingProgramID
;
GLint
m_nSceneMatrixLocation
;
GLint
m_nBlendingIntLocation
;
...
...
@@ -1089,7 +1090,7 @@ void CMainApplication::RenderFrame()
//-----------------------------------------------------------------------------
bool
CMainApplication
::
CreateAllShaders
()
{
if
(
GL_NO_ERROR
!=
PrepareISOTransShader
(
&
m_unSceneProgramID
,
&
m_nSceneMatrixLocation
))
if
(
GL_NO_ERROR
!=
PrepareISOTransShader
(
&
m_unSceneProgramID
,
&
m_nSceneMatrixLocation
,
&
m_unBlendingProgramID
))
{
dprintf
(
"Error Preparing Transparency shader
\n
"
);
return
false
;
...
...
@@ -2666,6 +2667,7 @@ char * MainErrors [] = {
};
int
main
(
int
argc
,
char
*
argv
[])
{
TMPDIR
=
".
\\
"
;
//http://stackoverflow.com/questions/4991967/how-does-wsastartup-function-initiates-use-of-the-winsock-dll
WSADATA
wsaData
;
if
(
WSAStartup
(
0x202
,
&
wsaData
)
!=
0
)
...
...
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