Skip to content

Commit

Permalink
Merge pull request #168 from uPiscium/develop
Browse files Browse the repository at this point in the history
Fix "BlendingFunction" spelling.
  • Loading branch information
uPiscium authored Dec 16, 2024
2 parents 24a1bfb + 2e1586b commit 15c5251
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions impls/shader.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,8 @@ Shader::~Shader() {
}
}

void Shader::SetBlending(BlendingFuntion const &src,
BlendingFuntion const &dst) {
void Shader::SetBlending(BlendingFunction const &src,
BlendingFunction const &dst) {
mOption.src = src;
mOption.dst = dst;
}
Expand Down
2 changes: 1 addition & 1 deletion includes/defines.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ enum class BufferType {
};

// Use to select blending function.
enum class BlendingFuntion {
enum class BlendingFunction {
ZERO = GL_ZERO,
ONE = GL_ONE,
SRC_COLOR = GL_SRC_COLOR,
Expand Down
6 changes: 3 additions & 3 deletions includes/shader.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ struct ShaderOption {
Bool depth = true;
Bool scissor = false;
Bool stencil = false;
BlendingFuntion src = BlendingFuntion::SRC_ALPHA;
BlendingFuntion dst = BlendingFuntion::ONE_MINUS_SRC_ALPHA;
BlendingFunction src = BlendingFunction::SRC_ALPHA;
BlendingFunction dst = BlendingFunction::ONE_MINUS_SRC_ALPHA;
CullingFace cullFace = CullingFace::BACK;
CullingMode frontFace = CullingMode::CCW;
DepthFunction depthFunc = DepthFunction::LESS;
Expand Down Expand Up @@ -201,7 +201,7 @@ class Shader final : public TerreateObjectBase {
* @param: src: source blending function
* @param: dst: destination blending function
*/
void SetBlending(BlendingFuntion const &src, BlendingFuntion const &dst);
void SetBlending(BlendingFunction const &src, BlendingFunction const &dst);
/*
* @brief: Setter for culling face.
* @param: face: face to cull
Expand Down

0 comments on commit 15c5251

Please sign in to comment.