Merged changes from dev-1_4 branch into the main trunk.

NOTE: all 1.4 development will now proceed on the main trunk. The dev-1_4 branch is closed.


git-svn-id: https://svn.java.net/svn/j3d-core~svn/trunk@445 ba19aa83-45c5-6ac9-afd3-db810772062c

1 files changed, 9 insertions, 2 deletions

diff --git a/src/native/d3d/D3dVertexBuffer.hpp b/src/native/d3d/D3dVertexBuffer.hpp
index cef8f4a..4cb6b9e 100644
--- a/src/native/d3d/D3dVertexBuffer.hpp
+++ b/src/native/d3d/D3dVertexBuffer.hpp
@@ -22,15 +22,17 @@ class D3dVertexBuffer;
 typedef D3dVertexBuffer* LPD3DVERTEXBUFFER;
 typedef vector<LPD3DVERTEXBUFFER> D3dVertexBufferVector;
 
+//ISSUE 135 iterator for D3dVertexBuffer
+typedef vector<LPD3DVERTEXBUFFER>::iterator ITER_LPD3DVERTEXBUFFER;
 
 class D3dVertexBuffer {
 public:
 
     // Actual buffer memory to hold all the vertices
-    LPDIRECT3DVERTEXBUFFER8 buffer;
+    LPDIRECT3DVERTEXBUFFER9 buffer;
 
     // Indexed buffer for rendering IndexedGeometry
-    LPDIRECT3DINDEXBUFFER8 indexBuffer;
+    LPDIRECT3DINDEXBUFFER9 indexBuffer;
 
     // D3D type of this Vertex Buffer
     D3DPRIMITIVETYPE        primitiveType;
@@ -56,6 +58,11 @@ public:
     // compute from above vertexFormat
     UINT                    stride;
 
+	UINT                    numCoorTexSupported;
+
+
+
+
     // Number of strips used for StripGeometryArray
     // For each strip i the number of vertex is
     // numVertices[i]