diff options
| -rw-r--r-- | src/jake2/render/fastjogl/Surf.java | 10 | ||||
| -rw-r--r-- | src/jake2/render/jogl/Surf.java | 12 |
2 files changed, 9 insertions, 13 deletions
diff --git a/src/jake2/render/fastjogl/Surf.java b/src/jake2/render/fastjogl/Surf.java index c7e7bc0..2bb812c 100644 --- a/src/jake2/render/fastjogl/Surf.java +++ b/src/jake2/render/fastjogl/Surf.java @@ -2,7 +2,7 @@ * Surf.java * Copyright (C) 2003 * - * $Id: Surf.java,v 1.1 2004-07-09 06:50:48 hzi Exp $ + * $Id: Surf.java,v 1.2 2004-07-12 18:19:42 hzi Exp $ */ /* Copyright (C) 1997-2001 Id Software, Inc. @@ -911,6 +911,9 @@ public abstract class Surf extends Draw { void R_DrawWorld() { entity_t ent = new entity_t(); + // auto cycle the world frame for texture animation + ent.frame = (int)(r_newrefdef.time*2); + currententity = ent; if (r_drawworld.value == 0) return; @@ -922,11 +925,6 @@ public abstract class Surf extends Draw { Math3D.VectorCopy(r_newrefdef.vieworg, modelorg); - // auto cycle the world frame for texture animation - // memset (&ent, 0, sizeof(ent)); - ent.frame = (int)(r_newrefdef.time*2); - currententity = ent; - gl_state.currenttextures[0] = gl_state.currenttextures[1] = -1; gl.glColor3f (1,1,1); diff --git a/src/jake2/render/jogl/Surf.java b/src/jake2/render/jogl/Surf.java index 54e0e77..e4d0101 100644 --- a/src/jake2/render/jogl/Surf.java +++ b/src/jake2/render/jogl/Surf.java @@ -2,7 +2,7 @@ * Surf.java * Copyright (C) 2003 * - * $Id: Surf.java,v 1.3 2004-07-09 06:50:48 hzi Exp $ + * $Id: Surf.java,v 1.4 2004-07-12 18:19:42 hzi Exp $ */ /* Copyright (C) 1997-2001 Id Software, Inc. @@ -1204,7 +1204,10 @@ public abstract class Surf extends Draw { void R_DrawWorld() { entity_t ent = new entity_t(); - + // auto cycle the world frame for texture animation + ent.frame = (int)(r_newrefdef.time*2); + currententity = ent; + if (r_drawworld.value == 0) return; @@ -1215,11 +1218,6 @@ public abstract class Surf extends Draw { Math3D.VectorCopy(r_newrefdef.vieworg, modelorg); - // auto cycle the world frame for texture animation - // memset (&ent, 0, sizeof(ent)); - ent.frame = (int)(r_newrefdef.time*2); - currententity = ent; - gl_state.currenttextures[0] = gl_state.currenttextures[1] = -1; gl.glColor3f (1,1,1); |