Merge pull request #11 from TheIndra55/underworld-draw

Add Underworld draw options

Author: TheIndra55

docs/features.md

@@ -159,6 +159,10 @@ This will visualize all portals which are between levels.
 
 This will draw all signals (triggers) in the current level.
 
+### Draw triggers
+
+This will draw all trigger volumes and planes in the current level. This feature only exists in Underworld.
+
 ## Debug
 
 The debug menu has some restored event debug features.

src/Hook.cpp

@@ -130,12 +130,12 @@ void Hook::RegisterModules()
 	RegisterModule<ModLoader>();
 	RegisterModule<Patches>();
 	RegisterModule<FreeCamera>();
+	RegisterModule<Draw>();
 
 #ifndef TR8
 	RegisterModule<LevelModule>();
 	RegisterModule<Frontend>();
 	RegisterModule<Render>();
-	RegisterModule<Draw>();
 	RegisterModule<Debug>();
 #else
 	RegisterModule<ScriptLog>();

src/cdc/math/Math.cpp

@@ -10,5 +10,20 @@ cdc::Vector3 cdc::Mul3x3(Matrix* matA, Vector3* vecB)
 			_mm_mul_ps(matA->col1.vec128, _mm_shuffle_ps(vecB->vec128, vecB->vec128, _MM_SHUFFLE(1, 1, 1, 1))),
 			_mm_mul_ps(matA->col2.vec128, _mm_shuffle_ps(vecB->vec128, vecB->vec128, _MM_SHUFFLE(2, 2, 2, 2)))));
 
+	return result;
+}
+
+cdc::Vector3 cdc::Mul3x4(Matrix* matA, Vector3* vecB)
+{
+	cdc::Vector3 result;
+
+	result.vec128 = _mm_add_ps(
+		_mm_mul_ps(matA->col0.vec128, _mm_shuffle_ps(vecB->vec128, vecB->vec128, _MM_SHUFFLE(0, 0, 0, 0))),
+		_mm_add_ps(
+			_mm_mul_ps(matA->col1.vec128, _mm_shuffle_ps(vecB->vec128, vecB->vec128, _MM_SHUFFLE(1, 1, 1, 1))),
+			_mm_add_ps(
+				_mm_mul_ps(matA->col2.vec128, _mm_shuffle_ps(vecB->vec128, vecB->vec128, _MM_SHUFFLE(2, 2, 2, 2))),
+				matA->col3.vec128)));
+	
 	return result;
 }

src/cdc/math/Math.h

@@ -6,4 +6,5 @@
 namespace cdc
 {
 	Vector3 Mul3x3(Matrix* matA, Vector3* vecB);
+	Vector3 Mul3x4(Matrix* matA, Vector3* vecB);
 }

src/cdc/math/Matrix.cpp

@@ -6,5 +6,13 @@ void cdc::Matrix::Build(Euler* euler)
 	// Too lazy to implement myself
 	auto addr = GET_ADDRESS(0x000000, 0x000000, 0x49DD70);
 
+	Hooking::ThisCall(addr, this, euler);
+}
+
+void cdc::Matrix::Build_XYZOrder(cdc::Euler* euler)
+{
+	// Too lazy to implement myself
+	auto addr = GET_ADDRESS(0x000000, 0x000000, 0x49D500);
+
 	Hooking::ThisCall(addr, this, euler);
 }

src/cdc/math/Matrix.h

@@ -13,5 +13,6 @@ namespace cdc
 		Vector col3;
 
 		void Build(Euler* euler);
+		void Build_XYZOrder(cdc::Euler* euler);
 	};
 }

src/level/Level.h

@@ -10,6 +10,7 @@ struct StreamUnit;
 
 struct IndexedFace
 {
+#ifndef TR8
 	unsigned __int16 i0;
 	unsigned __int16 i1;
 	unsigned __int16 i2;
@@ -18,21 +19,42 @@ struct IndexedFace
 	unsigned __int8 collisionFlags;
 	unsigned __int8 clientFlags;
 	unsigned __int8 materialType;
+#else
+	unsigned int i0;
+	unsigned int i1;
+	unsigned int i2;
+
+	unsigned __int8 adjacencyFlags;
+	unsigned __int8 collisionFlags;
+	unsigned __int16 clientFlags;
+	unsigned int materialType;
+#endif
 };
 
 struct SignalFace
 {
+#ifndef TR8
 	unsigned __int16 i0;
 	unsigned __int16 i1;
 	unsigned __int16 i2;
 
-	char adjacencyFlags;
-	char collisionFlags;
+	unsigned __int8 adjacencyFlags;
+	unsigned __int8 collisionFlags;
 
 	unsigned __int16 id;
+#else
+	unsigned int i0;
+	unsigned int i1;
+	unsigned int i2;
+
+	unsigned __int8 adjacencyFlags;
+	unsigned __int8 collisionFlags;
+
+	unsigned __int16 id;
+#endif
 };
 
-struct MeshVertex
+struct MeshVertex16
 {
 	__int16 x;
 	__int16 y;
@@ -53,6 +75,12 @@ struct BBox
 	cdc::Vector3 bMax;
 };
 
+enum VertexType
+{
+	VERTEX_INT16,
+	VERTEX_FLOAT32
+};
+
 struct Mesh
 {
 	BBox m_box;
@@ -64,17 +92,28 @@ struct Mesh
 
 	void* m_clientData;
 
+#ifndef TR8
 	unsigned __int16 m_vertexType;
 	unsigned __int16 m_numNodes;
 	unsigned __int16 m_numFaces;
 	unsigned __int16 m_numVertices;
 	unsigned __int16 m_height;
 	unsigned __int16 m_numDegenerateFaces;
 	unsigned __int16 m_numNonManifoldEdges;
+#else
+	unsigned int m_numNodes;
+	unsigned int m_numFaces;
+	unsigned int m_numVertices;
+	unsigned int m_numDegenerateFaces;
+	unsigned int m_numNonManifoldEdges;
+	unsigned __int16 m_vertexType;
+	unsigned __int16 m_height;
+#endif
 };
 
 struct Level;
 
+#ifndef TR8
 struct TerrainGroup
 {
 	cdc::Vector3 globalOffset;
@@ -126,6 +165,61 @@ struct Terrain
 	TerrainGroup* signalTerrainGroup;
 	Signal* signals;
 };
+#else
+struct TerrainGroup
+{
+	cdc::Vector3 globalOffset;
+	cdc::Vector3 localOffset;
+
+	int flags;
+	int field_24;
+	int field_28;
+	int field_2C;
+	int field_30;
+
+	Level* level;
+	Mesh* mesh;
+
+	int field_3C;
+	int field_40;
+	int field_44;
+	int field_48;
+	int field_4C;
+};
+
+struct StreamUnitPortal
+{
+	char tolevelname[128];
+
+	__int16 field_80;
+	__int16 field_82;
+
+	__int16 streamID;
+
+	__int16 field_86;
+	__int16 field_88;
+	__int16 field_8A;
+	__int16 field_8C;
+	__int16 field_8E;
+
+	cdc::Vector3 min;
+	cdc::Vector3 max;
+	cdc::Vector3 quad[4];
+	cdc::Vector3 normal;
+};
+
+struct Terrain
+{
+	__int16 field_0;
+	__int16 numStreamUnitPortals;
+	StreamUnitPortal* streamUnitPortals;
+
+	int numTerrainGroups;
+	TerrainGroup* terrainGroups;
+
+	TerrainGroup* signalTerrainGroup;
+};
+#endif
 
 struct Level
 {

src/level/Markup.cpp

@@ -3,12 +3,12 @@
 
 MarkupManager* MarkupManager::GetInstance() noexcept
 {
-	return *(MarkupManager**)GET_ADDRESS(0x1117544, 0x86CD14, 0x000000);
+	return *(MarkupManager**)GET_ADDRESS(0x1117544, 0x86CD14, 0xDB94CC);
 }
 
 cdc::Vector3* MarkUpBox::GetSegmentPos(cdc::Vector3* result, int n) const noexcept
 {
-	auto addr = GET_ADDRESS(0x45F3A0, 0x462D90, 0x000000);
+	auto addr = GET_ADDRESS(0x45F3A0, 0x462D90, 0x5C39D0);
 
 	return Hooking::ThisCallReturn<cdc::Vector3*>(addr, this, result, n);
 }

src/level/Markup.h

@@ -8,7 +8,9 @@ struct SAPBox;
 class MarkupManager
 {
 public:
+#ifndef TR8
 	SweepAndPrune* m_sap;
+#endif
 
 	NodeType m_freeBoxList;
 	NodeType m_dynamicBoxList;
@@ -62,6 +64,7 @@ enum MUD_FLAGS : unsigned int
 	MUD_FLAG_ALL				= 0xFFFFFFFF,
 };
 
+#ifndef TR8
 struct MarkUp
 {
 	int OverrideMovementCamera;
@@ -83,6 +86,28 @@ struct MarkUp
 
 	PolyLine* polyLine;
 };
+#else
+struct MarkUp
+{
+	int field_0;
+	int field_4;
+	int field_8;
+	int field_C;
+	int field_10;
+	int field_14;
+	int field_18;
+	int field_1C;
+	int field_20;
+	int field_24;
+	int field_28;
+	int field_2C;
+	int field_30;
+	float pos[3];
+	float bbox[6];
+	PolyLine* polyLine;
+};
+
+#endif
 
 #pragma pack(push, 16)
 class MarkUpBox : NodeType
@@ -101,6 +126,9 @@ class MarkUpBox : NodeType
 	MarkUp* markup;
 #endif
 
+#ifdef TR8
+	int field_24;
+#endif
 	unsigned int flags;
 
 	float attach_delay;

src/level/Trigger.h

@@ -0,0 +1,37 @@
+#pragma once
+
+#include "instance/Instance.h"
+
+enum TriggerShape
+{
+	TriggerShape_Box = 1,
+	TriggerShape_Sphere = 2
+};
+
+struct IntroDataTrigger : IntroData
+{
+	char pad1[44];
+
+	TriggerShape shape;
+	float LocalXExtent;
+	float LocalYExtent;
+	float LocalZExtent;
+	float Radius;
+};
+
+struct NsInstance
+{
+	char pad1[32];
+
+	Instance* m_instance;
+};
+
+struct NsTriggerPlaneBase : NsInstance
+{
+	unsigned int m_flags;
+};
+
+struct NsTriggerVolumeBase : NsInstance
+{
+	unsigned int m_flags;
+};