Update of /cvsroot/jake2/jake2/src/jake2/render/fast
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv30611/src/jake2/render/fast
Modified Files:
Draw.java Image.java
Log Message:
"pics/" + name + ".pcx" removed;
do this only on loading and put the short name into the hash map
(much lesser String garbage)
Index: Image.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/render/fast/Image.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Image.java 15 Feb 2007 14:28:47 -0000 1.5
--- Image.java 12 May 2007 23:20:29 -0000 1.6
***************
*** 1452,1456 ****
image_t GL_FindImage(String name, int type) {
! if (name == null || name.length() < 5)
return null;
--- 1452,1456 ----
image_t GL_FindImage(String name, int type) {
! if (name == null || name.length() < 1)
return null;
***************
*** 1491,1497 ****
image = GL_LoadPic(name, pic, dim.width, dim.height, type, 32);
}
! imageCache.put(image.name, image);
return image;
}
--- 1491,1504 ----
image = GL_LoadPic(name, pic, dim.width, dim.height, type, 32);
+ } else {
+
+ pic = LoadPCX("pics/" + name + ".pcx", null, dim);
+ if (pic == null)
+ return null;
+ image = GL_LoadPic(name, pic, dim.width, dim.height, type, 8);
+
}
! imageCache.put(image.name, image);
return image;
}
Index: Draw.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/render/fast/Draw.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Draw.java 21 Nov 2006 00:50:46 -0000 1.2
--- Draw.java 12 May 2007 23:20:29 -0000 1.3
***************
*** 102,116 ****
*/
public image_t Draw_FindPic(String name) {
- image_t image = null;
- String fullname;
-
if (!name.startsWith("/") && !name.startsWith("\\"))
{
! fullname = "pics/" + name + ".pcx";
! image = GL_FindImage(fullname, it_pic);
} else {
! image = GL_FindImage(name.substring(1), it_pic);
}
- return image;
}
--- 102,111 ----
*/
public image_t Draw_FindPic(String name) {
if (!name.startsWith("/") && !name.startsWith("\\"))
{
! return GL_FindImage(name, it_pic);
} else {
! return GL_FindImage(name.substring(1), it_pic);
}
}
|
