From: Carsten W. <ca...@us...> - 2005-10-24 21:02:47
|
Update of /cvsroot/jake2/jake2/src/jake2/render/jogl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11614/src/jake2/render/jogl Modified Files: Tag: render-refactoring Image.java Log Message: copy only what's needed Index: Image.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/render/jogl/Image.java,v retrieving revision 1.6.12.1 retrieving revision 1.6.12.2 diff -C2 -d -r1.6.12.1 -r1.6.12.2 *** Image.java 16 Jul 2005 18:25:37 -0000 1.6.12.1 --- Image.java 24 Oct 2005 21:02:27 -0000 1.6.12.2 *************** *** 1144,1148 **** } else { tex.clear(); ! tex.put(data).flip(); gl.glTexImage2D(GL_TEXTURE_2D, 0, comp, scaled_width, scaled_height, 0, GL_RGBA, --- 1144,1148 ---- } else { tex.clear(); ! tex.put(data, 0, scaled_width * scaled_height).flip(); gl.glTexImage2D(GL_TEXTURE_2D, 0, comp, scaled_width, scaled_height, 0, GL_RGBA, *************** *** 1171,1175 **** } else { tex.clear(); ! tex.put(scaled).flip(); gl.glTexImage2D(GL_TEXTURE_2D, 0, comp, scaled_width, scaled_height, 0, GL_RGBA, GL_UNSIGNED_BYTE, tex); --- 1171,1175 ---- } else { tex.clear(); ! tex.put(scaled, 0, scaled_width * scaled_height).flip(); gl.glTexImage2D(GL_TEXTURE_2D, 0, comp, scaled_width, scaled_height, 0, GL_RGBA, GL_UNSIGNED_BYTE, tex); *************** *** 1201,1205 **** } else { tex.clear(); ! tex.put(scaled).flip(); gl.glTexImage2D(GL_TEXTURE_2D, miplevel, comp, scaled_width, scaled_height, 0, GL_RGBA, --- 1201,1205 ---- } else { tex.clear(); ! tex.put(scaled, 0, scaled_width * scaled_height).flip(); gl.glTexImage2D(GL_TEXTURE_2D, miplevel, comp, scaled_width, scaled_height, 0, GL_RGBA, |