admin/CSFML
1
0 Fork 0
mirror of https://github.com/SFML/CSFML.git synced 2026-10-27 13:36:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

Correct sfGlslBVec* members to sfBool from bool.

Browse Source 
Corrected sfShader_setBvec*Uniform()s accordingly.

Fixes #105.
This commit is contained in:
Alec Iverson committed 2016-09-30 09:11:52 -07:00
1 parent e4e1bcb139
commit 4e269cf863
2 files changed
+13 -13
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

include/SFML/Graphics/Glsl.h
+9 -9
View File
@@ -36,8 +36,8 @@ typedef sfVector2i sfGlslIvec2;
typedef struct typedef struct
{ {
bool x; sfBool x;
bool y; sfBool y;
} sfGlslBvec2; } sfGlslBvec2;
// 3D vectors // 3D vectors
@@ -52,9 +52,9 @@ typedef struct
typedef struct typedef struct
{ {
bool x; sfBool x;
bool y; sfBool y;
bool z; sfBool z;
} sfGlslBvec3; } sfGlslBvec3;
// 4D vectors // 4D vectors
@@ -76,10 +76,10 @@ typedef struct
typedef struct typedef struct
{ {
bool x; sfBool x;
bool y; sfBool y;
bool z; sfBool z;
bool w; sfBool w;
} sfGlslBvec4; } sfGlslBvec4;
// matrices // matrices
src/SFML/Graphics/Shader.cpp
+4 -4
View File
@@ -256,28 +256,28 @@ void sfShader_setIntColorUniform(sfShader* shader, const char* name, sfColor col
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
void sfShader_setBoolUniform(sfShader* shader, const char* name, sfBool x) void sfShader_setBoolUniform(sfShader* shader, const char* name, sfBool x)
{ {
CSFML_CALL(shader, setUniform(name, x)); CSFML_CALL(shader, setUniform(name, x != sfFalse));
} }
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
void sfShader_setBvec2Uniform(sfShader* shader, const char* name, sfGlslBvec2 vector) void sfShader_setBvec2Uniform(sfShader* shader, const char* name, sfGlslBvec2 vector)
{ {
CSFML_CALL(shader, setUniform(name, sf::Glsl::Bvec2(vector.x, vector.y))); CSFML_CALL(shader, setUniform(name, sf::Glsl::Bvec2(vector.x != sfFalse, vector.y != sfFalse)));
} }
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
void sfShader_setBvec3Uniform(sfShader* shader, const char* name, sfGlslBvec3 vector) void sfShader_setBvec3Uniform(sfShader* shader, const char* name, sfGlslBvec3 vector)
{ {
CSFML_CALL(shader, setUniform(name, sf::Glsl::Bvec3(vector.x, vector.y, vector.z))); CSFML_CALL(shader, setUniform(name, sf::Glsl::Bvec3(vector.x != sfFalse, vector.y != sfFalse, vector.z != sfFalse)));
} }
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
void sfShader_setBvec4Uniform(sfShader* shader, const char* name, sfGlslBvec4 vector) void sfShader_setBvec4Uniform(sfShader* shader, const char* name, sfGlslBvec4 vector)
{ {
CSFML_CALL(shader, setUniform(name, sf::Glsl::Bvec4(vector.x, vector.y, vector.z, vector.w))); CSFML_CALL(shader, setUniform(name, sf::Glsl::Bvec4(vector.x != sfFalse, vector.y != sfFalse, vector.z != sfFalse, vector.w != sfFalse)));
} }