Changeset 6496 for geovis/trunk

Timestamp:

Aug 22, 2016, 2:55:32 PM (8 years ago)

Author:

ldelgass

Message:

Add basic model layer support, bump version

Location:

geovis/trunk

Files:

• RenderServer.h (modified) (1 diff)
• RendererCmd.cpp (modified) (2 diffs)
• geovis_protocol.txt (modified) (1 diff)

geovis/trunk/RenderServer.h

@@ -21 +21 @@
 class Stats;
 
-#define GEOVIS_VERSION_STRING "0.7.3"
+#define GEOVIS_VERSION_STRING "0.7.4"
 
 #define MSECS_ELAPSED(t1, t2) \

geovis/trunk/RendererCmd.cpp

@@ -48 +48 @@
 #include <osgEarthDrivers/xyz/XYZOptions>
 #include <osgEarthDrivers/model_feature_geom/FeatureGeomModelOptions>
+#include <osgEarthDrivers/model_simple/SimpleModelOptions>
 #include <osgEarthDrivers/feature_ogr/OGRFeatureOptions>
 #include <osgEarthDrivers/feature_tfs/TFSFeatureOptions>
@@ -1969 +1970 @@
         }
         g_renderer->addModelLayer(name, geomOpts, pos, cache, lighting, visible);
+    } else if (type[0] == 'm' && strcmp(type, "model") == 0) {
+        char *driver = Tcl_GetString(objv[5]);
+        if (strcmp(driver, "simple") != 0) {
+            return TCL_ERROR;
+        }
+        osgEarth::Drivers::SimpleModelOptions modelOpts;
+        std::string url;
+        if (objc > 6) {
+            char *urlIn = Tcl_GetString(objv[6]);
+            url = g_renderer->getCanonicalPath(std::string(urlIn));
+            if (url.empty()) {
+                Tcl_AppendResult(interp, "file not found: \"",
+                                 urlIn, "\"", (char*)NULL);
+                return TCL_ERROR;
+            }
+        }
+        modelOpts.url() = url;
+        double x, y, z;
+        x = y = z = 0.0;
+        if (objc > 8) {
+            if (Tcl_GetDoubleFromObj(interp, objv[7], &x) != TCL_OK ||
+                Tcl_GetDoubleFromObj(interp, objv[8], &y) != TCL_OK) {
+                return TCL_ERROR;
+            }
+        }
+        if (objc > 9) {
+            if (Tcl_GetDoubleFromObj(interp, objv[9], &z) != TCL_OK) {
+                return TCL_ERROR;
+            }
+        }
+        modelOpts.location() = osg::Vec3d(x, y, z);
+        //double 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);
     } else if (type[0] == 'i' && strcmp(type, "icon") == 0) {
         char *driver = Tcl_GetString(objv[5]);

geovis/trunk/geovis_protocol.txt

@@ -295 +295 @@
     <alignment> = left_top|left_center|left_bottom|center_top|center_center|center_bottom|right_top|right_center|right_bottom|left_baseline|center|baseline|right_baseline|left_bottom_baseline|center_bottom_baseline|right_bottom_baseline
 
+map layer add <layerName> model simple <url> <x> <y> <?z?>
+    <url> = Path to a 3D model file that OSG can load (e.g. .osg file)
+    <x>,<y>,<z> = Map coordinates for placing the model
+
 map layer delete <layerName>
 map layer opacity <opacity> <layerName>