Add skin-library and skin support to polygon rendering styles via the…

… resource library (see feature_polygons_textures.earth)
gwaldron · Dec 17, 2024 · 513aa45 · 513aa45
1 parent 4069b06
commit 513aa45
Show file tree

Hide file tree

Showing 11 changed files with 431 additions and 462 deletions.
diff --git a/src/applications/osgearth_atlas/osgearth_atlas.cpp b/src/applications/osgearth_atlas/osgearth_atlas.cpp
@@ -263,7 +263,7 @@ show(osg::ArgumentParser& arguments)
             if (drawLabels)
             {
                 osgText::Text* label = new osgText::Text();
-                label->setText(skins[k]->name());
+                label->setText(skins[k]->name().value());
                 label->setPosition(osg::Vec3(x+0.5*s, -0.005f, y+0.5*t));
                 label->setAlignment(label->CENTER_CENTER);
                 label->setAutoRotateToScreen(true);

diff --git a/src/osgEarth/BuildGeometryFilter b/src/osgEarth/BuildGeometryFilter
@@ -16,9 +16,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>
  */
-
-#ifndef OSGEARTHFEATURES_BUILD_GEOMETRY_FILTER_H
-#define OSGEARTHFEATURES_BUILD_GEOMETRY_FILTER_H 1
+#pragma once
 
 #include <osgEarth/Common>
 #include <osgEarth/Feature>
@@ -119,14 +117,7 @@ namespace osgEarth { namespace Util
             bool                    makeECEF,
             bool                    tessellate,
             osg::Geometry*          osgGeom,
-            const osg::Matrixd      &world2local);
-
-        void buildPolygon(
-            Geometry*               input,
-            const SpatialReference* featureSRS,
-            const SpatialReference* mapSRS,
-            bool                    makeECEF,
-            osg::Geometry*          osgGeom,
+            const SkinResource*     skinResource,
             const osg::Matrixd      &world2local);
 
         osg::Geode* processPolygons        (FeatureList& input, FilterContext& cx);
@@ -136,5 +127,3 @@ namespace osgEarth { namespace Util
         osg::Geode* processMeshes(FeatureList& input, FilterContext& cx);
     };
 } }
-
-#endif // OSGEARTHFEATURES_BUILD_GEOMETRY_FILTER_H