Update of /cvsroot/jake2/jake2/src/jake2/render/fastjogl
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15958/src/jake2/render/fastjogl
Modified Files:
Mesh.java Surf.java
Log Message:
JVM executes this code faster, than the "i++" one.
Index: Mesh.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/render/fastjogl/Mesh.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** Mesh.java 7 May 2005 23:44:38 -0000 1.10
--- Mesh.java 8 Jun 2005 21:27:09 -0000 1.11
***************
*** 82,86 ****
| Defines.RF_SHELL_DOUBLE | Defines.RF_SHELL_HALF_DAM)) != 0) {
float[] normal;
! int j = -1;
for (int i=0 ; i < nverts; i++/* , v++, ov++, lerp+=4 */)
{
--- 82,86 ----
| Defines.RF_SHELL_DOUBLE | Defines.RF_SHELL_HALF_DAM)) != 0) {
float[] normal;
! int j = 0;
for (int i=0 ; i < nverts; i++/* , v++, ov++, lerp+=4 */)
{
***************
*** 88,105 ****
normal = r_avertexnormals[(vv >>> 24 ) & 0xFF];
ovv = ov[i];
! lerp.put(++j, move[0] + (ovv & 0xFF)* backv[0] + (vv & 0xFF) * frontv[0] + normal[0] * Defines.POWERSUIT_SCALE);
! lerp.put(++j, move[1] + ((ovv >>> 8) & 0xFF) * backv[1] + ((vv >>> 8) & 0xFF) * frontv[1] + normal[1] * Defines.POWERSUIT_SCALE);
! lerp.put(++j, move[2] + ((ovv >>> 16) & 0xFF) * backv[2] + ((vv >>> 16) & 0xFF) * frontv[2] + normal[2] * Defines.POWERSUIT_SCALE);
}
} else {
! int j = -1;
! for (int i=0 ; i < nverts; i++ /* , v++, ov++, lerp+=4 */)
{
ovv = ov[i];
vv = v[i];
! lerp.put(++j, move[0] + (ovv & 0xFF)* backv[0] + (vv & 0xFF)*frontv[0]);
! lerp.put(++j, move[1] + ((ovv >>> 8) & 0xFF)* backv[1] + ((vv >>> 8) & 0xFF)*frontv[1]);
! lerp.put(++j, move[2] + ((ovv >>> 16) & 0xFF)* backv[2] + ((vv >>> 16) & 0xFF)*frontv[2]);
}
}
--- 88,107 ----
normal = r_avertexnormals[(vv >>> 24 ) & 0xFF];
ovv = ov[i];
! lerp.put(j, move[0] + (ovv & 0xFF)* backv[0] + (vv & 0xFF) * frontv[0] + normal[0] * Defines.POWERSUIT_SCALE);
! lerp.put(j + 1, move[1] + ((ovv >>> 8) & 0xFF) * backv[1] + ((vv >>> 8) & 0xFF) * frontv[1] + normal[1] * Defines.POWERSUIT_SCALE);
! lerp.put(j + 2, move[2] + ((ovv >>> 16) & 0xFF) * backv[2] + ((vv >>> 16) & 0xFF) * frontv[2] + normal[2] * Defines.POWERSUIT_SCALE);
! j += 3;
}
} else {
! int j = 0;
! for (int i=0 ; i < nverts; i++/* , v++, ov++, lerp+=4 */)
{
ovv = ov[i];
vv = v[i];
! lerp.put(j, move[0] + (ovv & 0xFF)* backv[0] + (vv & 0xFF)*frontv[0]);
! lerp.put(j + 1, move[1] + ((ovv >>> 8) & 0xFF)* backv[1] + ((vv >>> 8) & 0xFF)*frontv[1]);
! lerp.put(j + 2, move[2] + ((ovv >>> 16) & 0xFF)* backv[2] + ((vv >>> 16) & 0xFF)*frontv[2]);
! j +=3;
}
}
***************
*** 202,209 ****
for (int i = 0; i < paliashdr.num_xyz; i++) {
l = shadedots[(verts[i] >>> 24 ) & 0xFF];
! color.put(j++, l * shadelight[0]);
! color.put(j++, l * shadelight[1]);
! color.put(j++, l * shadelight[2]);
! color.put(j++, alpha);
}
}
--- 204,212 ----
for (int i = 0; i < paliashdr.num_xyz; i++) {
l = shadedots[(verts[i] >>> 24 ) & 0xFF];
! color.put(j, l * shadelight[0]);
! color.put(j + 1, l * shadelight[1]);
! color.put(j + 2, l * shadelight[2]);
! color.put(j + 4, alpha);
! j += 4;
}
}
Index: Surf.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/render/fastjogl/Surf.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** Surf.java 17 Jan 2005 23:50:50 -0000 1.9
--- Surf.java 8 Jun 2005 21:27:09 -0000 1.10
***************
*** 925,937 ****
System
.arraycopy(vis, 0, fatvis, 0,
! (r_worldmodel.numleafs + 7) / 8);
vis = Mod_ClusterPVS(r_viewcluster2, r_worldmodel);
! c = (r_worldmodel.numleafs + 31) / 32;
! int k = 0;
! for (i = 0; i < c; i++) {
! fatvis[k] |= vis[k++];
! fatvis[k] |= vis[k++];
! fatvis[k] |= vis[k++];
! fatvis[k] |= vis[k++];
}
--- 925,937 ----
System
.arraycopy(vis, 0, fatvis, 0,
! (r_worldmodel.numleafs + 7) >> 3);
vis = Mod_ClusterPVS(r_viewcluster2, r_worldmodel);
! c = (r_worldmodel.numleafs + 31) >> 5;
! c <<= 2;
! for (int k = 0; k < c; k+=4) {
! fatvis[k] |= vis[k];
! fatvis[k + 1] |= vis[k + 1];
! fatvis[k + 2] |= vis[k + 2];
! fatvis[k + 3] |= vis[k + 3];
}
|
