Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6711 from ricardoquesada/indent_issues 

fixes more indentation issues
This commit is contained in:
Ricardo Quesada 2014-05-13 00:10:30 -07:00
parent 58fd1a05b3 8aea6fe89f
commit cd194cad9f
1 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
cocos/renderer/CCGLProgramState.h
View File

@ -54,12 +54,12 @@ public:
UniformValue(Uniform *uniform, GLProgram* glprogram); UniformValue(Uniform *uniform, GLProgram* glprogram);
~UniformValue(); ~UniformValue();
void setFloat(float value); void setFloat(float value);
void setInt(int value); void setInt(int value);
void setVec2(const Vector2& value); void setVec2(const Vector2& value);
void setVec3(const Vector3& value); void setVec3(const Vector3& value);
void setVec4(const Vector4& value); void setVec4(const Vector4& value);
void setMat4(const Matrix& value); void setMat4(const Matrix& value);
void setCallback(const std::function<void(Uniform*)> &callback); void setCallback(const std::function<void(Uniform*)> &callback);
void setTexture(GLuint textureId, GLuint activeTexture); void setTexture(GLuint textureId, GLuint activeTexture);
@ -71,17 +71,17 @@ protected:
bool _useCallback; bool _useCallback;
union U{ union U{
float floatValue; float floatValue;
int intValue; int intValue;
float v2Value[2]; float v2Value[2];
float v3Value[3]; float v3Value[3];
float v4Value[4]; float v4Value[4];
float matrixValue[16]; float matrixValue[16];
struct { struct {
GLuint textureId; GLuint textureId;
GLuint textureUnit; GLuint textureUnit;
} tex; } tex;
std::function<void(Uniform*)> *callback; std::function<void(Uniform*)> *callback;
U() { memset( this, 0, sizeof(*this) ); } U() { memset( this, 0, sizeof(*this) ); }
~U(){} ~U(){}
@ -168,12 +168,12 @@ public:
// user defined uniforms // user defined uniforms
ssize_t getUniformCount() const { return _uniforms.size(); } ssize_t getUniformCount() const { return _uniforms.size(); }
void setUniformInt(const std::string &uniformName, int value); void setUniformInt(const std::string &uniformName, int value);
void setUniformFloat(const std::string &uniformName, float value); void setUniformFloat(const std::string &uniformName, float value);
void setUniformVec2(const std::string &uniformName, const Vector2& value); void setUniformVec2(const std::string &uniformName, const Vector2& value);
void setUniformVec3(const std::string &uniformName, const Vector3& value); void setUniformVec3(const std::string &uniformName, const Vector3& value);
void setUniformVec4(const std::string &uniformName, const Vector4& value); void setUniformVec4(const std::string &uniformName, const Vector4& value);
void setUniformMat4(const std::string &uniformName, const Matrix& value); void setUniformMat4(const std::string &uniformName, const Matrix& value);
void setUniformCallback(const std::string &uniformName, const std::function<void(Uniform*)> &callback); void setUniformCallback(const std::string &uniformName, const std::function<void(Uniform*)> &callback);
void setUniformTexture(const std::string &uniformName, Texture2D *texture); void setUniformTexture(const std::string &uniformName, Texture2D *texture);
void setUniformTexture(const std::string &uniformName, GLuint textureId); void setUniformTexture(const std::string &uniformName, GLuint textureId);