Commit b451f394 authored by Robert Menzel's avatar Robert Menzel

now supports C++ pre C++11

parent f3c037c1
...@@ -144,7 +144,7 @@ public: ...@@ -144,7 +144,7 @@ public:
void renderDistorted( ACGL::OpenGL::ConstSharedTexture2D _sideBySideTexture ); void renderDistorted( ACGL::OpenGL::ConstSharedTexture2D _sideBySideTexture );
void renderDistorted( ACGL::OpenGL::ConstSharedTexture2D _leftTexture, ACGL::OpenGL::ConstSharedTexture2D _rightTexture ); void renderDistorted( ACGL::OpenGL::ConstSharedTexture2D _leftTexture, ACGL::OpenGL::ConstSharedTexture2D _rightTexture );
void renderDistorted( ACGL::OpenGL::ConstSharedShaderProgram _program ); void renderDistortedP( ACGL::OpenGL::ConstSharedShaderProgram _program );
bool getSuccessfulConnected() { return mSuccessfulConnected; } bool getSuccessfulConnected() { return mSuccessfulConnected; }
......
...@@ -315,7 +315,7 @@ public: ...@@ -315,7 +315,7 @@ public:
inline void drawRangeElements( GLuint start, inline void drawRangeElements( GLuint start,
GLsizei count ) GLsizei count )
{ {
glDrawRangeElements( mMode, start, getIndexCount(), count, getIndexType(), nullptr); glDrawRangeElements( mMode, start, getIndexCount(), count, getIndexType(), NULL);
} }
#if (ACGL_OPENGL_VERSION >= 32) #if (ACGL_OPENGL_VERSION >= 32)
......
...@@ -643,7 +643,7 @@ void SimpleRiftController::renderDistorted( OpenGL::ConstSharedTexture2D _sideBy ...@@ -643,7 +643,7 @@ void SimpleRiftController::renderDistorted( OpenGL::ConstSharedTexture2D _sideBy
mDistortShaderSideBySide->use(); mDistortShaderSideBySide->use();
mDistortShaderSideBySide->setTexture("uSamplerColor", _sideBySideTexture, 0 ); mDistortShaderSideBySide->setTexture("uSamplerColor", _sideBySideTexture, 0 );
renderDistorted( mDistortShaderSideBySide ); renderDistortedP( mDistortShaderSideBySide );
} }
void SimpleRiftController::renderDistorted( OpenGL::ConstSharedTexture2D _leftTexture, OpenGL::ConstSharedTexture2D _rightTexture ) void SimpleRiftController::renderDistorted( OpenGL::ConstSharedTexture2D _leftTexture, OpenGL::ConstSharedTexture2D _rightTexture )
...@@ -693,10 +693,10 @@ void SimpleRiftController::renderDistorted( OpenGL::ConstSharedTexture2D _leftTe ...@@ -693,10 +693,10 @@ void SimpleRiftController::renderDistorted( OpenGL::ConstSharedTexture2D _leftTe
mDistortShaderTwoTextures->setTexture("uSamplerColorLeft", _leftTexture, 0 ); mDistortShaderTwoTextures->setTexture("uSamplerColorLeft", _leftTexture, 0 );
mDistortShaderTwoTextures->setTexture("uSamplerColorRight", _rightTexture, 1 ); mDistortShaderTwoTextures->setTexture("uSamplerColorRight", _rightTexture, 1 );
renderDistorted( mDistortShaderTwoTextures ); renderDistortedP( mDistortShaderTwoTextures );
} }
void SimpleRiftController::renderDistorted( ACGL::OpenGL::ConstSharedShaderProgram _program ) void SimpleRiftController::renderDistortedP( ACGL::OpenGL::ConstSharedShaderProgram _program )
{ {
// if the user defined an output size, use that, otherwise default to the Rifts size: // if the user defined an output size, use that, otherwise default to the Rifts size:
glm::uvec2 windowSize = mOutputViewport; glm::uvec2 windowSize = mOutputViewport;
......
...@@ -64,7 +64,7 @@ std::map<std::string,TextureLoadFuncPtr> textureLoadFunctions = std::map<std::st ...@@ -64,7 +64,7 @@ std::map<std::string,TextureLoadFuncPtr> textureLoadFunctions = std::map<std::st
void registerTextureLoadFunction(std::vector<std::string> _endings, TextureLoadFuncPtr _function) void registerTextureLoadFunction(std::vector<std::string> _endings, TextureLoadFuncPtr _function)
{ {
if(_function != nullptr) if(_function != NULL)
{ {
std::vector<std::string>::iterator n = _endings.end(); std::vector<std::string>::iterator n = _endings.end();
for(std::vector<std::string>::iterator i = _endings.begin() ; i != n ; i++ ) for(std::vector<std::string>::iterator i = _endings.begin() ; i != n ; i++ )
...@@ -183,7 +183,7 @@ public: ...@@ -183,7 +183,7 @@ public:
{ {
std::stringstream errorMsg; std::stringstream errorMsg;
errorMsg << "LodePNG error while loading file " << _filename << " - " << errorCode << ": " << lodepng_error_text(errorCode); errorMsg << "LodePNG error while loading file " << _filename << " - " << errorCode << ": " << lodepng_error_text(errorCode);
mData = nullptr; mData = NULL;
throw std::runtime_error(errorMsg.str()); throw std::runtime_error(errorMsg.str());
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment