Merge branch 'master' of github.com:gwaldron/osgearth

gwaldron · Jan 29, 2025 · 8f70f61 · 8f70f61
2 parents dec6ed3 + 1b2e286
commit 8f70f61
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/data/world.prj b/data/world.prj
@@ -1 +1 @@
-GEOGCS["Geographic Coordinate System",DATUM["WGS84",SPHEROID["WGS84",6378137,298.257223560493]],PRIMEM["Greenwich",0],UNIT["degree",0.0174532925199433]]
+GEOGCS["GCS_Geographic_Coordinate_System",DATUM["D_WGS_1984",SPHEROID["WGS84",6378137.0,298.257223560493]],PRIMEM["Greenwich",0.0],UNIT["Degree",0.0174532925199433]]
diff --git a/src/applications/osgearth_imposterbaker/osgearth_imposterbaker.cpp b/src/applications/osgearth_imposterbaker/osgearth_imposterbaker.cpp
@@ -33,6 +33,7 @@
 #include <osgDB/ReadFile>
 #include <osgDB/WriteFile>
 #include <osgDB/FileNameUtils>
+#include <osgEarth/GLUtils>
 
 using namespace osgEarth;
 
@@ -309,6 +310,7 @@ main(int argc, char** argv)
     normalMapVP->setFunction("normalMapFS", normalMapFS, VirtualProgram::LOCATION_FRAGMENT_OUTPUT);
 
     viewer.setSceneData(root);
+    viewer.setRealizeOperation(new GL3RealizeOperation());
     viewer.realize();
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		GEOGCS["Geographic Coordinate System",DATUM["WGS84",SPHEROID["WGS84",6378137,298.257223560493]],PRIMEM["Greenwich",0],UNIT["degree",0.0174532925199433]]
		GEOGCS["GCS_Geographic_Coordinate_System",DATUM["D_WGS_1984",SPHEROID["WGS84",6378137.0,298.257223560493]],PRIMEM["Greenwich",0.0],UNIT["Degree",0.0174532925199433]]