shithub: 3dee

Info  •  Files  •  Log  •  Branches

obj,stl: bring model dedup back

--- a/obj.c

+++ b/obj.c

@@ -370,7 +370,7 @@

 	dedup = 1;

 	ARGBEGIN{

-	case 'd': dedup--; break;	/* TODO waiting for a Model compaction routine */

+	case 'd': dedup--; break;

 	default: usage();

 	}ARGEND;

 	if(argc > 2)

@@ -382,6 +382,9 @@

 	m = readobjmodel(infile);

 	if(m == nil)

 		sysfatal("readobjmodel: %r");

+

+	if(dedup)

+		compactmodel(m);

 	if(dstdir == nil){

 		if(writemodel(1, m) == 0)

--- a/stl.c

+++ b/stl.c

@@ -64,7 +64,7 @@

 	dedup = 1;

 	infile = "/fd/0";

 	ARGBEGIN{

-	case 'd': dedup--; break;	/* TODO waiting for a Model compaction routine */

+	case 'd': dedup--; break;

 	default: usage();

 	}ARGEND;

 	if(argc == 1)

@@ -79,6 +79,9 @@

 	m = readstlmodel(fd);

 	if(m == nil)

 		sysfatal("readstlmodel: %r");

+

+	if(dedup)

+		compactmodel(m);

 	if(writemodel(1, m) == 0)

 		sysfatal("writemodel: %r");

-- 

⑨