Changeset 6518 for geovis

Timestamp:

Aug 31, 2016 5:40:20 PM (8 years ago)

Author:

ldelgass

Message:

Protocol additions: add terrainPatch flag, add wkt/wkt_file driver for mask
layers to allow using WKT string literal or file. Add Euler angle rotations
for model layer.

Location:

geovis/trunk

Files:

• Renderer.cpp (modified) (2 diffs)
• Renderer.h (modified) (1 diff)
• RendererCmd.cpp (modified) (6 diffs)
• geovis_protocol.txt (modified) (3 diffs)

geovis/trunk/Renderer.cpp

@@ -2253 +2253 @@
                              bool enableCache,
                              bool lighting,
-                             bool visible)
+                             bool visible,
+                             bool terrainPatch)
 {
     if (!_map.valid()) {
@@ -2269 +2270 @@
     }
     layerOpts.lightingEnabled() = lighting;
+    if (terrainPatch) {
+        layerOpts.terrainPatch() = true;
+    }
     osgEarth::ModelLayer *layer = new osgEarth::ModelLayer(layerOpts);
     if (pos < (unsigned int)_map->getNumModelLayers()) {

geovis/trunk/Renderer.h

@@ -404 +404 @@
                        bool enableCache = true,
                        bool lighting = true,
-                       bool visible = true);
+                       bool visible = true,
+                       bool terrainPatch = false);
 
     void removeModelLayer(const char *name);

geovis/trunk/RendererCmd.cpp

@@ -1773 +1773 @@
         }
 
-        bool lighting = true;
         osgEarth::Drivers::FeatureGeomModelOptions geomOpts;
         char *styleSheetStr = (char *)malloc((size_t)(ssSize+1L));
@@ -1929 +1928 @@
             Tcl_DecrRefCount(selectorsObj);
         }
+        bool terrainPatch = false;
+        if (objc > 13) {
+            if (GetBooleanFromObj(interp, objv[13], &terrainPatch) != TCL_OK) {
+                return TCL_ERROR;
+            }
+        }
+        bool lighting = true;
         geomOpts.enableLighting() = lighting;
         geomOpts.minRange() = 0.f;
         geomOpts.maxRange() = FLT_MAX;
-        if (objc > 13) {
+        if (objc > 14) {
             float min, max;
-            if (GetFloatFromObj(interp, objv[13], &min) != TCL_OK ||
-                GetFloatFromObj(interp, objv[14], &max) != TCL_OK) {
+            if (GetFloatFromObj(interp, objv[14], &min) != TCL_OK ||
+                GetFloatFromObj(interp, objv[15], &max) != TCL_OK) {
                 return TCL_ERROR;
             }
@@ -1973 +1979 @@
             return TCL_ERROR;
         }
-        g_renderer->addModelLayer(name, geomOpts, pos, cache, lighting, visible);
+        g_renderer->addModelLayer(name, geomOpts, pos, cache, lighting, visible,
+                                  terrainPatch);
     } else if (type[0] == 'm' && strcmp(type, "mask") == 0) {
         char *driver = Tcl_GetString(objv[5]);
@@ -1987 +1994 @@
         std::string url;
         if (objc > 8) {
-            char *urlIn = Tcl_GetString(objv[8]);
-            url = g_renderer->getCanonicalPath(std::string(urlIn));
-            if (url.empty()) {
-                Tcl_AppendResult(interp, "file not found: \"",
-                                 urlIn, "\"", (char*)NULL);
-                return TCL_ERROR;
+            if (driver[0] == 'w' && strcmp(driver, "wkt") == 0) {
+                url = Tcl_GetString(objv[8]);
+                if (url.empty()) {
+                    Tcl_AppendResult(interp, "Empty WKT length",
+                                     (char*)NULL);
+                    return TCL_ERROR;
+                }
+            } else {
+                char *urlIn = Tcl_GetString(objv[8]);
+                url = g_renderer->getCanonicalPath(std::string(urlIn));
+                if (url.empty()) {
+                    Tcl_AppendResult(interp, "file not found: \"",
+                                     urlIn, "\"", (char*)NULL);
+                    return TCL_ERROR;
+                }
             }
         }
@@ -2019 +2035 @@
             opts.typeName() = typeName;
             maskOpts.featureOptions() = opts;
+        } else if (driver[0] == 'w' && strcmp(driver, "wkt") == 0) {
+            // Inline geometry, url is length of following data
+            char *ptr;
+            long len = strtol(url.c_str(), &ptr, 10);
+            if (len <= 0 || *ptr != '\0') {
+                Tcl_AppendResult(interp, "Failed to parse WKT length: \"",
+                                 url.c_str(), "\"", (char*)NULL);
+                return TCL_ERROR;
+            }
+            char *wkt = (char *)malloc((size_t)len);
+            if (!SocketRead(wkt, len)) {
+                free(wkt);
+                Tcl_AppendResult(interp, "Failed to read WKT string",
+                                 (char*)NULL);
+                return TCL_ERROR;
+            }
+            osgEarth::Drivers::OGRFeatureOptions opts;
+            opts.name() = name;
+            TRACE("Geometry: \"%s\"", wkt);
+            osgEarth::Config conf("geometry", std::string(wkt));
+            free(wkt);
+            opts.geometryConfig() = conf;
+            maskOpts.featureOptions() = opts;
+        } else if (driver[0] == 'w' && strcmp(driver, "wkt_file") == 0) {
+            osgEarth::Drivers::OGRFeatureOptions opts;
+            opts.name() = name;
+            opts.geometryUrl() = url;
+            maskOpts.featureOptions() = opts;
         } else {
             Tcl_AppendResult(interp, "unknown mask driver \"", driver,
@@ -2062 +2106 @@
         }
         modelOpts.location() = osg::Vec3d(x, y, z);
-        //double rotx = 0.0, roty = 0.0, rotz = 0.0;
-        //modelOpts.orientation() = osg::Vec3d(rotx, roty, rotz);
+        double rotx = 0.0, roty = 0.0, rotz = 0.0;
+        if (objc > 12) {
+            if (Tcl_GetDoubleFromObj(interp, objv[10], &rotx) != TCL_OK ||
+                Tcl_GetDoubleFromObj(interp, objv[11], &roty) != TCL_OK ||
+                Tcl_GetDoubleFromObj(interp, objv[12], &rotz) != TCL_OK) {
+                return TCL_ERROR;
+            }
+        }
+        if (rotx != 0.0 || roty != 0.0 || rotz != 0.0) {
+            modelOpts.orientation() = osg::Vec3d(rotx, roty, rotz);
+        }
         modelOpts.paged() = false;
         bool lighting = true;
-        g_renderer->addModelLayer(name, modelOpts, pos, cache, lighting, visible);
+        bool terrainPatch = false;
+        if (objc > 13) {
+            if (GetBooleanFromObj(interp, objv[13], &terrainPatch) != TCL_OK) {
+                return TCL_ERROR;
+            }
+        }
+        g_renderer->addModelLayer(name, modelOpts, pos, cache, lighting,
+                                  visible, terrainPatch);
     } else if (type[0] == 'i' && strcmp(type, "icon") == 0) {
         char *driver = Tcl_GetString(objv[5]);

geovis/trunk/geovis_protocol.txt

@@ -268 +268 @@
 <clamptechnique> = drape|gpu|scene|map
 
-map layer add <layerName> feature <driver> <format> <typeName> <url> <cache> <styleLen> <?scriptLen?> <?selectorsLen?> <?visibilityRangeMin?> <?visibilityRangeMax?>
+map layer add <layerName> feature <driver> <format> <typeName> <url> <cache> <styleLen> <?scriptLen?> <?selectorsLen?> <?terrainPatch?> <?visibilityRangeMin?> <?visibilityRangeMax?>
     Data payload follows command: style, then script, then selectors
     <styleLen> = Number of bytes in style sheet. Stylesheet payload consists of 
@@ -278 +278 @@
     <selectorsLen> = Number of bytes in selectors.  Selectors payload consists
     of a Tcl list of name/value pairs
+    <terrainPatch> = Boolean indicating if layer should be used for elevation
+    queries.
 map layer add <layerName> icon <driver> <format> <typeName> <url> <cache> <icon> <scale> <heading> <declutter> <placement> <alignment> <?visibilityRangeMin?> <?visibilityRangeMax?>
     Add an icon feature layer from a file or URL
@@ -298 +300 @@
     Create a terrain mask layer to cut a hole in the terrain geometry.  The
     first feature found is assumed to be a boundary polygon.
+    <driver> = db|ogr|tfs|wfs|wkt|wkt_file
     <minLOD> minimum LOD to at which to apply the mask, defaults to 0.
-
-map layer add <layerName> model simple <url> <x> <y> <?z?>
+map layer add <layerName> mask wkt <format> <typeName> <length> <?minLOD?>
+    Like generic mask layer command, but instead of a <url>, included data in
+    the payload which is a WKT literal string.
+    <format> and <typeName> are unused
+    <length> = length of following data for inline WKT string
+map layer add <layerName> mask wkt_file <format> <typeName> <url> <?minLOD?>
+    <url> = URL for a text file containing a WKT string
+    <format> and <typeName> are unused
+
+map layer add <layerName> model simple <url> <x> <y> <?z?> <?rotx?> <?roty?> <?rotz?> <?terrainPatch?>
     <url> = Path to a 3D model file that OSG can load (e.g. .osg file)
     <x>,<y>,<z> = Map coordinates for placing the model
+    <rotx>,<roty>,<rotz> = Rotations (in degrees) to apply to orient model
+    <terrainPatch> = boolean indicating if model should be used for elevation
+    queries.
 
 map layer delete <layerName>