[GRASS-SVN] r44213 - in grass/branches/develbranch_6: include/Make visualization/nviz2/cmd

[svn_grass at osgeo.org]

Author: martinl
Date: 2010-11-07 07:54:09 -0800 (Sun, 07 Nov 2010)
New Revision: 44213

Modified:
   grass/branches/develbranch_6/include/Make/Platform.make.in
   grass/branches/develbranch_6/visualization/nviz2/cmd/Makefile
   grass/branches/develbranch_6/visualization/nviz2/cmd/vector.c
Log:
backport nviz_cmd from trunk


Modified: grass/branches/develbranch_6/include/Make/Platform.make.in
===================================================================
--- grass/branches/develbranch_6/include/Make/Platform.make.in	2010-11-07 15:22:35 UTC (rev 44212)
+++ grass/branches/develbranch_6/include/Make/Platform.make.in	2010-11-07 15:54:09 UTC (rev 44213)
@@ -160,10 +160,11 @@
 OPENGLLIB           = @OPENGLLIB@
 OPENGLULIB          = @OPENGLULIB@
 OPENGLWM            = @OPENGLWM@
-#USE_GLWM            = @USE_GLWM@
+# USE_GLWM            = @USE_GLWM@
 OPENGL_X11          = @OPENGL_X11@
 OPENGL_AQUA         = @OPENGL_AQUA@
 OPENGL_WINDOWS      = @OPENGL_WINDOWS@
+USE_OPENGL          = @USE_OPENGL@
 
 #tcl/tk stuff
 TCLINCDIR           = @TCLINCDIR@

Modified: grass/branches/develbranch_6/visualization/nviz2/cmd/Makefile
===================================================================
--- grass/branches/develbranch_6/visualization/nviz2/cmd/Makefile	2010-11-07 15:22:35 UTC (rev 44212)
+++ grass/branches/develbranch_6/visualization/nviz2/cmd/Makefile	2010-11-07 15:54:09 UTC (rev 44213)
@@ -21,11 +21,13 @@
 EXTRA_CFLAGS += $(XCFLAGS)
 endif
 
-XTRA_LDFLAGS = $(OGL_LIBS)
+EXTRA_LDFLAGS = $(OGL_LIBS)
 
-LIBES = $(GISLIB) $(OGSFLIB) $(NVIZLIB)
+LIBES = $(GISLIB) $(OGSFLIB) $(NVIZLIB) $(G3DLIB)
 DEPENDENCIES = $(GISDEP) $(NVIZDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 
+ifneq ($(USE_OPENGL),)
 default: cmd
+endif

Modified: grass/branches/develbranch_6/visualization/nviz2/cmd/vector.c
===================================================================
--- grass/branches/develbranch_6/visualization/nviz2/cmd/vector.c	2010-11-07 15:22:35 UTC (rev 44212)
+++ grass/branches/develbranch_6/visualization/nviz2/cmd/vector.c	2010-11-07 15:54:09 UTC (rev 44213)
@@ -61,7 +61,7 @@
     int nvects;
 
     char *mapset;
-
+    
     double x, y, z;
     
     if ((!elev_map->answer || elev_const->answer) && GS_num_surfs() == 0) {	/* load base surface if no loaded */
@@ -177,9 +177,11 @@
 	    marker = ST_HISTOGRAM;
 	else
 	    G_fatal_error(_("Unknown icon marker"));
-
+	
 	GP_set_sitemode(site_list[i], ST_ATT_NONE,
 			color, width, size, marker);
+	
+	/* GP_set_style(site_list[i], color, width, size, marker); */
     }
 
     return 1;