diff options
| author | Sven Gothel <[email protected]> | 2012-10-23 13:49:47 +0200 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2012-10-23 13:49:47 +0200 |
| commit | ed6d7f8ae4d8d5c01853fabb33eeaf91520091f8 (patch) | |
| tree | 1207e430e619e1644d34a24b2e133720a02c87b7 | |
| parent | 28204694f215520090a8422db2a7f0090943638d (diff) | |
Mesh.GL_DrawAliasFrameLerp() / Main.R_DrawParticles(): Re-enable EnableClientState(GL_VERTEX_ARRAY)
Jake2 authors commented out enabling the VERTEX_ARRAY client state since originally it won't get disabled.
However, using the ImmModeSink will disable it and hence missing objects will be the results.
| -rw-r--r-- | src/jake2/render/fast/Main.java | 4 | ||||
| -rw-r--r-- | src/jake2/render/fast/Mesh.java | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/jake2/render/fast/Main.java b/src/jake2/render/fast/Main.java index fee4267..5459f20 100644 --- a/src/jake2/render/fast/Main.java +++ b/src/jake2/render/fast/Main.java @@ -516,7 +516,7 @@ public abstract class Main extends Base { void R_DrawParticles() { if (gl_ext_pointparameters.value != 0.0f && qglPointParameterfEXT) { - //gl.gl.glEnableClientState(GL_VERTEX_ARRAY); + gl.glEnableClientState(GL_VERTEX_ARRAY); gl.glVertexPointer(3, 0, particle_t.vertexArray); gl.glEnableClientState(GL_COLOR_ARRAY); gl.glColorPointer(4, true, 0, particle_t.getColorAsByteBuffer()); @@ -529,7 +529,7 @@ public abstract class Main extends Base { gl.glDrawArrays(GL_POINTS, 0, r_newrefdef.num_particles); gl.glDisableClientState(GL_COLOR_ARRAY); - //gl.gl.glDisableClientState(GL_VERTEX_ARRAY); + //gl.glDisableClientState(GL_VERTEX_ARRAY); gl.glDisable(GL_BLEND); gl.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); diff --git a/src/jake2/render/fast/Mesh.java b/src/jake2/render/fast/Mesh.java index 8b61bbb..41f3ed7 100644 --- a/src/jake2/render/fast/Mesh.java +++ b/src/jake2/render/fast/Mesh.java @@ -192,7 +192,7 @@ public abstract class Mesh extends Light { GL_LerpVerts(paliashdr.num_xyz, ov, verts, move, frontv, backv); - // gl.gl.glEnableClientState( GL_VERTEX_ARRAY ); + gl.glEnableClientState( GL_VERTEX_ARRAY ); gl.glVertexPointer(3, 0, vertexArrayBuf); // PMM - added double damage shell @@ -223,7 +223,7 @@ public abstract class Mesh extends Light { gl.glClientActiveTextureARB(TEXTURE0); gl.glTexCoordPointer(2, 0, textureArrayBuf); - // gl.gl.glEnableClientState( GL_TEXTURE_COORD_ARRAY); + gl.glEnableClientState( GL_TEXTURE_COORD_ARRAY ); int pos = 0; int[] counts = paliashdr.counts; |