Commit 6fa17684 authored by Jan Möbius's avatar Jan Möbius
Browse files

Fixed mac build error by removing the double setters

git-svn-id: http://www.openflipper.org/svnrepo/OpenFlipper/branches/Free@17162 383ad7c9-94d9-4d36-a494-682f7c89f535
parent 6f7cf387
...@@ -426,20 +426,6 @@ namespace GLSL { ...@@ -426,20 +426,6 @@ namespace GLSL {
checkGLError(); checkGLError();
} }
/** \brief Set 4x4dMatrix uniform to specified value
*
* @param _name Name of the uniform
* @param _value Matrix to be set
* @param _transposed Is the matrix transposed?
*/
void Program::setUniform( const char *_name, const ACG::GLMatrixd &_value, bool _transposed){
checkGLError();
GLint location = glGetUniformLocation(this->m_programId, _name);
checkGLError2(_name);
glUniformMatrix4dv(location, 1, _transposed, _value.data());
checkGLError();
}
/** \brief Set 3x3fMatrix uniform to specified value /** \brief Set 3x3fMatrix uniform to specified value
* *
* @param _name Name of the uniform * @param _name Name of the uniform
...@@ -460,26 +446,6 @@ namespace GLSL { ...@@ -460,26 +446,6 @@ namespace GLSL {
checkGLError(); checkGLError();
} }
/** \brief Set 3x3dMatrix uniform to specified value
*
* @param _name Name of the uniform
* @param _value Matrix to be set
* @param _transposed Is the matrix transposed?
*/
void Program::setUniformMat3( const char *_name, const ACG::GLMatrixd &_value, bool _transposed){
checkGLError();
GLint location = glGetUniformLocation(this->m_programId, _name);
checkGLError2(_name);
double tmp[9];
for (int i = 0; i < 3; ++i)
for (int k = 0; k < 3; ++k)
tmp[i*3+k] = _value.data()[i*4+k];
glUniformMatrix3dv(location, 1, _transposed, tmp);
checkGLError();
}
/** \brief Bind attribute to name /** \brief Bind attribute to name
* *
* @param _index Index of the attribute to be bound * @param _index Index of the attribute to be bound
......
...@@ -184,9 +184,8 @@ namespace GLSL { ...@@ -184,9 +184,8 @@ namespace GLSL {
void setUniform(const char *_name, const ACG::GLMatrixf &_value, bool _transposed = false); void setUniform(const char *_name, const ACG::GLMatrixf &_value, bool _transposed = false);
void setUniform(const char *_name, const ACG::GLMatrixd &_value, bool _transposed = false);
void setUniformMat3(const char *_name, const ACG::GLMatrixf &_value, bool _transposed = false); void setUniformMat3(const char *_name, const ACG::GLMatrixf &_value, bool _transposed = false);
void setUniformMat3(const char *_name, const ACG::GLMatrixd &_value, bool _transposed = false);
void setUniform(const char *_name, GLint *_values, int _count); void setUniform(const char *_name, GLint *_values, int _count);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment