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

Silence some doxygen warnings

git-svn-id: http://www.openflipper.org/svnrepo/OpenFlipper/branches/Free@17539 383ad7c9-94d9-4d36-a494-682f7c89f535
parent 2ea96724
......@@ -160,7 +160,7 @@ void ScreenQuad::intDraw (GLSL::Program* _prog)
decl_->deactivateFixedFunction();
}
void ScreenQuad::drawTexture2D( GLuint _texture, const Vec2f& offset /*= Vec2f(0.0f, 0.0f)*/, const Vec2f& size /*= Vec2f(1.0f, 1.0f)*/ )
void ScreenQuad::drawTexture2D( GLuint _texture, const Vec2f& _offset /*= Vec2f(0.0f, 0.0f)*/, const Vec2f& _size /*= Vec2f(1.0f, 1.0f)*/ )
{
ScreenQuad& quad = instance();
......@@ -178,8 +178,8 @@ void ScreenQuad::drawTexture2D( GLuint _texture, const Vec2f& offset /*= Vec2f(0
quad.texDrawProg_->setUniform("Tex", 0); // texslot 0
quad.texDrawProg_->setUniform("offset", offset);
quad.texDrawProg_->setUniform("size", size);
quad.texDrawProg_->setUniform("offset", _offset);
quad.texDrawProg_->setUniform("size", _size);
quad.intDraw(quad.texDrawProg_);
......
......@@ -90,10 +90,13 @@ public:
/** \brief Draw a 2D texture to screen
*
* Useful for debugging, copying a texture..
* @param _prog GLSL shader to bind attribute id's if needed. Pass null-pointer for fixed function rendering
*
* @param _texture Texture that should be bound when drawing the quad
* @param _offset Offset passed to the uniform called offset in the shader
* @param _size Size passed to the uniform called size in the shader
*/
static void drawTexture2D(GLuint _texture, const Vec2f& offset = Vec2f(0.0f, 0.0f),
const Vec2f& size = Vec2f(1.0f, 1.0f));
static void drawTexture2D(GLuint _texture, const Vec2f& _offset = Vec2f(0.0f, 0.0f),
const Vec2f& _size = Vec2f(1.0f, 1.0f));
private:
......
Markdown is supported
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