From d34fd6b3c8d42b4ca1f3ebb9a909820ee99c89cd Mon Sep 17 00:00:00 2001 From: David Williams Date: Fri, 23 May 2014 22:11:47 +0200 Subject: [PATCH] Moved OpenGLWidget into common folder so it can be used by other examples. --- examples/Basic/CMakeLists.txt | 2 +- examples/Basic/main.cpp | 8 ++++---- examples/{Basic => common}/OpenGLWidget.cpp | 0 examples/{Basic => common}/OpenGLWidget.h | 0 4 files changed, 5 insertions(+), 5 deletions(-) rename examples/{Basic => common}/OpenGLWidget.cpp (100%) rename examples/{Basic => common}/OpenGLWidget.h (100%) diff --git a/examples/Basic/CMakeLists.txt b/examples/Basic/CMakeLists.txt index 02e203d2..30ca5f3e 100644 --- a/examples/Basic/CMakeLists.txt +++ b/examples/Basic/CMakeLists.txt @@ -26,7 +26,7 @@ PROJECT(BasicExample) #Projects source files SET(SRC_FILES main.cpp - OpenGLWidget.cpp + ../common/OpenGLWidget.cpp ) #Projects headers files diff --git a/examples/Basic/main.cpp b/examples/Basic/main.cpp index ee908dd7..f123361b 100644 --- a/examples/Basic/main.cpp +++ b/examples/Basic/main.cpp @@ -78,15 +78,15 @@ int main(int argc, char *argv[]) createSphereInVolume(volData, 30); // Extract the surface for the specified region of the volume. Uncomment the line for the kind of surface extraction you want to see. - //auto mesh = extractCubicMesh(&volData, volData.getEnclosingRegion()); + auto mesh = extractCubicMesh(&volData, volData.getEnclosingRegion()); //auto mesh = extractMarchingCubesMesh(&volData, volData.getEnclosingRegion()); - auto mesh = extractCubicMesh(&volData, PolyVox::Region(Vector3DInt32(0, 0, 0), Vector3DInt32(31, 31, 31))); - auto mesh2 = extractCubicMesh(&volData, PolyVox::Region(Vector3DInt32(32, 32, 32), Vector3DInt32(63, 63, 63))); + //auto mesh = extractCubicMesh(&volData, PolyVox::Region(Vector3DInt32(0, 0, 0), Vector3DInt32(31, 31, 31))); + //auto mesh2 = extractCubicMesh(&volData, PolyVox::Region(Vector3DInt32(32, 32, 32), Vector3DInt32(63, 63, 63))); //Pass the surface to the OpenGL window openGLWidget.addMesh(mesh); - openGLWidget.addMesh(mesh2); + //openGLWidget.addMesh(mesh2); openGLWidget.setViewableRegion(volData.getEnclosingRegion()); //Run the message pump. diff --git a/examples/Basic/OpenGLWidget.cpp b/examples/common/OpenGLWidget.cpp similarity index 100% rename from examples/Basic/OpenGLWidget.cpp rename to examples/common/OpenGLWidget.cpp diff --git a/examples/Basic/OpenGLWidget.h b/examples/common/OpenGLWidget.h similarity index 100% rename from examples/Basic/OpenGLWidget.h rename to examples/common/OpenGLWidget.h