tools/Makefile

@@ -3,7 +3,7 @@ BBFUNCS = ../libbubulles.a
 
 OPT = -Wall -Wextra -g -DDEBUG_LEVEL=0 -DMUST_ABORT=0
 
-all:	read_obj export_evblob			# essai_faces
+all:	read_obj export_evblob essai_faces
 
 # ---------
 

tools/export_evblob.c

@@ -73,13 +73,13 @@ return 0;		/* allway success ? */
 }
 /* --------------------------------------------------------------------- */
 /*			EXPERIMENTAL GRUIK-CODE !!!			 */
-int load_and_printf_evblob(char *filename, char *outmode)
+int load_and_printf_evblob(char *filename, int mode)
 {
 EdgesAndVertices	eav;
-int			foo, mode;
+int			foo;
 
 #if DEBUG_LEVEL
-fprintf(stderr, ">>> %s ( '%s'  %s )\n", __func__, filename, outmode);
+fprintf(stderr, ">>> %s ( '%s'  %d )\n", __func__, filename, mode);
 #endif
 
 memset(&eav, 0, sizeof(EdgesAndVertices));
@@ -98,17 +98,13 @@ if (verbosity > 1) {
 				eav.Elist->fidx);
 	}
 
-mode = 666;
-if      (! strcasecmp("edges",    outmode)) { mode = 0; }
-else if (! strcasecmp("vertices", outmode)) { mode = 1; }
-
 switch (mode) {
 	case 0:
 		printf_the_edges(&eav);			break;
 	case 1:
 		printf_the_vertices(&eav);		break;
 	default:
-		fprintf(stderr, "no way to do '%s'\n", outmode);
+		fprintf(stderr, "no way to do %d\n", mode);
 		exit(1);
 		break;
 	}
@@ -128,7 +124,7 @@ exit(0);
 int main(int argc, char *argv[])
 {
 int			opt, foo;
-char			*outmode = "vertices";
+int			outmode = 0;
 
 fprintf(stderr, "### Export EVblob   (%s %s)\n", __DATE__, __TIME__);
 
@@ -141,8 +137,11 @@ while ((opt = getopt(argc, argv, "ht:v")) != -1) {
 		case 'v':
 			verbosity++;		break;
 		case 't':
-			fprintf(stderr, "type -> '%s'\n", optarg);
-			outmode = optarg;
+			// fprintf(stderr, "t -> %s\n", optarg);
+			switch(optarg[0]) {
+				case 'e': outmode=0;	break;
+				case 'v': outmode=1;	break;
+				}
 			break;
 		default:
 			exit(1);

tools/importobj.c

@@ -49,7 +49,7 @@ Tokens TokenList[] = {
 	{  "vn",	T_vt		},	// c'est quoi ce truc ?
 	{  "l",		T_line		},
 	{  "o",		T_object	},
-	{  "s",		T_smoothing 	},	// mmmm....
+	{  "s",		T_smoothing 	},
 	{  "usemtl",	T_usemtl	},
 	{  "mtllib",	T_mtllib	},
 	/*    and more to come...	*/
@@ -149,8 +149,7 @@ if (  pts[0]==pts[1] || pts[0]==pts[2] || pts[2]==pts[1] ) {
 for (ix=0; ix<3; ix++) {
 	a =  ix    % 3;
 	b = (ix+1) % 3;
-	// foo = push_a_missing_edge(edges, pts[a], pts[b]);
-	foo = push_an_edge(edges, pts[a], pts[b]);
+	foo = push_a_missing_edge(edges, pts[a], pts[b]);
 	if (foo) {
 		fprintf(stderr, "%s: disaster #%d line %d\n",
 				__func__, foo, linenumber);
@@ -163,7 +162,7 @@ if (dropped) {
 	// exit(1);
 	}
 
-#if DEBUG_LEVEL > 1
+#if DEBUG_LEVEL
 fprintf(stderr, "<<< %s\n", __func__);
 #endif
 
@@ -199,14 +198,14 @@ if (NULL==(fpin=fopen(infname, "r"))) {
 	}
 linenumber = 0;
 
-bublist = alloc_bubulles(infname, 800000, 0);
+bublist = alloc_bubulles(infname, 600000, 0);
 if (NULL==bublist) {
         fprintf(stderr, "in %s, no mem for bubls, aborting...\n", __func__);
         abort();
         }
 if (verbosity > 1)  print_bublist_desc(bublist, 0);
 
-edges = alloc_edgelist("krkrkr", 3000000, 0);
+edges = alloc_edgelist("krkrkr", 2200000, 0);
 if (NULL==edges) {
         fprintf(stderr, "no mem for edges in %s, aborting...\n", __func__);
         abort();
@@ -269,7 +268,7 @@ while(NULL!=(cptr=fgets(line, LINE_SZ, fpin))) {
 			/* experimental code here */
 			foo = parse_face(cptr);
 			if (foo) {
-				 fprintf(stderr, "line %d '%s' parseface -> %d\n",
+				 fprintf(stderr, "line %d  '%s' parse face -> %d\n",
 							linenumber, cptr, foo);
 				exit(1);
 				}
@@ -300,7 +299,7 @@ while(NULL!=(cptr=fgets(line, LINE_SZ, fpin))) {
 			break;
 			 
 		default:
-			fprintf(stderr, "W: token %s -> %d ?\n", token, tokenid);
+			fprintf(stderr, "token %s -> %d ?\n", token, tokenid);
 			break;
 		}
 	}

tools/objtrucs.h

@@ -1,8 +1,7 @@
 /*
  *		EXPERIMENTAL CODE !
  *
- *	see  'rdwredges.c'       for source code
- *        &  'export_evblob.c'   for a usecase.
+ *	see also 'rdwredges.c' & 'export_evblob.c'
  */
 
 #define  EVBLOB_MAGIC    (65872139)
@@ -18,5 +17,5 @@ typedef struct {
 int try_to_read_an_OBJ_file(char *fname, int outstyle);
 
 /* in rdwredges.c */
-int x_write_vertedges (char *filename, BBList *bblist, EdgeList *edges);
-int x_load_vertedges  (char *filename, EdgesAndVertices *eav);
+int x_write_vertedges(char *filename, BBList *bblist, EdgeList *edges);
+int x_load_vertedges(char *filename, EdgesAndVertices *eav);

tools/read_obj.c

@@ -5,7 +5,6 @@
 #include	<stdio.h>
 #include	<stdlib.h>
 #include	<libgen.h>		// for basename(3)
-#include        <unistd.h>
 
 #include	"../bubulles.h"
 #include	"../edges.h"
@@ -14,51 +13,22 @@
 
 int	verbosity = 0;
 
-/* --------------------------------------------------------------------- */
-void help(void)
-{
-printf("nothing to say...\n");
-exit(0);
-}
-/* --------------------------------------------------------------------- */
-
 int main(int argc, char *argv[])
 {
-int		foo, opt;
-// char		*fname;			/* see manpage basename(3) */
+int		foo;
+char		*fname;		/* see manpage basename(3) */
 
 fprintf(stderr, "\n### READ_OBJ       compiled %s at %s\n", __DATE__, __TIME__);
 
-if (1 == argc) {
+if (2 != argc) {
 	bubulles_version(1);
 	exit(0);
 	}
 
-while ((opt = getopt(argc, argv, "hv")) != -1) {
-	switch(opt) {
-		case 'h':
-			help();			break;
-		case 'v':
-			verbosity++;		break;
-		default:
-			exit(1);
-			break;
-		}
-	}
+verbosity = 0;
 
-
-if (optind < argc) {
-	// fprintf(stderr, "ARG = %s\n", argv[optind]);
-	foo = try_to_read_an_OBJ_file(argv[optind], 0);
-	if (foo) {
-		fprintf(stderr, "Error number %d on '%s'\n", foo, argv[optind]);
-		exit(1);
-		}
-	}
-else	{
-	fprintf(stderr, "%s need a input filename\n", argv[0]);
-	exit(1);
-	}
+foo = try_to_read_an_OBJ_file(argv[1], 0);
+fprintf(stderr, "try to read '%s' -> %d\n", argv [1], foo);
 
 return 0;
 }