Implement more stuff in TMaterialLibrary

Author: AdventureT

OpenJPOG/Source/GUI/AGUIMatLibPicture.cpp

@@ -33,12 +33,17 @@ void AGUIMatLibPicture::LoadMaterialLibrary()
 			supportscreendepth = lmh != AOptionsLogic::LMH_UNK3;
 		}
 	}
+	// Should not be here!
+	supportscreendepth = TFALSE;
 	if (supportscreendepth) {
 		TINT extensionidx = m_sFileName.FindReverse('.');
 		TINT     len      = m_sFileName.Length();
 		TCString fullname = m_sFileName.Mid(0, extensionidx) + sixteen + m_sFileName.Mid(extensionidx, len);
 		m_tmlidx          = TRenderInterface::GetRenderer()->GetMaterialLibraryManager()->LoadMaterialLibrary(fullname);
 	}
+	if (m_tmlidx == -1 || !supportscreendepth) {
+		m_tmlidx = TRenderInterface::GetRenderer()->GetMaterialLibraryManager()->LoadMaterialLibrary(m_sFileName);
+	}
 }
 
 void AGUIMatLibPicture::UnloadMaterialLibrary()
@@ -60,6 +65,11 @@ void AGUIMatLibPicture::SetFile(TPCCHAR a_szFile)
 	}
 }
 
+void AGUIMatLibPicture::Create(TSpriteShader *a_pShader)
+{
+	m_pShader = a_pShader;
+}
+
 void AGUIMatLibPicture::Flush()
 {
 	if (m_iSplitTileCount == 0) {
@@ -76,10 +86,10 @@ void AGUIMatLibPicture::Flush()
 
 void AGUIMatLibPicture::Cache()
 {
-	if (m_iSplitTileCount == 0) {
+	if (m_iSplitTileCount != 0) {
 		return;
 	}
-	if (m_sFileName.IsEmpty()) {
+	if (!m_sFileName.GetString()) {
 		return;
 	}
 	m_iSplitTileCount    = split_tile_count;

OpenJPOG/Source/GUI/AGUIMatLibPicture.h

@@ -18,6 +18,7 @@ class AGUIMatLibPicture : public AGUIPicture
 	void SetFile(TPCCHAR a_szFile);
 
 public:
+	virtual void Create(Toshi::TSpriteShader *a_pShader);
 	virtual void Flush();
 	virtual void Cache();
 

OpenJPOG/Source/GUI/AGUIPicture.cpp

@@ -47,8 +47,7 @@ void AGUIPicture::Render()
 	AGUISystem *system = AGUISystem::GetGUISystem();
 	TFLOAT height = system->GetScreen()->GetHeight() / 447.0f;
 	TFLOAT width = system->GetScreen()->GetWidth() / 638.0f;
-	for (TUINT i = 0; i < m_iSplitTileCount; i++)
-	{
+	for (TUINT i = 0; i < m_iSplitTileCount; i++) {
 		m_pShader->SetColour(TGUIColour());
 		m_pShader->SetMaterial(*m_pTiles[i].ppMaterial);
 	}

OpenJPOG/Source/GUI/AGUISystem.cpp

@@ -64,9 +64,8 @@ TBOOL AGUISystem::OnCreate()
 	}
 	// m_pScreen->SetAudioContext
 	// m_pScreen->SetInputContext
-	TCString guiTexturePath = TCString("data/gui/textures");
 	m_pMatLibPic = new AGUIMatLibPicture();
-	m_pMatLibPic->Create(guiTexturePath, m_pSpriteShader);
+	m_pMatLibPic->Create(m_pSpriteShader);
 	return TTRUE;
 }
 

OpenJPOG/Source/Tasks/ARootTask.cpp

@@ -153,6 +153,7 @@ TBOOL ARootTask::CreateRenderInterface()
 	displayParams.eDepthStencilFormat = 0;
 	CreateDisplayDevice(displayParams, TFALSE);
 	m_pRenderInterface->CreateDisplay(displayParams);
+	m_pRenderInterface->GetMaterialLibraryManager()->Create();
 	return TTRUE;
 }
 

Toshi/Include/TRender/TMaterialLibrary.h

@@ -7,6 +7,8 @@
 
 TOSHI_NAMESPACE_BEGIN
 
+#define MAXTEXTURES 4
+
 class TMaterialLibraryManager;
 
 class TRENDERINTERFACE_EXPORTS TMaterialLibrary : public TNodeList<TMaterialLibrary>::TNode
@@ -18,13 +20,33 @@ class TRENDERINTERFACE_EXPORTS TMaterialLibrary : public TNodeList<TMaterialLibr
 
 private:
 
-	struct Header
+
+	struct TMLDISKHEADER
 	{
 		TINT m_iMagic;
 		TINT m_iType;
 	};
+
+	typedef TCHAR MaterialName[32];
+
+	struct TMLDISKMATERIALHEADER
+	{
+		TINT id;
+		TSHORT flags;
+		TSHORT numtextures;
+	};
+
+	enum TMLDISKMATERIALSHADERTYPE : short
+	{
+		TMLDISKMATERIALSHADERTYPE_SKIN         = 0x0000,
+		TMLDISKMATERIALSHADERTYPE_TERRAIN      = 0x1000,
+		TMLDISKMATERIALSHADERTYPE_TERRAINDECAL = 0x2000,
+		TMLDISKMATERIALSHADERTYPE_SYSTEM       = 0x3000,
+		TMLDISKMATERIALSHADERTYPE_SPRITE       = 0x4000,
+		TMLDISKMATERIALSHADERTYPE_MASK         = 0xF000
+	};
 
-	struct TextureHeader
+	struct TMLDISKTEXTUREHEADER
 	{
 		TINT    id;
 		TINT    texturesize;
@@ -42,23 +64,33 @@ class TRENDERINTERFACE_EXPORTS TMaterialLibrary : public TNodeList<TMaterialLibr
 
 	TBOOL Create(TPCCHAR a_szFileName);
 	void  Destroy();
+	TBOOL LoadSpriteMaterial(TINT a_iIndex, TFile *file, const TMLDISKMATERIALHEADER &dh);
+	TBOOL LoadMaterial(TINT a_iIndex, TFile *file);
+	TBOOL LoadMaterials(TFile *file);
 	TBOOL ReadHeader(TFile *file);
 	TBOOL LoadTexture(TINT a_iIndex, TFile *file);
 	TBOOL LoadTextures(TFile *file);
 
+	TINT              GetIndexForName(TPCCHAR a_szName, TPCHAR *a_pMaterialNames, TINT a_iMaterialCount);
 	TMaterial *GetMaterial(TPCCHAR a_szMaterial);
 	TTextureResource *GetTexture(TINT a_iIndex);
 
 private:
 	static const TTEXTURERESOURCEFORMAT gs_eRemapFormat[18];
 
-	TMaterialLibraryManager *m_pManager;     // 0xC
-	TINT                     m_iNumTextures; // 0x10
-	TTextureResource       **m_pTextures;    // 0x14
+	TMaterialLibraryManager *m_pManager;           // 0xC
+	TINT                     m_iNumTextures;       // 0x10
+	TTextureResource       **m_pTextures;          // 0x14
+	TINT                     m_iNumMaterials;      // 0x18
+	TPCHAR                  *m_pTextureNames;      // 0x1C
+	TMaterial              **m_pMaterials;         // 0x20
+	MaterialName            *m_pMaterialNames;     // 0x24
 };
 
 class TRENDERINTERFACE_EXPORTS TMaterialLibraryManager
 {
+	friend class TMaterialLibrary;
+
 public:
 	void Create();
 	void Destroy();
@@ -69,12 +101,27 @@ class TRENDERINTERFACE_EXPORTS TMaterialLibraryManager
 	}
 	TMaterial *GetMaterial(TPCCHAR a_szMaterial);
 
+protected:
+
+	TShader *GetShader(TINT a_iIndex)
+	{
+		return m_pShaders[a_iIndex];
+	}
+
+public:
+
+	void SetShader(TINT a_iIndex, TShader *a_pShader)
+	{
+		m_pShaders[a_iIndex] = a_pShader;
+	}
+
 	TUINT LoadMaterialLibrary(TPCCHAR a_szFileName);
 	void UnloadMaterialLibrary(TUINT a_iIndex);
 
 private:
 	TNodeList<TMaterialLibrary> m_oLibraries;       // 0x0
 	TMaterial                  *m_pInvalidMaterial; // 0x10
+	TShader                    *m_pShaders[5];      // 0x14
 };
 
 TOSHI_NAMESPACE_END

Toshi/Source/TRender/TMaterialLibrary.cpp

@@ -1,5 +1,7 @@
 #include "TMaterialLibrary.h"
 #include "TRender/TRenderInterface.h"
+#include "TKernel/TMemory.h"
+#include "TSpriteShader/Include/TSpriteShader.h"
 
 //-----------------------------------------------------------------------------
 // Enables memory debugging.
@@ -35,6 +37,10 @@ TMaterialLibrary::TMaterialLibrary(TMaterialLibraryManager *a_pManager)
 	m_pManager = a_pManager;
 	m_iNumTextures = 0;
 	m_pTextures    = TNULL;
+	m_iNumMaterials = 0;
+	m_pTextureNames  = TNULL;
+	m_pMaterials     = TNULL;
+	m_pMaterialNames = TNULL;
 }
 
 TBOOL TMaterialLibrary::Create(TPCCHAR a_szFileName)
@@ -43,12 +49,15 @@ TBOOL TMaterialLibrary::Create(TPCCHAR a_szFileName)
 	if (f) {
 		if (ReadHeader(f)) {
 			if (LoadTextures(f)) {
-
+				if (LoadMaterials(f)) {
+					f->Destroy();
+					return TTRUE;
+				}
 			}
 		}
 	}
 	f->Destroy();
-	TDPRINTF("Error loading material library %s\n");
+	TDPRINTF("Error loading material library %s\n", a_szFileName);
 	Destroy();
 	return TFALSE;
 }
@@ -60,19 +69,93 @@ void TMaterialLibrary::Destroy()
 	m_pTextures = TNULL;
 }
 
+TBOOL TMaterialLibrary::LoadSpriteMaterial(TINT a_iIndex, TFile *file, const TMLDISKMATERIALHEADER &dh)
+{
+	TSpriteShader *pShader = static_cast<TSpriteShader *>(m_pManager->GetShader(4));
+	TVALIDADDRESS(pShader);
+	TSpriteMaterial *pMat = pShader->CreateMaterial(TNULL);
+	if (!pMat) {
+		TDPRINTF("TMaterialLibrary::LoadSpriteMaterial(): CreateMaterial() failed for %d\n", a_iIndex);
+		return TFALSE;
+	}
+	return TTRUE;
+}
+
+TBOOL TMaterialLibrary::LoadMaterial(TINT a_iIndex, TFile *file)
+{
+	TMLDISKMATERIALHEADER dh;
+	TINT read = file->Read(&dh, sizeof(TMLDISKMATERIALHEADER));
+	if (read != sizeof(TMLDISKMATERIALHEADER)) {
+		TDPRINTF("TMaterialLibrary::LoadMaterial(): Failed to read material header\n");
+		return TFALSE;
+	}
+	TDPRINTF("Loading material \"%s\" (id %d)\n", m_pMaterialNames[a_iIndex], dh.id);
+	TMLDISKMATERIALSHADERTYPE eShaderType = (TMLDISKMATERIALSHADERTYPE)(dh.flags & TMLDISKMATERIALSHADERTYPE_MASK);
+	switch (eShaderType)
+	{
+		case Toshi::TMaterialLibrary::TMLDISKMATERIALSHADERTYPE_SKIN:
+			break;
+		case Toshi::TMaterialLibrary::TMLDISKMATERIALSHADERTYPE_TERRAIN:
+			break;
+		case Toshi::TMaterialLibrary::TMLDISKMATERIALSHADERTYPE_TERRAINDECAL:
+			break;
+		case Toshi::TMaterialLibrary::TMLDISKMATERIALSHADERTYPE_SYSTEM:
+			break;
+		case Toshi::TMaterialLibrary::TMLDISKMATERIALSHADERTYPE_SPRITE:
+			LoadSpriteMaterial(a_iIndex, file, dh);
+			break;
+		case Toshi::TMaterialLibrary::TMLDISKMATERIALSHADERTYPE_MASK:
+			break;
+		default:
+			TASSERT(!"************* TMaterialLibrary::LoadMaterial(): Unrecognised shader type");
+	}
+}
+
+TBOOL TMaterialLibrary::LoadMaterials(TFile *file)
+{
+	if (file->Read(&m_iNumMaterials, 4) != 4) {
+		TDPRINTF("TMaterialLibrary::LoadMaterials(): Failed to read number of materials\n");
+		return TFALSE;
+	}
+	m_pTextureNames = new TCHAR *[m_iNumMaterials];
+	m_pMaterialNames = new MaterialName[m_iNumMaterials];
+	if (file->Read(m_pMaterialNames, m_iNumMaterials * sizeof(MaterialName)) != m_iNumMaterials * sizeof(MaterialName)) {
+		TDPRINTF("TMaterialLibrary::LoadMaterials(): Failed to read number of materials\n");
+		return TFALSE;
+	}
+	m_pMaterials = new TMaterial *[m_iNumMaterials];
+	for (TINT i = 0; i < m_iNumMaterials; i++) {
+		m_pMaterials[i]    = TNULL;
+		m_pTextureNames[i] = m_pMaterialNames[i];
+	}
+	for (TINT i = 0; i < m_iNumMaterials; i++) {
+		TMaterialLibraryManager *pManager = TRenderInterface::GetRenderer()->GetMaterialLibraryManager();
+		for (auto it = pManager->m_oLibraries.Begin(); it != pManager->m_oLibraries.End(); it++) {
+			TMaterial *pMat = it->GetMaterial(m_pMaterialNames[i]);
+			if (pMat) {
+				TDPRINTF("******** TMaterialLibraryManager::LoadMaterials() MATERIAL \"%s\" ALREADY LOADED BY ANOTHER LIBRARY!!!!!!! **********\n", m_pMaterialNames[i]);
+			}
+		}
+		if (!LoadMaterial(i, file)) {
+			return TFALSE;
+		}
+	}
+	return TTRUE;
+}
+
 TBOOL TMaterialLibrary::ReadHeader(TFile *file)
 {
-	Header header;
-	TINT   read = file->Read(&header, sizeof(Header));
-	if (read != sizeof(Header)) {
+	TMLDISKHEADER dh;
+	TINT          read = file->Read(&dh, sizeof(TMLDISKHEADER));
+	if (read != sizeof(TMLDISKHEADER)) {
 		TDPRINTF("TMaterialLibrary::ReadHeader(): Error failed to read header\n");
 		return TFALSE;
 	}
-	if (header.m_iMagic != MAKEFOURCC('T', 'M', 'L', '1')) {
+	if (dh.m_iMagic != MAKEFOURCC('T', 'M', 'L', '1')) {
 		TDPRINTF("TMaterialLibrary::ReadHeader(): Error incorrect magic number in header\n");
 		return TFALSE;
 	}
-	if (header.m_iType != 0) {
+	if (dh.m_iType != 0) {
 		TDPRINTF("TMaterialLibrary::ReadHeader(): Error incorrect type number in header\n");
 		return TFALSE;
 	}
@@ -82,8 +165,8 @@ TBOOL TMaterialLibrary::ReadHeader(TFile *file)
 // $TRenderInterface: FUNCTION 100100b0
 TBOOL TMaterialLibrary::LoadTexture(TINT a_iIndex, TFile *file)
 {
-	TextureHeader dh;
-	if (file->Read(&dh, sizeof(TextureHeader)) != sizeof(TextureHeader)) {
+	TMLDISKTEXTUREHEADER dh;
+	if (file->Read(&dh, sizeof(TMLDISKTEXTUREHEADER)) != sizeof(TMLDISKTEXTUREHEADER)) {
 		TDPRINTF("TMaterialLibrary::LoadTexture(): Failed to read texture header %d\n");
 		return TFALSE;
 	}
@@ -117,7 +200,7 @@ TBOOL TMaterialLibrary::LoadTextures(TFile *file)
 		return TFALSE;
 	}
 	m_pTextures = new TTextureResource *[m_iNumTextures];
-	TSystem::MemSet(m_pTextures, 0, sizeof(m_iNumTextures * 4));
+	TSystem::MemSet(m_pTextures, 0, m_iNumTextures * 4);
 	for (TINT i = 0; i < m_iNumTextures; i++) {
 		if (!LoadTexture(i, file)) {
 			return TFALSE;
@@ -126,9 +209,30 @@ TBOOL TMaterialLibrary::LoadTextures(TFile *file)
 	return TTRUE;
 }
 
+// $TRenderInterface: FUNCTION 10010f60
+TINT TMaterialLibrary::GetIndexForName(TPCCHAR a_szName, TPCHAR *a_pMaterialNames, TINT a_iNumMaterials)
+{
+	for (TINT i = 0; i < a_iNumMaterials; i++) {
+		if (i + 1 == a_iNumMaterials) {
+			if (TSystem::StringCompareNoCase(a_szName, a_pMaterialNames[i], 32) != 0) {
+				return -1;
+			}
+			return i;
+		}
+		if (TSystem::StringCompareNoCase(a_szName, a_pMaterialNames[(a_iNumMaterials - (i / 2)) + i], 32) <= 0) {
+			return (a_iNumMaterials - (i / 2)) + i;
+		}
+	}
+	return -1;
+}
+
 // $TRenderInterface: FUNCTION 1000ff40
 TMaterial *TMaterialLibrary::GetMaterial(TPCCHAR a_szMaterial)
 {
+	TINT iIndex = GetIndexForName(a_szMaterial, m_pTextureNames, m_iNumMaterials);
+	if (iIndex >= 0 && iIndex < m_iNumMaterials) {
+		return m_pMaterials[iIndex];
+	}
 	return TNULL;
 }
 
@@ -141,7 +245,8 @@ TTextureResource *TMaterialLibrary::GetTexture(TINT a_iIndex)
 // $TRenderInterface: FUNCTION 10011020
 void TMaterialLibraryManager::Create()
 {
-	TMaterial *pSkin = reinterpret_cast<TMaterial *>(TRenderInterface::GetRenderer()->GetSystemResource(TRenderInterface::SYSRESOURCE_SHSKIN));
+	//TMaterial *pSkin = reinterpret_cast<TMaterial *>(TRenderInterface::GetRenderer()->GetSystemResource(TRenderInterface::SYSRESOURCE_SHSKIN));
+
 }
 
 // $TRenderInterface: FUNCTION 100110a0

Toshi/premake5.lua

@@ -109,7 +109,8 @@ project ("TRenderInterface")
 		"Include",
 		"Include/TKernel",
 		"Include/TRender",
-		"Plugins/Include"
+		"Plugins/Include",
+		"Shaders"
 	}
 
 	defines