Changeset 6495

Timestamp:

Aug 22, 2016 2:34:51 PM (7 years ago)

Author:

ldelgass

Message:

Add model layer type for OSG 3D models.

Location:

trunk/gui/scripts

Files:

• map.tcl (modified) (5 diffs)
• mapviewer.tcl (modified) (7 diffs)

trunk/gui/scripts/map.tcl

@@ -105 +105 @@
         "elevation"     1
         "feature"       2
-        "polygon"       3
-        "point"         4
-        "icon"          5
-        "line"          6
-        "label"         7
+        "model"         3
+        "polygon"       4
+        "point"         5
+        "icon"          6
+        "line"          7
+        "label"         8
     }
     array set _mapTypes {
@@ -173 +174 @@
 itcl::body Rappture::Map::parseXML { xmlobj path } {
     set map [$xmlobj element -as object $path]
+    set elemType [$xmlobj element -as type $path]
+    if {$elemType != "map"} {
+        puts stderr "ERROR: Invalid map XML: \"$elemType\""
+        return
+    }
 
     # Set global map properties
@@ -379 +385 @@
             }
             $_tree set $child "driver" "ogr"
+        }
+        set osg [$layers element -as type $layer.osg]
+        if { $osg != "" } {
+            foreach key { url } {
+                set value [$layers get $layer.osg.$key]
+                $_tree set $child "osg.$key" $value
+            }
+            set file [$layers get $layer.osg.file]
+            if { $file != "" } {
+                $_tree set $child "osg.url" $file
+            }
+            $_tree set $child "osg.x" 0.0
+            $_tree set $child "osg.y" 0.0
+            $_tree set $child "osg.z" 0.0
+            foreach key { x y z rotx roty rotz paged } {
+                set value [$layers get $layer.osg.$key]
+                if { $value != "" } {
+                    $_tree set $child "osg.$key" $value
+                }
+            }
+            $_tree set $child "driver" "osg"
         }
         set tfs [$layers element -as type $layer.tfs]
@@ -735 +762 @@
             }
         }
+        "osg" {
+            array set params $driverParamArray
+            foreach key { url } {
+                set value $params($key)
+                $_tree set $child "osg.$key" $value
+            }
+            $_tree set $child "osg.x" 0.0
+            $_tree set $child "osg.y" 0.0
+            $_tree set $child "osg.z" 0.0
+            foreach key { x y z rotx roty rotz paged } {
+                if {[info exists params($key)]} {
+                    set value $params($key)
+                    if { $value != "" } {
+                        $_tree set $child "osg.$key" $value
+                    }
+                }
+            }
+        }
         "tfs" {
             array set params $driverParamArray
@@ -1234 +1279 @@
             }
         }
-        "image" - "elevation" - "feature" {
+        "image" - "elevation" - "feature" - "model" {
         }
         default {

trunk/gui/scripts/mapviewer.tcl

@@ -2804 +2804 @@
                 set verticalDatum $info(verticalDatum)
             }
-            switch -- $info(driver)  {
+            switch -- $info(driver) {
                 "gdal" {
                     SendFiles $info(gdal.url)
@@ -2902 +2902 @@
             SendCmd "map layer opacity $style(-opacity) $tag"
         }
+        "model" {
+            switch -- $info(driver) {
+                "osg" {
+                    SendFiles $info(osg.url)
+                    SendCmd [list map layer add $tag model simple $info(osg.url) $info(osg.x) $info(osg.y) $info(osg.z)]
+                }
+            }
+        }
         "line" {
             array set style {
@@ -2923 +2931 @@
             set _opacity($tag) [expr $style(-opacity) * 100]
             foreach {r g b} [Color2RGB $style(-color)] {}
-            switch -- $info(driver)  {
+            switch -- $info(driver) {
                 "ogr" {
                     SendFiles $info(ogr.url)
@@ -2972 +2980 @@
             set _opacity($tag) [expr $style(-opacity) * 100]
             foreach {r g b} [Color2RGB $style(-color)] {}
-            switch -- $info(driver)  {
+            switch -- $info(driver) {
                 "ogr" {
                     SendFiles $info(ogr.url)
@@ -3024 +3032 @@
             }
             set _opacity($tag) [expr $style(-opacity) * 100]
-            switch -- $info(driver)  {
+            switch -- $info(driver) {
                 "ogr" {
                     SendFiles $info(ogr.url)
@@ -3077 +3085 @@
             foreach {r g b} [Color2RGB $style(-color)] {}
             foreach {strokeR strokeG strokeB} [Color2RGB $style(-strokecolor)] {}
-            switch -- $info(driver)  {
+            switch -- $info(driver) {
                 "ogr" {
                     SendFiles $info(ogr.url)
@@ -3142 +3150 @@
             foreach {fgR fgG fgB} [Color2RGB $style(-color)] {}
             foreach {bgR bgG bgB} [Color2RGB $style(-halocolor)] {}
-            switch -- $info(driver)  {
+            switch -- $info(driver) {
                 "ogr" {
                     SendFiles $info(ogr.url)