From 0492cd9f104920e15a6ad3e7751bfe68b3bdaca7 Mon Sep 17 00:00:00 2001
From: John Tsiombikas <nuclear@member.fsf.org>
Date: Sun, 26 Sep 2021 04:55:59 +0300
Subject: [PATCH] missing corner pieces for open rooms

---
 src/level.c   |  103 +++++++++++++++++++++++++++++++++++++--------------------
 src/mesh.c    |    6 ++--
 src/tileset.c |    4 ++-
 src/tileset.h |    3 ++
 4 files changed, 77 insertions(+), 39 deletions(-)

diff --git a/src/level.c b/src/level.c
index 6e65785..44c0bba 100644
--- a/src/level.c
+++ b/src/level.c
@@ -103,14 +103,14 @@ int load_level(struct level *lvl, const char *fname)
 	cell = lvl->cells;
 	for(i=0; i<lvl->height; i++) {
 		for(j=0; j<lvl->width; j++) {
+			node = (struct ts_node*)cell->next;
+			cell->next = 0;
+
 			if(cell->type == CELL_SOLID) {
 				cell++;
 				continue;
 			}
 
-			node = (struct ts_node*)cell->next;
-			cell->next = 0;
-
 			if((tiletype = tile_type(ts_get_attr_str(node, "tiletype", 0))) == -1) {
 				/* no tile-type specified, try to guess */
 				tiletype = detect_cell_tile(lvl, j, i, &cell->tilerot);
@@ -227,7 +227,6 @@ static int detect_cell_tile(struct level *lvl, int x, int y, int *rot)
 	bit = 0;
 	for(i=0; i<3; i++) {
 		for(j=0; j<3; j++) {
-			if(i == 1 && j == 1) continue;
 			if(get_cell_type(lvl, x + j - 1, y + i - 1) == CELL_SOLID) {
 				adj |= 1 << bit;
 			}
@@ -245,56 +244,65 @@ static int detect_cell_tile(struct level *lvl, int x, int y, int *rot)
 		 */
 		return TILE_OPEN;
 
-	case 0555:	/* N-S corridor */
-		*rot = 1;
-	case 0707:	/* W-E corridor */
-		return TILE_STR;
+	case 0745:
+	case 0744:
 
-	case 0745:	/* S-E corner */
-		*rot = 1;
-	case 0715:	/* S-W corner */
+	case 0645:
+	case 0644:
+	case 0740:
+	case 0741:
+	case 0640:
+	case 0641:
 		return TILE_CORNER;
-	case 0547:	/* N-E corner */
-		*rot = 2;
+	case 0715:
+	case 0711:
+
+	case 0315:
+	case 0311:
+	case 0710:
+	case 0714:
+	case 0310:
+	case 0314:
+		*rot = 1;
 		return TILE_CORNER;
-	case 0517:	/* N-W corner */
+	case 0547:
+	case 0447:
+
+	case 0047:
+	case 0147:
+	case 0446:
+	case 0546:
+	case 0046:
+	case 0146:
 		*rot = 3;
 		return TILE_CORNER;
+	case 0517:
+	case 0117:
+
+	case 0017:
+	case 0417:
+	case 0113:
+	case 0513:
+	case 0013:
+	case 0413:
+		*rot = 2;
+		return TILE_CORNER;
 
 	case 0507:	/* N tee */
 		*rot = 3;
+		return TILE_TEE;
 	case 0515:	/* W tee */
+		*rot = 2;
 		return TILE_TEE;
 	case 0705:	/* S tee */
 		*rot = 1;
 		return TILE_TEE;
 	case 0545:	/* E tee */
-		*rot = 2;
 		return TILE_TEE;
 
 	case 0505:	/* cross */
 		return TILE_CROSS;
 
-	case 0700:	/* S stropen */
-	case 0701:
-	case 0704:
-		return TILE_STROPEN;
-	case 0444:	/* E stropen */
-	case 0445:
-	case 0544:
-		*rot = 1;
-		return TILE_STROPEN;
-	case 0007:	/* N stropen */
-	case 0407:
-	case 0107:
-		*rot = 2;
-		return TILE_STROPEN;
-	case 0111:	/* W stropen */
-	case 0511:
-	case 0115:
-		*rot = 3;
-		return TILE_STROPEN;
-
 	case 0404:	/* E str2open */
 		return TILE_STR2OPEN;
 	case 0005:	/* N str2open */
@@ -306,6 +314,31 @@ static int detect_cell_tile(struct level *lvl, int x, int y, int *rot)
 	case 0500:	/* S str2open */
 		*rot = 3;
 		return TILE_STR2OPEN;
+
+	default:
+		if((adj & 0222) == 0200) {
+			return TILE_STROPEN;
+		}
+		if((adj & 0222) == 0002) {
+			*rot = 2;
+			return TILE_STROPEN;
+		}
+		if((adj & 0070) == 0040) {
+			*rot = 3;
+			return TILE_STROPEN;
+		}
+		if((adj & 0070) == 0010) {
+			*rot = 1;
+			return TILE_STROPEN;
+		}
+
+		if((adj & 0070) == 0050) {
+			*rot = 1;			/* straight N-S */
+			return TILE_STR;
+		}
+		if((adj & 0202) == 0202) {
+			return TILE_STR;	/* straight E-W */
+		}
 	}
 
 	return TILE_OPEN;
diff --git a/src/mesh.c b/src/mesh.c
index 91f8fcf..1811bb6 100644
--- a/src/mesh.c
+++ b/src/mesh.c
@@ -379,8 +379,8 @@ void xform_mesh(struct mesh *mesh, float *mat)
 	mesh->bbvalid = 0;
 
 	for(i=0; i<mesh->num_verts; i++) {
-		cgm_vmul_v3m4(&mesh->varr[i].pos, mat);
-		cgm_vmul_v3m3(&mesh->varr[i].norm, mat);
-		cgm_vmul_v3m3(&mesh->varr[i].tang, mat);
+		cgm_vmul_m4v3(&mesh->varr[i].pos, mat);
+		cgm_vmul_m3v3(&mesh->varr[i].norm, mat);
+		cgm_vmul_m3v3(&mesh->varr[i].tang, mat);
 	}
 }
diff --git a/src/tileset.c b/src/tileset.c
index 7be9c15..79e9f38 100644
--- a/src/tileset.c
+++ b/src/tileset.c
@@ -49,6 +49,8 @@ int load_tileset(struct tileset *tset, const char *fname)
 	tset->fname = strdup(fname);
 	tset->name = strdup(ts_get_attr_str(ts, "name", fname));
 
+	tset->tile_size = ts_get_attr_num(ts, "tilesize", DEF_TILE_SIZE);
+
 	iter = ts->child_list;
 	while(iter) {
 		node = iter;
@@ -75,7 +77,7 @@ int load_tileset(struct tileset *tset, const char *fname)
 
 			cgm_midentity(xform);
 			if((vec = ts_get_attr_vec(node, "pos", 0))) {
-				cgm_mtranslation(xform, vec[0], vec[1], vec[2]);
+				cgm_mtranslation(xform, -vec[0], -vec[1], -vec[2]);
 			}
 
 			init_meshgroup(&tile->mgrp);
diff --git a/src/tileset.h b/src/tileset.h
index 8d4634c..eb8d338 100644
--- a/src/tileset.h
+++ b/src/tileset.h
@@ -3,10 +3,13 @@
 
 #include "scenefile.h"
 
+#define DEF_TILE_SIZE	3.0f
+
 struct tile;
 
 struct tileset {
 	char *name, *fname;
+	float tile_size;
 
 	struct scenefile scn;	/* scene file containing tile geometry */
 	struct tile *tiles;
-- 
1.7.10.4