From b991aadfa2d5edf3091d9a73a6395f676a8a847a Mon Sep 17 00:00:00 2001
From: "Garcia-Hernandez, Ruben Jesus (rgarcia)" <garcia@lrz.de>
Date: Fri, 21 Apr 2017 18:45:48 +0200
Subject: [PATCH] Proper directory separator both in windows and linux
---
NOMADVRLib/atoms.cpp | 10 +++++-----
OpenVR/TimestepData/hellovr_opengl_main.cpp | 4 +++-
2 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/NOMADVRLib/atoms.cpp b/NOMADVRLib/atoms.cpp
index 6d773b2..698e394 100644
--- a/NOMADVRLib/atoms.cpp
+++ b/NOMADVRLib/atoms.cpp
@@ -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
diff --git a/OpenVR/TimestepData/hellovr_opengl_main.cpp b/OpenVR/TimestepData/hellovr_opengl_main.cpp
index 7d86734..4ee5af5 100644
--- a/OpenVR/TimestepData/hellovr_opengl_main.cpp
+++ b/OpenVR/TimestepData/hellovr_opengl_main.cpp
@@ -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)
--
GitLab