Added new experimental CompressedArray classes which use MeshOptimize…

…r to compress and compress data to osgdb files
gwaldron · Apr 1, 2024 · 62596f0 · 62596f0
1 parent a948d36
commit 62596f0
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 4 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -161,6 +161,10 @@ if(draco_FOUND)
     set(OSGEARTH_HAVE_DRACO ON)
 endif(draco_FOUND)
 
+if (meshoptimizer_FOUND)
+    set(OSGEARTH_HAVE_MESH_OPTIMIZER ON)
+endif()
+
 if(OSGEARTH_BUILD_CESIUM_NODEKIT)
     find_package(CesiumNative)
 endif()

diff --git a/src/osgEarth/BuildConfig.in b/src/osgEarth/BuildConfig.in
@@ -9,5 +9,6 @@
 #cmakedefine OSGEARTH_HAVE_DRACO
 #cmakedefine OSGEARTH_HAVE_GEOCODER
 #cmakedefine OSGEARTH_HAVE_BLEND2D
+#cmakedefine OSGEARTH_HAVE_MESH_OPTIMIZER
 
 #endif // OSGEARTH_BUILDCONFIG_H
diff --git a/src/osgEarth/CompressedArray b/src/osgEarth/CompressedArray
@@ -2,9 +2,11 @@
 #define OSGEARTHUTIL_COMPRESSED_ARRAY_H
 
 #include <osgEarth/Common>
-#include <osg/Node>
 
-#include <osgEarth/PlaceNode>
+#ifdef OSGEARTH_HAVE_MESH_OPTIMIZER
+
+#include <osg/Array>
+#include <osg/PrimitiveSet>
 
 namespace osgEarth
 {
@@ -98,5 +100,8 @@ namespace osgEarth
 
 
 }
+#else
+#pragma message("Warning: MeshOptimizer not available. CompressedArray classes will not be available.")
+#endif
 
 #endif
diff --git a/src/osgEarth/CompressedArray.cpp b/src/osgEarth/CompressedArray.cpp
@@ -1,4 +1,11 @@
 #include <osgEarth/CompressedArray>
+
+#ifdef OSGEARTH_HAVE_MESH_OPTIMIZER
+#include <osgDB/InputStream>
+#include <osgDB/OutputStream>
+#include <osgDB/ObjectWrapper>
+#include <osgDB/Registry>
+
 #include <meshoptimizer.h>
 
 using namespace osgEarth;
@@ -638,5 +645,4 @@ namespace osgEarth {
     }
 }
 
-
-
+#endif // OSGEARTH_HAVE_MESH_OPTIMIZER