From dc39415eb842f02ae985d563be897a4aef9bfd56 Mon Sep 17 00:00:00 2001
From: David Williams <david@david-williams.info>
Date: Sat, 28 Mar 2009 00:21:13 +0000
Subject: [PATCH] Work on Qt version of example.

---
 examples/OpenGL/OpenGLWidget.cpp | 48 +++++++++++++++++++-------------
 examples/OpenGL/OpenGLWidget.h   |  8 ++++--
 2 files changed, 33 insertions(+), 23 deletions(-)

diff --git a/examples/OpenGL/OpenGLWidget.cpp b/examples/OpenGL/OpenGLWidget.cpp
index 8ec8416e..8217bfed 100644
--- a/examples/OpenGL/OpenGLWidget.cpp
+++ b/examples/OpenGL/OpenGLWidget.cpp
@@ -10,30 +10,32 @@ OpenGLWidget::OpenGLWidget(QWidget *parent)
 {
 	g_bUseOpenGLVertexBufferObjects = true;
 
-	
-
-	g_volData = new Volume<uint8>(g_uVolumeSideLength);
+	m_volData = new Volume<uint8>(g_uVolumeSideLength);
 
 	//Make our volume contain a sphere in the center.
 	uint16 minPos = 0;
-	uint16 midPos = g_volData->getSideLength() / 2;
-	uint16 maxPos = g_volData->getSideLength() - 1;
-	createCubeInVolume(*g_volData, Vector3DUint16(minPos, minPos, minPos), Vector3DUint16(maxPos, maxPos, maxPos), 0);
+	uint16 midPos = m_volData->getSideLength() / 2;
+	uint16 maxPos = m_volData->getSideLength() - 1;
+	createCubeInVolume(*m_volData, Vector3DUint16(minPos, minPos, minPos), Vector3DUint16(maxPos, maxPos, maxPos), 0);
 
-	createSphereInVolume(*g_volData, 50.0f, 5);
-	createSphereInVolume(*g_volData, 40.0f, 4);
-	createSphereInVolume(*g_volData, 30.0f, 3);
-	createSphereInVolume(*g_volData, 20.0f, 2);
-	createSphereInVolume(*g_volData, 10.0f, 1);	
+	createSphereInVolume(*m_volData, 50.0f, 5);
+	createSphereInVolume(*m_volData, 40.0f, 4);
+	createSphereInVolume(*m_volData, 30.0f, 3);
+	createSphereInVolume(*m_volData, 20.0f, 2);
+	createSphereInVolume(*m_volData, 10.0f, 1);	
 
-	createCubeInVolume(*g_volData, Vector3DUint16(minPos, minPos, minPos), Vector3DUint16(midPos-1, midPos-1, midPos-1), 0);
-	createCubeInVolume(*g_volData, Vector3DUint16(midPos+1, midPos+1, minPos), Vector3DUint16(maxPos, maxPos, midPos-1), 0);
-	createCubeInVolume(*g_volData, Vector3DUint16(midPos+1, minPos, midPos+1), Vector3DUint16(maxPos, midPos-1, maxPos), 0);
-	createCubeInVolume(*g_volData, Vector3DUint16(minPos, midPos+1, midPos+1), Vector3DUint16(midPos-1, maxPos, maxPos), 0);
+	createCubeInVolume(*m_volData, Vector3DUint16(minPos, minPos, minPos), Vector3DUint16(midPos-1, midPos-1, midPos-1), 0);
+	createCubeInVolume(*m_volData, Vector3DUint16(midPos+1, midPos+1, minPos), Vector3DUint16(maxPos, maxPos, midPos-1), 0);
+	createCubeInVolume(*m_volData, Vector3DUint16(midPos+1, minPos, midPos+1), Vector3DUint16(maxPos, midPos-1, maxPos), 0);
+	createCubeInVolume(*m_volData, Vector3DUint16(minPos, midPos+1, midPos+1), Vector3DUint16(midPos-1, maxPos, maxPos), 0);
 
 	
 }
 
+void OpenGLWidget::setVolume(PolyVox::Volume<PolyVox::uint8>* volData)
+{
+}
+
 void OpenGLWidget::initializeGL()
 {
 	if(g_bUseOpenGLVertexBufferObjects)
@@ -89,16 +91,21 @@ void OpenGLWidget::initializeGL()
 				Vector3DInt32 regUpperCorner(regionEndX, regionEndY, regionEndZ);
 
 				//Extract the surface for this region
-				extractReferenceSurface(g_volData, Region(regLowerCorner, regUpperCorner), ispCurrent);
+				extractReferenceSurface(m_volData, Region(regLowerCorner, regUpperCorner), ispCurrent);
 
 
+				Vector3DUint8 v3dRegPos(uRegionX,uRegionY,uRegionZ);
 				if(g_bUseOpenGLVertexBufferObjects)
 				{
-					g_openGLSurfacePatches[uRegionX][uRegionY][uRegionZ] = BuildOpenGLSurfacePatch(*ispCurrent);
+					//g_openGLSurfacePatches[uRegionX][uRegionY][uRegionZ] = BuildOpenGLSurfacePatch(*ispCurrent);
+					OpenGLSurfacePatch openGLSurfacePatch = BuildOpenGLSurfacePatch(*ispCurrent);					
+					m_mapOpenGLSurfacePatches.insert(make_pair(v3dRegPos, openGLSurfacePatch));
 				}
 				else
 				{
-					g_indexedSurfacePatches[uRegionX][uRegionY][uRegionZ] = ispCurrent;
+					//g_indexedSurfacePatches[uRegionX][uRegionY][uRegionZ] = ispCurrent;
+					//m_volIndexedSurfacePatches->setVoxelAt(uRegionX,uRegionY,uRegionZ,ispCurrent);
+					m_mapIndexedSurfacePatches.insert(make_pair(v3dRegPos, ispCurrent));
 				}
 				//delete ispCurrent;
 			}
@@ -142,13 +149,14 @@ void OpenGLWidget::paintGL()
 		{
 			for(uint16 uRegionX = 0; uRegionX < g_uVolumeSideLengthInRegions; ++uRegionX)
 			{
+				Vector3DUint8 v3dRegPos(uRegionX,uRegionY,uRegionZ);
 				if(g_bUseOpenGLVertexBufferObjects)
 				{
-					renderRegionVertexBufferObject(g_openGLSurfacePatches[uRegionX][uRegionY][uRegionZ]);
+					renderRegionVertexBufferObject(m_mapOpenGLSurfacePatches[v3dRegPos]);
 				}
 				else
 				{
-					IndexedSurfacePatch* ispCurrent = g_indexedSurfacePatches[uRegionX][uRegionY][uRegionZ];
+					IndexedSurfacePatch* ispCurrent = m_mapIndexedSurfacePatches[v3dRegPos];
 					renderRegionImmediateMode(*ispCurrent);
 
 				}
diff --git a/examples/OpenGL/OpenGLWidget.h b/examples/OpenGL/OpenGLWidget.h
index 4fb1c280..a0e7ed9d 100644
--- a/examples/OpenGL/OpenGLWidget.h
+++ b/examples/OpenGL/OpenGLWidget.h
@@ -28,6 +28,8 @@ class OpenGLWidget : public QGLWidget
  public:
      OpenGLWidget(QWidget *parent);
 
+	 void setVolume(PolyVox::Volume<PolyVox::uint8>* volData);
+
  protected:
      void initializeGL();
      void resizeGL(int w, int h);
@@ -38,11 +40,11 @@ class OpenGLWidget : public QGLWidget
 	 bool g_bUseOpenGLVertexBufferObjects;
 
 	 //Creates a volume 128x128x128
-	PolyVox::Volume<PolyVox::uint8>* g_volData;
+	PolyVox::Volume<PolyVox::uint8>* m_volData;
 
 	//Rather than storing one big mesh, the volume is broken into regions and a mesh is stored for each region
-	OpenGLSurfacePatch g_openGLSurfacePatches[g_uVolumeSideLengthInRegions][g_uVolumeSideLengthInRegions][g_uVolumeSideLengthInRegions];
-	PolyVox::IndexedSurfacePatch* g_indexedSurfacePatches[g_uVolumeSideLengthInRegions][g_uVolumeSideLengthInRegions][g_uVolumeSideLengthInRegions];
+	std::map<PolyVox::Vector3DUint8, OpenGLSurfacePatch> m_mapOpenGLSurfacePatches;
+	std::map<PolyVox::Vector3DUint8, PolyVox::IndexedSurfacePatch*> m_mapIndexedSurfacePatches;
  };
 
 #endif //__PolyVox_OpenGLWidget_H__
\ No newline at end of file