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

Merge pull request #106 from dabbertorres/2.4

Browse Source 
Correct #105 and bump CMakeLists.txt version
This commit is contained in:
Laurent Gomila authored and GitHub committed 2016-10-01 09:15:20 +02:00
2 parents e4e1bcb139 6ec6c104a8
commit 2017578197
3 files changed
+14 -14
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

CMakeLists.txt
+1 -1
View File
@@ -21,7 +21,7 @@ include(${CMAKE_SOURCE_DIR}/cmake/Config.cmake)
# setup version numbers # setup version numbers
set(VERSION_MAJOR 2) set(VERSION_MAJOR 2)
set(VERSION_MINOR 3) set(VERSION_MINOR 4)
set(VERSION_PATCH 0) set(VERSION_PATCH 0)
# add the CSFML header path # add the CSFML header path
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)));
} }