From e99bf2b0369a7a80823cf3579a1d6394f998efae Mon Sep 17 00:00:00 2001
From: Marisa the Magician <marisa@sayachan.org>
Date: Mon, 19 Dec 2022 13:36:25 +0100
Subject: [PATCH] Update and clean up UE1 model loader.

---
 src/common/models/model_ue1.h    |  5 ++---
 src/common/models/models_ue1.cpp | 37 +++++++++++++++++---------------
 2 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/src/common/models/model_ue1.h b/src/common/models/model_ue1.h
index 5123a22e9e..9b529b44c7 100644
--- a/src/common/models/model_ue1.h
+++ b/src/common/models/model_ue1.h
@@ -35,7 +35,6 @@ public:
 	{
 		mDataLump = -1;
 		mAnivLump = -1;
-		mDataLoaded = false;
 		dhead = NULL;
 		dpolys = NULL;
 		ahead = NULL;
@@ -49,7 +48,6 @@ public:
 
 private:
 	int mDataLump, mAnivLump;
-	bool mDataLoaded;
 
 	// raw data structures
 	struct d3dhead
@@ -105,9 +103,10 @@ private:
 	int numFrames;
 	int numPolys;
 	int numGroups;
-	TArray<int> specialPolys;	// for future model attachment support, unused for now
+	bool hasWeaponTriangle;
 
 	TArray<UE1Vertex> verts;
 	TArray<UE1Poly> polys;
 	TArray<UE1Group> groups;
+	//TArray<TRS> weapondata;	// pseudo-bone generated from weapon triangle (not yet implemented)
 };
diff --git a/src/common/models/models_ue1.cpp b/src/common/models/models_ue1.cpp
index 70245bc458..5db36a672b 100644
--- a/src/common/models/models_ue1.cpp
+++ b/src/common/models/models_ue1.cpp
@@ -165,13 +165,17 @@ void FUE1Model::LoadGeometry()
 	// populate poly groups (subdivided by texture number and type)
 	// this method minimizes searches in the group list as much as possible
 	// while still doing a single pass through the poly list
+	groups.Reset();
 	int curgroup = -1;
 	UE1Group Group;
+	hasWeaponTriangle = false;
+	int weapontri = -1;
 	for ( int i=0; i<numPolys; i++ )
 	{
-		// while we're at it, look for attachment triangles
-		// technically only one should exist, but we ain't following the specs 100% here
-		if ( dpolys[i].type&PT_WeaponTriangle ) specialPolys.Push(i);
+		// while we're at it, look for a weapon triangle
+		// (technically only one should exist)
+		if ( dpolys[i].type&PT_WeaponTriangle )
+			weapontri = i;
 		if ( curgroup == -1 )
 		{
 			// no group, create it
@@ -201,25 +205,24 @@ void FUE1Model::LoadGeometry()
 		groups[curgroup].P.Push(i);
 		groups[curgroup].numPolys++;
 	}
-	// ... and it's finally done
-	mDataLoaded = true;
+	if ( weapontri != -1 )
+	{
+		// TODO: generate TRS array from special poly to interface as a pseudo-bone
+		hasWeaponTriangle = true;
+	}
 }
 
 void FUE1Model::UnloadGeometry()
 {
-	mDataLoaded = false;
-	specialPolys.Reset();
-	numVerts = 0;
-	numFrames = 0;
-	numPolys = 0;
-	numGroups = 0;
+	for ( unsigned i=0; i<verts.Size(); i++ )
+		verts[i].P.Reset();
 	verts.Reset();
-	for ( int i=0; i<numPolys; i++ )
+	for ( unsigned i=0; i<polys.Size(); i++ )
 		polys[i].Normals.Reset();
 	polys.Reset();
-	for ( int i=0; i<numGroups; i++ )
+	for ( unsigned i=0; i<groups.Size(); i++ )
 		groups[i].P.Reset();
-	groups.Reset();
+	// do not unload groups themselves, they're needed for rendering
 }
 
 int FUE1Model::FindFrame(const char* name, bool nodefault)
@@ -272,8 +275,7 @@ void FUE1Model::BuildVertexBuffer( FModelRenderer *renderer )
 {
 	if (GetVertexBuffer(renderer->GetType()))
 		return;
-	if ( !mDataLoaded )
-		LoadGeometry();
+	LoadGeometry();
 	int vsize = 0;
 	for ( int i=0; i<numGroups; i++ )
 		vsize += groups[i].numPolys*3;
@@ -306,6 +308,7 @@ void FUE1Model::BuildVertexBuffer( FModelRenderer *renderer )
 		}
 	}
 	vbuf->UnlockVertexBuffer();
+	UnloadGeometry(); // don't forget this, save precious RAM
 }
 
 void FUE1Model::AddSkins( uint8_t *hitlist, const FTextureID* surfaceskinids)
@@ -320,5 +323,5 @@ void FUE1Model::AddSkins( uint8_t *hitlist, const FTextureID* surfaceskinids)
 
 FUE1Model::~FUE1Model()
 {
-	UnloadGeometry();
+	groups.Reset();
 }