Commit 5a849c11 authored by Lars Krecklau's avatar Lars Krecklau
Browse files

Changed primitive int types in the texture to the correct OpenGL types and...

Changed primitive int types in the texture to the correct OpenGL types and fixed the initialization list of the jpg controller
parent b6d7c160
......@@ -26,7 +26,10 @@ public:
: Resource::FileController<Texture>(_filename, Base::Settings::the()->getFullTexturePath()),
mMinFilter(0),
mMagFilter(0),
mAnisotropicFilter(0.0)
mAnisotropicFilter(0.0),
mWrapS(0),
mWrapT(0),
mWrapR(0)
{}
virtual ~TextureControlFileJPG(void) {}
......
......@@ -274,7 +274,7 @@ public:
mType,
_pData);
if (openGLCriticalErrorOccured() ) {
ACGL::Utils::error() << "could not generate texture!d" << std::endl;
ACGL::Utils::error() << "could not generate texture!" << std::endl;
}
}
......@@ -307,10 +307,10 @@ public:
//! Note: The function is not const, because it changes the corresponding GPU data
inline void setSubImageData2D(
const GLvoid* _pData,
int _x,
int _y,
int _width,
int _height)
GLint _x,
GLint _y,
GLsizei _width,
GLsizei _height)
{
glBindTexture(mTarget, mObjectName);
glTexSubImage2D(
......@@ -329,12 +329,12 @@ public:
//! Note: The function is not const, because it changes the corresponding GPU data
inline void setSubImageData3D(
const GLvoid* _pData,
int _x,
int _y,
int _z,
int _width,
int _height,
int _depth)
GLint _x,
GLint _y,
GLint _z,
GLsizei _width,
GLsizei _height,
GLsizei _depth)
{
glBindTexture(mTarget, mObjectName);
glTexSubImage3D(
......
Supports Markdown
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