- hooked up the writable texture types.

source/build/include/compat.h

@@ -655,7 +655,7 @@ static FORCE_INLINE int32_t Blrintf(const float x)
 #ifdef DEBUGGINGAIDS
 # define Bexit(status) do { initprintf("exit(%d) at %s:%d in %s()\n", status, __FILE__, __LINE__, EDUKE32_FUNCTION); exit(status); } while (0)
 #else
-# define Bexit exit
+# define Bexit(a) throw(1)
 #endif
 
 

source/build/src/tiles.cpp

@@ -571,6 +571,7 @@ int32_t artLoadFiles(const char *filename, int32_t askedsize)
 {
 	TileFiles.LoadArtSet(filename);
 
+#if 1
     Bstrncpyz(artfilenameformat, filename, sizeof(artfilenameformat));
 
     Bmemset(&tilesizearray[0], 0, sizeof(vec2_16_t) * MAXTILES);
@@ -596,12 +597,24 @@ int32_t artLoadFiles(const char *filename, int32_t askedsize)
     artfil = buildvfs_kfd_invalid;
     artfilnum = -1;
     artfilplc = 0L;
+#endif
+
+	for (unsigned i = 0; i < MAXTILES; i++)
+	{
+		auto tex = TileFiles.tiles[i];
+		assert(tex);
+		picanm[i] = tex->PicAnim;
+		tilesizearray[i] = tex->GetSize();
+	}
 
     return 0;
 }
 
 const uint8_t* tilePtr(int num)
 {
+	auto tex = TileFiles.tiles[num];
+	assert(tex);
+	if (tex->Get8BitPixels()) return tex->Get8BitPixels();
 	return tileptr[num];
 }
 uint8_t* tileData(int num)
@@ -613,9 +626,8 @@ uint8_t* tileData(int num)
 void tileMakeWritable(int num)
 {
 	// This won't be so simple anymore with a real texture manager backing this.
-	tileCache(num);
+	tiledata[num] = TileFiles.tileMakeWritable(num);
-	walock[num] = 255;	// disable caching.
+	tilesizearray[num] = TileFiles.tiles[num]->GetSize();
-	tiledata[num] = (uint8_t*)tileptr[num];
 }
 
 //
@@ -625,6 +637,8 @@ void tileMakeWritable(int num)
 bool tileLoad(int16_t tileNum)
 {
     if ((unsigned) tileNum >= (unsigned) MAXTILES) return 0;
+	auto tex = TileFiles.tiles[tileNum]->Get8BitPixels();
+	if (tex) return true;
     int const dasiz = tilesiz[tileNum].x*tilesiz[tileNum].y;
     if (dasiz <= 0) return 0;
 
@@ -759,33 +773,19 @@ int32_t tileCRC(int16_t tileNum)
 //
 uint8_t *tileCreate(int16_t tilenume, int32_t xsiz, int32_t ysiz)
 {
-    if (xsiz <= 0 || ysiz <= 0 || (unsigned) tilenume >= MAXTILES)
+	if (xsiz <= 0 || ysiz <= 0 || (unsigned)tilenume >= MAXTILES)
-        return 0;
+		return 0;
-
-    int const dasiz = xsiz*ysiz;
-
-    walock[tilenume] = 255;
-	intptr_t handle;
-    cacheAllocateBlock(&handle, dasiz, &walock[tilenume]);
-	tileptr[tilenume] = tiledata[tilenume] = (uint8_t*)handle;
-
-    tileSetSize(tilenume, xsiz, ysiz);
-	picanm[tilenume] = {};
 
+	tiledata[tilenume] = TileFiles.tileCreate(tilenume, xsiz, ysiz);
+	tilesizearray[tilenume] = TileFiles.tiles[tilenume]->GetSize();
     return tiledata[tilenume];
 }
 
 void tileSetExternal(int16_t tilenume, int32_t xsiz, int32_t ysiz, uint8_t *data)
 {
-	if (xsiz <= 0 || ysiz <= 0 || (unsigned)tilenume >= MAXTILES)
+	TileFiles.tileSetExternal(tilenume, xsiz, ysiz, data);
-		return;
+	tilesizearray[tilenume] = TileFiles.tiles[tilenume]->GetSize();
-
+	tiledata[tilenume] = TileFiles.tiles[tilenume]->GetWritableBuffer();
-	int const dasiz = xsiz * ysiz;
-
-	walock[tilenume] = 255;
-	tileptr[tilenume] = tiledata[tilenume] = data;
-	tileSetSize(tilenume, xsiz, ysiz);
-	picanm[tilenume] = {};
 }
 
 

source/common/textures/buildtiles.cpp

@@ -326,3 +326,48 @@ FTexture* BuildFiles::ValidateCustomTile(int tilenum, int type)
 	return replacement;
 }
 
+//==========================================================================
+//
+// Creates a tile for displaying custom content
+//
+//==========================================================================
+
+uint8_t* BuildFiles::tileCreate(int tilenum, int width, int height)
+{
+	if (width <= 0 || height <= 0) return nullptr;
+	auto tex = ValidateCustomTile(tilenum, FTexture::Writable);
+	if (tex == nullptr) return nullptr;
+	auto wtex = static_cast<FWritableTile*>(tex);
+	if (!wtex->Resize(width, height)) return nullptr;
+	return tex->GetWritableBuffer();
+}
+
+//==========================================================================
+//
+// Makes a tile writable - only used for a handful of special cases
+// (todo: Investigate how to get rid of this)
+//
+//==========================================================================
+
+uint8_t * BuildFiles::tileMakeWritable(int num)
+{
+	auto tex = ValidateCustomTile(num, FTexture::Restorable);
+	return tex ? tex->GetWritableBuffer() : nullptr;
+}
+
+//==========================================================================
+//
+// Sets user content for a tile.
+// This must copy the buffer to make sure that the renderer has the data, 
+// even if processing is deferred.
+//
+// Only used by the movie players.
+// 
+//==========================================================================
+
+void BuildFiles::tileSetExternal(int tilenum, int width, int height, uint8_t* data)
+{
+	uint8_t* buffer = tileCreate(tilenum, width, height);
+	if (buffer) memcpy(buffer, data, width * height);
+}
+

source/common/textures/textures.h

@@ -511,6 +511,9 @@ struct BuildFiles
 	void CloseAllMapArt();
 	void LoadArtSet(const char* filename);
 	FTexture* ValidateCustomTile(int tilenum, int type);
+	uint8_t *tileMakeWritable(int num);
+	uint8_t *tileCreate(int tilenum, int width, int height);
+	void tileSetExternal(int tilenum, int width, int height, uint8_t* data);
 
 };