From a4a63b9579767cc78df52b0d2952ef0935c6f99c Mon Sep 17 00:00:00 2001
From: Glenn Waldron <gwaldron@gmail.com>
Date: Fri, 2 Feb 2024 12:54:42 -0500
Subject: [PATCH] Fix GL2 issue in osgearth_map example; remove osgearth_city
example;
---
src/applications/CMakeLists.txt | 1 -
src/applications/osgearth_map/osgearth_map.cpp | 2 ++
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/applications/CMakeLists.txt b/src/applications/CMakeLists.txt
index 4422f7b0f0..bf6cd6fe15 100644
--- a/src/applications/CMakeLists.txt
+++ b/src/applications/CMakeLists.txt
@@ -70,7 +70,6 @@ IF(NOT OSGEARTH_BUILD_PLATFORM_IPHONE)
ADD_SUBDIRECTORY(osgearth_annotation)
ADD_SUBDIRECTORY(osgearth_tracks)
ADD_SUBDIRECTORY(osgearth_transform)
- ADD_SUBDIRECTORY(osgearth_city)
ADD_SUBDIRECTORY(osgearth_graticule)
ADD_SUBDIRECTORY(osgearth_occlusionculling)
ADD_SUBDIRECTORY(osgearth_minimap)
diff --git a/src/applications/osgearth_map/osgearth_map.cpp b/src/applications/osgearth_map/osgearth_map.cpp
index dd3ccad6d8..f48d511eab 100644
--- a/src/applications/osgearth_map/osgearth_map.cpp
+++ b/src/applications/osgearth_map/osgearth_map.cpp
@@ -26,6 +26,7 @@
#include <osgEarth/ImageLayer>
#include <osgEarth/ModelLayer>
#include <osgEarth/GeoTransform>
+#include <osgEarth/GLUtils>
#include <osgEarth/TMS>
#include <osgEarth/WMS>
@@ -222,6 +223,7 @@ main(int argc, char** argv)
// initialize a viewer:
osgViewer::Viewer viewer(arguments);
+ viewer.setRealizeOperation( new GL3RealizeOperation() );
viewer.setCameraManipulator( new EarthManipulator() );
viewer.getCamera()->setSmallFeatureCullingPixelSize(-1.0f);
viewer.setSceneData( node );