Scarfski/assimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixing bugs related to 64-bit upgrade in materials

Browse Source
This commit is contained in:
Chris Russ
2016-07-17 09:49:28 +10:00
parent cc16d4a0db
commit 63a4591683
10 changed files with 90 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
samples/SimpleTexturedOpenGL/SimpleTexturedOpenGL/src/model_loading.cpp
View File

@@ -142,13 +142,13 @@ bool Import3DFromFile( const std::string& pFile)
}
// Resize And Initialize The GL Window
void ReSizeGLScene(GLsizei width, GLsizei height)
void ReSizeGLScene(GLsizei width, GLsizei height)
{
// Prevent A Divide By Zero By
if (height==0)
if (height==0)
{
// Making Height Equal One
height=1;
height=1;
}
glViewport(0, 0, width, height); // Reset The Current Viewport
@@ -236,7 +236,7 @@ int LoadGLTextures(const aiScene* scene)
if (success) /* If no error occurred: */
{
// Convert every colour component into unsigned byte.If your image contains
// Convert every colour component into unsigned byte.If your image contains
// alpha channel you can replace IL_RGB with IL_RGBA
success = ilConvertImage(IL_RGB, IL_UNSIGNED_BYTE);
if (!success)
@@ -246,7 +246,7 @@ int LoadGLTextures(const aiScene* scene)
return -1;
}
// Binding of texture name
glBindTexture(GL_TEXTURE_2D, textureIds[i]);
glBindTexture(GL_TEXTURE_2D, textureIds[i]);
// redefine standard texture values
// We will use linear interpolation for magnification filter
glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR );
@@ -255,7 +255,7 @@ int LoadGLTextures(const aiScene* scene)
// Texture specification
glTexImage2D(GL_TEXTURE_2D, 0, ilGetInteger(IL_IMAGE_BPP), ilGetInteger(IL_IMAGE_WIDTH),
ilGetInteger(IL_IMAGE_HEIGHT), 0, ilGetInteger(IL_IMAGE_FORMAT), GL_UNSIGNED_BYTE,
ilGetData());
ilGetData());
// we also want to be able to deal with odd texture dimensions
glPixelStorei( GL_UNPACK_ALIGNMENT, 1 );
glPixelStorei( GL_UNPACK_ROW_LENGTH, 0 );
@@ -269,7 +269,7 @@ int LoadGLTextures(const aiScene* scene)
}
}
// Because we have already copied image data into texture data we can release memory used by image.
ilDeleteImages(numTextures, imageIds);
ilDeleteImages(numTextures, imageIds);
// Cleanup
delete [] imageIds;
@@ -342,7 +342,7 @@ void apply_material(const aiMaterial *mtl)
aiColor4D specular;
aiColor4D ambient;
aiColor4D emission;
float shininess, strength;
ai_real shininess, strength;
int two_sided;
int wireframe;
unsigned int max; // changed: to unsigned