Update of /cvsroot/jake2/jake2/src/jake2/render/lwjgl
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2095/src/jake2/render/lwjgl
Modified Files:
Tag: RST
Mesh.java Model.java
Log Message:
merged from head
Index: Model.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/render/lwjgl/Model.java,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -C2 -d -r1.3.2.1 -r1.3.2.2
*** Model.java 16 Jan 2005 21:21:08 -0000 1.3.2.1
--- Model.java 30 Jan 2005 19:47:21 -0000 1.3.2.2
***************
*** 1336,1339 ****
--- 1336,1340 ----
model.vertexIndexBuf.position(pos);
model.indexElements[i] = model.vertexIndexBuf.slice();
+ model.indexElements[i].limit(count);
pos += count;
}
Index: Mesh.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/render/lwjgl/Mesh.java,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -C2 -d -r1.2.2.1 -r1.2.2.2
*** Mesh.java 23 Jan 2005 21:31:49 -0000 1.2.2.1
--- Mesh.java 30 Jan 2005 19:47:21 -0000 1.2.2.2
***************
*** 217,221 ****
FloatBuffer srcTextureCoords = paliashdr.textureCoordBuf;
- int size = 0;
int dstIndex = 0;
int srcIndex = 0;
--- 217,220 ----
***************
*** 235,251 ****
count = -count;
}
! size = count + pos;
! srcIndex = 2 * pos;
! for (int k = pos; k < size; k++) {
! dstIndex = 2 * srcIndexBuf.get(k-pos);
dstTextureCoords.put(dstIndex++, srcTextureCoords.get(srcIndex++));
dstTextureCoords.put(dstIndex, srcTextureCoords.get(srcIndex++));
}
- int limit=srcIndexBuf.limit();
- srcIndexBuf.limit(count);
gl.glDrawElements(mode, srcIndexBuf);
- srcIndexBuf.limit(limit);
-
pos += count;
}
--- 234,245 ----
count = -count;
}
! srcIndex = pos << 1;
! for (int k = 0; k < count; k++) {
! dstIndex = srcIndexBuf.get(k) << 1;
dstTextureCoords.put(dstIndex++, srcTextureCoords.get(srcIndex++));
dstTextureCoords.put(dstIndex, srcTextureCoords.get(srcIndex++));
}
gl.glDrawElements(mode, srcIndexBuf);
pos += count;
}
|
