sid/NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into Particle-Update

Browse Source 
Former-commit-id: 8b2a22ff4546805cdbae394df3cdcdf4228198e5
This commit is contained in:
Lynix
2014-09-03 13:37:39 +02:00
parent 659eb31757 ce2aa91b32
commit 023e41512f
9 changed files with 84 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Nazara/Graphics/SkyboxBackground.cpp
View File

@@ -87,7 +87,7 @@ namespace
"void main()\n"
"{\n"
" gl_Position = WorldViewProjMatrix * vec4(VertexPosition, 1.0);\n"
" vTexCoord = vec3(VertexPosition.x, -VertexPosition.y, -VertexPosition.z);\n"
" vTexCoord = vec3(VertexPosition.x, VertexPosition.y, -VertexPosition.z);\n"
"}\n";
const char* vertexSource140 =
@@ -102,7 +102,7 @@ namespace
"void main()\n"
"{\n"
" gl_Position = WorldViewProjMatrix * vec4(VertexPosition, 1.0);\n"
" vTexCoord = vec3(VertexPosition.x, -VertexPosition.y, -VertexPosition.z);\n"
" vTexCoord = vec3(VertexPosition.x, VertexPosition.y, -VertexPosition.z);\n"
"}\n";
///TODO: Remplacer ça par des ShaderNode

4
src/Nazara/Renderer/OpenGL.cpp
View File

@@ -1941,8 +1941,8 @@ GLenum NzOpenGL::CubemapFace[] =
{
GL_TEXTURE_CUBE_MAP_POSITIVE_X, // nzCubemapFace_PositiveX
GL_TEXTURE_CUBE_MAP_NEGATIVE_X, // nzCubemapFace_NegativeX
GL_TEXTURE_CUBE_MAP_NEGATIVE_Y, // nzCubemapFace_PositiveY (Inversion pour les standards OpenGL)
GL_TEXTURE_CUBE_MAP_POSITIVE_Y, // nzCubemapFace_NegativeY (Inversion pour les standards OpenGL)
GL_TEXTURE_CUBE_MAP_POSITIVE_Y, // nzCubemapFace_PositiveY
GL_TEXTURE_CUBE_MAP_NEGATIVE_Y, // nzCubemapFace_NegativeY
GL_TEXTURE_CUBE_MAP_POSITIVE_Z, // nzCubemapFace_PositiveZ
GL_TEXTURE_CUBE_MAP_NEGATIVE_Z // nzCubemapFace_NegativeZ
};

4
src/Nazara/Utility/Loaders/PCX/Loader.cpp
View File

@@ -287,7 +287,7 @@ namespace
/* for each color plane */
for (int c = 0; c < 3; ++c)
{
nzUInt8* ptr = &pixels[y * width * 4];
nzUInt8* ptr = &pixels[y * width * 3];
int bytes = header.bytesPerScanLine;
/* decode line number y */
@@ -324,7 +324,7 @@ namespace
}
default:
NazaraError("Failed to load " + NzString::Number(bitCount) + " bitcount pcx files");
NazaraError("Unsupported " + NzString::Number(bitCount) + " bitcount for pcx files");
return false;
}