Initial support for Undying

Author: mmdanggg2

Inc/D3D9Config.h

@@ -83,6 +83,12 @@
 	#define UTGLR_VALID_BUILD_CONFIG 1
 	#define UTGLR_HP_ENGINE 1
 	#define UTGLR_HAS_DARK_LIGHT 1
+#elif defined(UNDYING)
+	#define UTGLR_VALID_BUILD_CONFIG 1
+	#define UTGLR_NO_LODMESH 1
+	#define UTGLR_NO_VECTOR_MEM 1
+	#define UTGLR_HAS_DARK_LIGHT 1
+//#define UTGLR_USES_ALPHABLEND 1
 #else
 	#define UTGLR_VALID_BUILD_CONFIG 0
 #endif

Inc/D3D9DebugUtils.h

@@ -24,4 +24,6 @@ extern ods_stream dout;
 
 std::basic_string<TCHAR> HexString(DWORD data, DWORD numBits = 4);
 
+#if UTGLR_ENABLE_CLASS_EXPORT
 bool exportPackage(const class FString& exportPackageName);
+#endif

Inc/D3D9Render.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#include "D3D9DebugUtils.h"
 #include "D3D9RenderDevice.h"
+#include "D3D9DebugUtils.h"
 #include "RTXLevelProperties.h"
 
 #include <Render.h>
@@ -99,5 +99,8 @@ static_assert(sizeof(URender) == HP1_size);
 #elif KLINGON_HONOR_GUARD
 constexpr int KHG_size = 184;
 static_assert(sizeof(URender) == KHG_size);
+#elif UNDYING
+constexpr int Undying_size = 244;
+static_assert(sizeof(URender) == Undying_size);
 #endif
 static_assert(sizeof(UD3D9Render) == sizeof(URender));

Src/D3D9DebugUtils.cpp

@@ -1,5 +1,6 @@
 #include "D3D9DebugUtils.h"
 #include "Core.h"
+#include "D3D9Config.h"
 
 ods_buf::~ods_buf() {
 	sync();

Src/D3D9Render.cpp

@@ -25,6 +25,10 @@ void UD3D9Render::StaticConstructor() {
 	dout << "Static Constructing UD3D9Render!" << std::endl;
 #if UTGLR_HP_ENGINE
 	currentLevelData.facetsMem.Init(8192, TEXT("CacheLevelFacetMem"));
+#elif UNDYING
+	constexpr uint32_t memSize = 0x800000;
+	void* facetsMem = GMalloc->Malloc(memSize, TEXT("CacheLevelFacetMem"), 0);
+	currentLevelData.facetsMem.Init((BYTE*)facetsMem, memSize);
 #else
 	currentLevelData.facetsMem.Init(8192);
 #endif
@@ -263,7 +267,9 @@ void UD3D9Render::DrawWorld(FSceneNode* frame) {
 #endif
 
 	FMemMark memMark(GMem);
+#if !UTGLR_NO_VECTOR_MEM
 	FMemMark vectorMark(VectorMem);
+#endif
 
 	//dout << "Starting frame" << std::endl;
 
@@ -431,7 +437,9 @@ void UD3D9Render::DrawWorld(FSceneNode* frame) {
 	}
 
 	memMark.Pop();
+#if !UTGLR_NO_VECTOR_MEM
 	vectorMark.Pop();
+#endif
 	unguard;
 }
 

Src/D3D9RenderDevice.cpp

@@ -3503,10 +3503,10 @@ void UD3D9RenderDevice::renderMover(FSceneNode* frame, ABrush* mover) {
 
 		bool append = false;
 		for (FPoly* poly : entry.second) {
-			FSavedPoly* sPoly = (FSavedPoly*)New<BYTE>(URender::VectorMem, sizeof(FSavedPoly) + poly->NumVertices * sizeof(FTransform*));
+			FSavedPoly* sPoly = (FSavedPoly*)New<BYTE>(GMem, sizeof(FSavedPoly) + poly->NumVertices * sizeof(FTransform*));
 			sPoly->NumPts = poly->NumVertices;
 			sPoly->Next = NULL;
-			FTransform* trans = New<FTransform>(URender::VectorMem, sPoly->NumPts);
+			FTransform* trans = New<FTransform>(GMem, sPoly->NumPts);
 			for (int i = 0; i < sPoly->NumPts; i++) {
 				int iDest = invertFaces ? (sPoly->NumPts - 1) - i : i;
 				trans[i].Point = poly->Vertex[i];
@@ -6131,7 +6131,13 @@ void UD3D9RenderDevice::startWorldDraw(FSceneNode* frame) {
 #else
 	float aspect = frame->FX / frame->FY;
 #endif
-	setProjection(aspect, frame->Viewport->Actor->FovAngle);
+	float fov = frame->Viewport->Actor->FovAngle;
+	if (XMScalarNearEqual(fov, 0.0f, 0.00001f * 2.0f)) {
+		// If fov calculation fails, default to 90
+		fov = 90;
+	}
+
+	setProjection(aspect, fov);
 
 	// Set viewport.
 	D3DVIEWPORT9 d3dViewport;

Src/D3D9Render_mesh_processing.cpp

@@ -230,9 +230,15 @@ void UD3D9RenderDevice::renderMeshActor(FSceneNode* frame, AActor* actor, Render
 #endif  // UTGLR_NO_LODMESH
 	{
 		isLod = false;
+#if UNDYING
+		numVerts = mesh->FrameVerts(actor);
+		samples = New<FVector>(GMem, numVerts);
+		mesh->GetFrame(samples, sizeof(samples[0]), GMath.UnitCoords, actor, frame);
+#else
 		numVerts = mesh->FrameVerts;
 		samples = New<FVector>(GMem, numVerts);
 		mesh->GetFrame(samples, sizeof(samples[0]), GMath.UnitCoords, actor);
+#endif
 		numTris = mesh->Tris.Num();
 	}
 
@@ -268,7 +274,7 @@ void UD3D9RenderDevice::renderMeshActor(FSceneNode* frame, AActor* actor, Render
 #endif
 		for (INT i = 0; i < numVerts; i++) {
 			FVector& sample = samples[i];
-#if !KLINGON_HONOR_GUARD
+#if !KLINGON_HONOR_GUARD && !UNDYING
 			if (actor->bRandomFrame) {
 				tex = actor->MultiSkins[appCeil((&sample - samples) / 3.f) % 8];
 				if (tex) {

scripts/BuildAll.py

@@ -116,6 +116,7 @@ def zip_build(build_name: str, version_path: Path, x64: bool = False):
 	"HP2",
 	"Brother_Bear",
 	"Klingon_Honor_Guard",
+	"Undying",
 ]
 
 for game_code in games_codes:

scripts/Clive_Barkers_Undying.bat

@@ -0,0 +1,4 @@
+@ECHO OFF
+call ChangeLinks.bat undying
+python SetProperties.py --debug-exe Undying.exe --no-unicode
+echo #define GAME_NAME "Clive Barkers Undying v1.1"> ..\gamename.h