[Jake2-commits] jake2/src/jake2/render/fastjogl Mesh.java,1.6.6.1,1.6.6.2 Model.java,1.5.6.1,1.5.6.2

[Rene S. <sa...@us...>]

Update of /cvsroot/jake2/jake2/src/jake2/render/fastjogl
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2095/src/jake2/render/fastjogl

Modified Files:
      Tag: RST
	Mesh.java Model.java 
Log Message:
merged from head

Index: Model.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/render/fastjogl/Model.java,v
retrieving revision 1.5.6.1
retrieving revision 1.5.6.2
diff -C2 -d -r1.5.6.1 -r1.5.6.2
*** Model.java	16 Jan 2005 21:21:04 -0000	1.5.6.1
--- Model.java	30 Jan 2005 19:47:32 -0000	1.5.6.2
***************
*** 1238,1241 ****
--- 1238,1242 ----
              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/fastjogl/Mesh.java,v
retrieving revision 1.6.6.1
retrieving revision 1.6.6.2
diff -C2 -d -r1.6.6.1 -r1.6.6.2
*** Mesh.java	16 Jan 2005 21:21:04 -0000	1.6.6.1
--- Mesh.java	30 Jan 2005 19:47:32 -0000	1.6.6.2
***************
*** 227,231 ****
          FloatBuffer srcTextureCoords = paliashdr.textureCoordBuf;
  
-         int size = 0;
          int dstIndex = 0;
          int srcIndex = 0;
--- 227,230 ----
***************
*** 245,252 ****
                  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++));
--- 244,250 ----
                  count = -count;
              }
!             srcIndex = pos << 1;
!             for (int k = 0; k < count; k++) {
!                 dstIndex = srcIndexBuf.get(k) << 1;
                  dstTextureCoords.put(dstIndex++, srcTextureCoords
                          .get(srcIndex++));