Changeset 6485 for geovis

Timestamp:

Aug 16, 2016 3:14:57 PM (8 years ago)

Author:

ldelgass

Message:

Fix winding of selection rectangle

File:

• geovis/trunk/Renderer.cpp (modified) (3 diffs)

geovis/trunk/Renderer.cpp

@@ -1845 +1845 @@
     osgEarth::Annotation::FeatureNode *node = _selectionBox.get();
     osgEarth::Symbology::Geometry *geom = node->getFeature()->getGeometry();
-    (*geom)[0] = osg::Vec3d(longMax, latMin, 0);
-    (*geom)[1] = osg::Vec3d(longMin, latMin, 0);
-    (*geom)[2] = osg::Vec3d(longMin, latMax, 0);
-    (*geom)[3] = osg::Vec3d(longMax, latMax, 0);
+    (*geom)[0] = osg::Vec3d(longMin, latMin, 0);
+    (*geom)[1] = osg::Vec3d(longMax, latMin, 0);
+    (*geom)[2] = osg::Vec3d(longMax, latMax, 0);
+    (*geom)[3] = osg::Vec3d(longMin, latMax, 0);
     node->init();
 #ifndef NEW_ANNOTATION_API
@@ -1874 +1874 @@
     *latMin = (*geom)[0].y();
     *latMax = (*geom)[2].y();
-    *longMin = (*geom)[1].x();
-    *longMax = (*geom)[0].x();
+    *longMin = (*geom)[0].x();
+    *longMax = (*geom)[2].x();
     if (outSRS == NULL)
         return;
@@ -1941 +1941 @@
     if (_selectionBox.valid()) {
         osgEarth::Symbology::Geometry *geom = _selectionBox->getFeature()->getGeometry();
-        (*geom)[0] = osg::Vec3d(longMax, latMin, 0);
-        (*geom)[1] = osg::Vec3d(longMin, latMin, 0);
-        (*geom)[2] = osg::Vec3d(longMin, latMax, 0);
-        (*geom)[3] = osg::Vec3d(longMax, latMax, 0);
+        (*geom)[0] = osg::Vec3d(longMin, latMin, 0);
+        (*geom)[1] = osg::Vec3d(longMax, latMin, 0);
+        (*geom)[2] = osg::Vec3d(longMax, latMax, 0);
+        (*geom)[3] = osg::Vec3d(longMin, latMax, 0);
         _selectionBox->init();
     } else {
         const osgEarth::SpatialReference* geoSRS = _mapNode->getMapSRS()->getGeographicSRS();
         osgEarth::Symbology::Geometry *geom = new osgEarth::Symbology::Polygon();
+        geom->push_back(osg::Vec3d(longMin, latMin, 0));
         geom->push_back(osg::Vec3d(longMax, latMin, 0));
-        geom->push_back(osg::Vec3d(longMin, latMin, 0));
+        geom->push_back(osg::Vec3d(longMax, latMax, 0));
         geom->push_back(osg::Vec3d(longMin, latMax, 0));
-        geom->push_back(osg::Vec3d(longMax, latMax, 0));
         osgEarth::Symbology::Style boxStyle;
 #if 1