From b63c3ea3b40a90d11b870aa6011897be9e7f24ad Mon Sep 17 00:00:00 2001
From: aap <aap@papnet.eu>
Date: Sun, 26 Jul 2020 10:53:37 +0200
Subject: [PATCH] mipmap hints in Texture. not used anywhere yet

---
 src/rwobjects.h |  4 ++++
 src/texture.cpp | 37 ++++++++++++++++++++++++++++++++++---
 2 files changed, 38 insertions(+), 3 deletions(-)

diff --git a/src/rwobjects.h b/src/rwobjects.h
index 3965a16..7476054 100644
--- a/src/rwobjects.h
+++ b/src/rwobjects.h
@@ -378,6 +378,10 @@ struct Texture
 	static Texture *(*readCB)(const char *name, const char *mask);
 	static void setLoadTextures(bool32);	// default: true
 	static void setCreateDummies(bool32);	// default: false
+	static void setMipmapping(bool32);	// default: false
+	static void setAutoMipmapping(bool32);	// default: false
+	static bool32 getMipmapping(void);
+	static bool32 getAutoMipmapping(void);
 
 #ifndef RWPUBLIC
 	static void registerModule(void);
diff --git a/src/texture.cpp b/src/texture.cpp
index f40b086..fcd9597 100644
--- a/src/texture.cpp
+++ b/src/texture.cpp
@@ -35,6 +35,8 @@ struct TextureGlobals
 	bool32 loadTextures;
 	// create dummy textures to store just names
 	bool32 makeDummies;
+	bool32 mipmapping;
+	bool32 autoMipmapping;
 	LinkList texDicts;
 
 	LinkList textures;
@@ -55,6 +57,8 @@ textureOpen(void *object, int32 offset, int32 size)
 	TexDictionary::setCurrent(texdict);
 	TEXTUREGLOBAL(loadTextures) = 1;
 	TEXTUREGLOBAL(makeDummies) = 0;
+	TEXTUREGLOBAL(mipmapping) = 0;
+	TEXTUREGLOBAL(autoMipmapping) = 0;
 	return object;
 }
 static void*
@@ -92,6 +96,11 @@ Texture::setCreateDummies(bool32 b)
 	TEXTUREGLOBAL(makeDummies) = b;
 }
 
+void Texture::setMipmapping(bool32 b) { TEXTUREGLOBAL(mipmapping) = b; }
+void Texture::setAutoMipmapping(bool32 b) { TEXTUREGLOBAL(autoMipmapping) = b; }
+bool32 Texture::getMipmapping(void) { return TEXTUREGLOBAL(mipmapping); }
+bool32 Texture::getAutoMipmapping(void) { return TEXTUREGLOBAL(autoMipmapping); }
+
 //
 // TexDictionary
 //
@@ -361,7 +370,10 @@ Texture::streamRead(Stream *stream)
 		return nil;
 	}
 	uint32 filterAddressing = stream->readU32();
-	// TODO: if V addressing is 0, copy U
+	// if V addressing is 0, copy U
+	if((filterAddressing & 0xF000) == 0)
+		filterAddressing |= (filterAddressing&0xF00) << 4;
+
 	// if using mipmap filter mode, set automipmapping,
 	// if 0x10000 is set, set mipmapping
 
@@ -377,13 +389,29 @@ Texture::streamRead(Stream *stream)
 	}
 	stream->read8(mask, length);
 
+	bool32 mipState = getMipmapping();
+	bool32 autoMipState = getAutoMipmapping();
+	int32 filter = filterAddressing&0xFF;
+	if(filter == MIPNEAREST || filter == MIPLINEAR ||
+	   filter == LINEARMIPNEAREST || filter == LINEARMIPLINEAR){
+		setMipmapping(1);
+		setAutoMipmapping((filterAddressing&0x10000) == 0);
+	}else{
+		setMipmapping(0);
+		setAutoMipmapping(0);
+	}
+
 	Texture *tex = Texture::read(name, mask);
+
+	setMipmapping(mipState);
+	setAutoMipmapping(autoMipState);
+
 	if(tex == nil){
 		s_plglist.streamSkip(stream);
 		return nil;
 	}
 	if(tex->refCount == 1)
-		tex->filterAddressing = filterAddressing;
+		tex->filterAddressing = filterAddressing&0xFFFF;
 
 	if(s_plglist.streamRead(stream, tex))
 		return tex;
@@ -399,7 +427,10 @@ Texture::streamWrite(Stream *stream)
 	char buf[36];
 	writeChunkHeader(stream, ID_TEXTURE, this->streamGetSize());
 	writeChunkHeader(stream, ID_STRUCT, 4);
-	stream->writeU32(this->filterAddressing);
+	uint32 filterAddressing = this->filterAddressing;
+	if(this->raster && (raster->format & Raster::AUTOMIPMAP) == 0)
+		filterAddressing |= 0x10000;
+	stream->writeU32(filterAddressing);
 
 	memset(buf, 0, 36);
 	strncpy(buf, this->name, 32);