From 4d1b567fe52ed6de6cb669c2be0ef624dfd94d92 Mon Sep 17 00:00:00 2001
From: Vince Weaver <vince@deater.net>
Date: Sun, 1 Oct 2023 01:28:13 -0400
Subject: [PATCH] second: more box optimization

---
 demos/second/part18_3d/auto/NOTES         |  6 +++---
 demos/second/part18_3d/auto/box_convert.c | 21 +++++++++++++++++----
 2 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/demos/second/part18_3d/auto/NOTES b/demos/second/part18_3d/auto/NOTES
index 609e8859..b0898676 100644
--- a/demos/second/part18_3d/auto/NOTES
+++ b/demos/second/part18_3d/auto/NOTES
@@ -19,15 +19,15 @@ todo, compressed:
  522 bytes: try9: optimize HLIN to HLIN_ADD variants
  506 bytes: try10: sort types per color
  498 bytes: try11: sort HLIN by Y1
+ 431 bytes: try12: with don't cares
 
 TODO:
 	Add don't cares
 	Try all color combos
-	Sort the color results to have consecutive HLINs together
 	MOVE PLOTS one line before HLIN
 
-Possible size boxes
-	48x40,39,38....1
+
+
 
 
 
diff --git a/demos/second/part18_3d/auto/box_convert.c b/demos/second/part18_3d/auto/box_convert.c
index 77942b14..86d70cda 100644
--- a/demos/second/part18_3d/auto/box_convert.c
+++ b/demos/second/part18_3d/auto/box_convert.c
@@ -168,15 +168,23 @@ int create_using_boxes(void) {
 
 	for(box=0;box<NUM_BOX_SIZES;box++) {
 
-	int xx,yy,box_found;
+	int xx,yy,box_found,color_found;
 
 	for(row=0;row<48-box_sizes[box].y;row++) {
 		for(col=0;col<40-box_sizes[box].x;col++) {
 			box_found=1;
+			color_found=0;
 			for(yy=0;yy<box_sizes[box].y;yy++) {
 			for(xx=0;xx<box_sizes[box].x;xx++) {
 
-			if (framebuffer[xx+col][yy+row]!=current_color) {
+
+			if (framebuffer[xx+col][yy+row]==current_color) {
+				color_found=1;
+			}
+
+			if ((framebuffer[xx+col][yy+row]==background_color)||
+				(framebuffer[xx+col][yy+row]==0xff))
+				 {
 				box_found=0;
 				break;
 			}
@@ -184,7 +192,10 @@ int create_using_boxes(void) {
 			if (!box_found) break;
 			} // yy
 
-			if (box_found) {
+			if ((box_found)&&(color_found)) {
+				fprintf(stderr,"Found box c=%d %d,%d to %d,%d\n",
+					current_color,col,row,col+box_sizes[box].x-1,
+						row+box_sizes[box].y-1);
 				primitive_list[current_primitive].color=
 					current_color;
 				primitive_list[current_primitive].x1=col;
@@ -201,7 +212,9 @@ int create_using_boxes(void) {
 				}
 				for(yy=0;yy<box_sizes[box].y;yy++) {
 				for(xx=0;xx<box_sizes[box].x;xx++) {
-				framebuffer[xx+col][yy+row]=0xff;
+					if(framebuffer[xx+col][yy+row]==current_color) {
+					framebuffer[xx+col][yy+row]=0xff;
+					}
 				}
 				}