goat3dgfx

diff src/gfxutil.cc @ 24:dc5918c62a64

find changesets by author, revision, files, or words in the commit message
broken: converting to resman
author John Tsiombikas <nuclear@member.fsf.org>
date Sat, 01 Mar 2014 22:04:29 +0200
parents 7d6b667821cf
children
line diff
     1.1 --- a/src/gfxutil.cc	Tue Feb 25 23:47:48 2014 +0200
     1.2 +++ b/src/gfxutil.cc	Sat Mar 01 22:04:29 2014 +0200
     1.3 @@ -10,7 +10,7 @@
     1.4  
     1.5  using namespace goatgfx;
     1.6  
     1.7 -void draw_rect(const Vector3 &v1, const Vector3 &v2, Texture2D *tex, ShaderProg *sdr)
     1.8 +void goatgfx::draw_rect(const Vector3 &v1, const Vector3 &v2, Texture *tex, ShaderProg *sdr)
     1.9  {
    1.10  	static ShaderProg *defsdr;
    1.11  
    1.12 @@ -29,7 +29,7 @@
    1.13  
    1.14  
    1.15  	if(tex) {
    1.16 -		set_texture(tex);
    1.17 +		bind_texture(tex);
    1.18  	}
    1.19  	if(sdr) {
    1.20  		sdr->bind();
    1.21 @@ -62,5 +62,5 @@
    1.22  	glDisableVertexAttribArray(MESH_ATTR_VERTEX);
    1.23  	glDisableVertexAttribArray(MESH_ATTR_TEXCOORD);
    1.24  
    1.25 -	set_texture(0);
    1.26 +	bind_texture(0);
    1.27  }