diff --git a/NOMADVRLib/atoms.cpp b/NOMADVRLib/atoms.cpp index 6d773b22c3f7e69b8d195bcb1bb0e4b42bd3532a..698e394c21eef18e117e01ccff398cebe1ea3885 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 7d86734b7552c5c23ddc256872a8bb57e5e4b117..4ee5af5b1b8b5d65cfb7b134db23006583dcee09 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)