Changeset 6289 for nanoscale/branches/1.0

Timestamp:

Apr 21, 2016, 10:06:40 AM (8 years ago)

Author:

ldelgass

Message:

merge from nanoscale trunk

Location:

nanoscale/branches/1.0

Files:

• . (modified) (1 prop)
• configure.ac (modified) (1 prop)
• renderservers.tcl.in (modified) (1 diff)
• start_nanoscale.sh.in (modified) (1 diff, 1 prop)

nanoscale/branches/1.0/renderservers.tcl.in

@@ -35 +35 @@
 set bindir "@bindir@"
 set libdir "@libdir@"
+
+# GeoVis server (port 2015) --
+#     Map renderer
+#
+register_server geovis 2015 \
+    -output 3 -logstdout no -logstderr no \
+{
+    ${bindir}/geovis -o 3 -p ${libdir}/resources
+} {
+    LD_LIBRARY_PATH ${libdir}
+    OSGEARTH_DEFAULT_FONT /usr/share/fonts/truetype/liberation/LiberationSans-Regular.ttf
+    __GL_SYNC_TO_VBLANK 0
+}
 
 # NanoVis --

nanoscale/branches/1.0/start_nanoscale.sh.in

@@ -28 +28 @@
 cd /tmp
 
+# Start a window manager so geovis doesn't crash
+pgrep -u rappture -x twm > /dev/null || twm -display :0 &
+
 exec ${bindir}/nanoscale -x ${numVideo}