Changeset 6274 for geovis

Timestamp:

Apr 19, 2016 9:09:53 AM (8 years ago)

Author:

ldelgass

Message:

fix includes

Location:

geovis/trunk

Files:

• Placard.h (modified) (1 diff)
• Renderer.cpp (modified) (2 diffs)

geovis/trunk/Placard.h

@@ -14 +14 @@
 
 #ifdef NEW_ANNOTATION_API
+#include <osgEarth/ScreenSpaceLayout>
 #include <osgEarthAnnotation/GeoPositionNode>
 #else

geovis/trunk/Renderer.cpp

@@ -51 +51 @@
 #include <osgEarth/ModelLayer>
 #include <osgEarth/DateTime>
-#include <osgEarth/Decluttering>
 #ifdef USE_RTT_PICKER
 #include <osgEarthUtil/RTTPicker>
@@ -71 +70 @@
 #include <osgEarthAnnotation/FeatureNode>
 #include <osgEarthAnnotation/PlaceNode>
-#ifndef NEW_ANNOTATION_API
+#ifdef NEW_ANNOTATION_API
+#include <osgEarth/ScreenSpaceLayout>
+#else
+#include <osgEarth/Decluttering>
 #include <osgEarthAnnotation/HighlightDecoration>
 #include <osgEarthAnnotation/ScaleDecoration>