Przeglądaj źródła

ogsf: patch by Glynn (from https://trac.osgeo.org/grass/ticket/1423)

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@52391 15284696-431f-4ddb-bdfa-cd5b030d7da7
Anna Petrášová 12 lat temu
rodzic
commit
3836077054
1 zmienionych plików z 9 dodań i 4 usunięć
  1. 9 4
      lib/ogsf/gvld.c

+ 9 - 4
lib/ogsf/gvld.c

@@ -95,6 +95,7 @@ int gvld_isosurf(geovol * gvl)
     int x, y, z, i, iv;
     int x, y, z, i, iv;
     float xc, yc, zc;
     float xc, yc, zc;
     float xres, yres, zres;
     float xres, yres, zres;
+    unsigned r, g, b;
 
 
     int j, p, num, c_ndx, crnt_ev;
     int j, p, num, c_ndx, crnt_ev;
     float n[3], pt[4];
     float n[3], pt[4];
@@ -346,10 +347,14 @@ int gvld_isosurf(geovol * gvl)
 				n[Z] *= -1;
 				n[Z] *= -1;
 			    }
 			    }
 
 
-			    if (check_color[i])
+			    if (check_color[i]) {
+				r = READ();
+				g = READ();
+				b = READ();
 				curcolor[i] =
 				curcolor[i] =
-				    (READ() & 0xff) | ((READ() & 0xff) << 8) |
-				    ((READ() & 0xff) << 16);
+				    (r & 0xff) | ((g & 0xff) << 8) |
+				    ((b & 0xff) << 16);
+			    }
 
 
 			    if (check_transp[i])
 			    if (check_transp[i])
 				ktrans[i] = READ() << 24;;
 				ktrans[i] = READ() << 24;;
@@ -365,7 +370,7 @@ int gvld_isosurf(geovol * gvl)
 				pksh = ksh[i];
 				pksh = ksh[i];
 				pkem = kem[i];
 				pkem = kem[i];
 				gsd_set_material(1, 1, ksh[i], kem[i],
 				gsd_set_material(1, 1, ksh[i], kem[i],
-						 (int)curcolor);
+						 curcolor[i]);
 			    }
 			    }
 
 
 			    gsd_litvert_func(n, ktrans[i] | curcolor[i], pt);
 			    gsd_litvert_func(n, ktrans[i] | curcolor[i], pt);