Reversed colibits from GMS.

Added small filter to fix low fps in some places.
ReGlacier · Oct 3, 2024 · 0b46894 · 0b46894
1 parent 96c6f01
commit 0b46894
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 12 deletions.
diff --git a/Assets/g1/ECollisionMask.json b/Assets/g1/ECollisionMask.json
@@ -0,0 +1,15 @@
+{
+  "typename": "ECollisionMask",
+  "kind": "TypeKind.ENUM",
+  "enum": {
+    "COLIMASK_All" : 1,
+    "COLIMASK_Background": 2,
+    "COLIMASK_Shot": 4,
+    "COLIMASK_WaterGlass": 8,
+    "COLIMASK_NoWalk": 16,
+    "COLIMASK_Sight": 32,
+    "COLIMASK_Hero": 64,
+    "COLIMASK_Camera": 128,
+    "COLIMASK_NPC": 256
+  }
+}
diff --git a/BMEdit/Editor/Source/Widgets/SceneRenderWidget.cpp b/BMEdit/Editor/Source/Widgets/SceneRenderWidget.cpp
@@ -49,6 +49,14 @@ namespace widgets
 {
 	static render::Shader* g_pLastKnownShader = nullptr;
 
+	static bool canDrawGeom(const gamelib::scene::SceneObject* pObject)
+	{
+		using CM = gamelib::gms::ECollisionMask;
+		constexpr uint32_t kExpectedToSeeMask = CM::COLIMASK_Sight | CM::COLIMASK_Hero | CM::COLIMASK_NPC | CM::COLIMASK_Background;
+
+		return pObject && (pObject->getGeomInfo().getColiBits() & kExpectedToSeeMask);
+	}
+
 	struct RenderState
 	{
 		bool bHasBlend = false;
@@ -1341,6 +1349,9 @@ namespace widgets
 					if (visitedObjects.contains(sObject.pObject.get()))
 						continue; // Skip because it's in render list already
 
+					if (!canDrawGeom(sObject.pObject.get()))
+						continue;
+
 					if (auto bbox = getGameObjectBoundingBox(sObject.pObject, true); bbox.has_value() && m_camera.canSeeObject(bbox.value()))
 					{
 						// Need to render it
@@ -1451,9 +1462,9 @@ namespace widgets
 			return;
 		}
 
-		// Don't draw invisible things
-		if (bInvisible)
-			return;
+		if (!bIgnoreVisibility)
+			if (bInvisible || !canDrawGeom(geom))
+				return;
 
 		if (g_bannedObjectIds.contains(std::string_view{geom->getName()}) || geom->getName().starts_with("CloneGroup_"))
 			return;

diff --git a/BMEdit/GameLib/Include/GameLib/GMS/GMSGeomEntity.h b/BMEdit/GameLib/Include/GameLib/GMS/GMSGeomEntity.h
@@ -11,6 +11,19 @@ namespace ZBio::ZBinaryReader
 
 namespace gamelib::gms
 {
+	enum ECollisionMask : uint32_t
+	{
+		COLIMASK_All = 1,
+		COLIMASK_Background = 2,
+		COLIMASK_Shot = 4,
+		COLIMASK_WaterGlass = 8,
+		COLIMASK_NoWalk = 16,
+		COLIMASK_Sight = 32,
+		COLIMASK_Hero = 64,
+		COLIMASK_Camera = 128,
+		COLIMASK_NPC = 256
+	};
+
 	class GMSGeomEntity
 	{
 		///----------
@@ -53,10 +66,7 @@ namespace gamelib::gms
 		uint32_t m_unk10 { };
 		uint32_t m_typeId { };
 		uint32_t m_unk18 { };
-		uint8_t m_coliBits {}; // +1C
-		uint8_t m_unk1D {};
-		uint8_t m_unk1E {};
-		uint8_t m_unk1F {};
+		uint32_t m_coliBits {}; // +1C. NOTE: ECollisionMask contains all possible & expected values
 		uint32_t m_unk20 { };
 		uint32_t m_unk24 { };
 		uint32_t m_unk28 { };

diff --git a/BMEdit/GameLib/Source/GameLib/GMS/GMSGeomEntity.cpp b/BMEdit/GameLib/Source/GameLib/GMS/GMSGeomEntity.cpp
@@ -23,7 +23,7 @@ namespace gamelib::gms
 
 	uint32_t GMSGeomEntity::getColiBits() const
 	{
-		return static_cast<uint32_t>(m_coliBits);
+		return m_coliBits;
 	}
 
 	uint32_t GMSGeomEntity::getParentGeomIndex() const
@@ -79,10 +79,7 @@ namespace gamelib::gms
 		entity.m_unk18 = gmsBinaryReader->read<uint32_t, ZBio::Endianness::LE>();
 
 		// Read coliBits
-		entity.m_coliBits = gmsBinaryReader->read<uint8_t, ZBio::Endianness::LE>();
-		entity.m_unk1D = gmsBinaryReader->read<uint8_t, ZBio::Endianness::LE>();
-		entity.m_unk1E = gmsBinaryReader->read<uint8_t, ZBio::Endianness::LE>();
-		entity.m_unk1F = gmsBinaryReader->read<uint8_t, ZBio::Endianness::LE>();
+		entity.m_coliBits = gmsBinaryReader->read<uint32_t, ZBio::Endianness::LE>();
 
 		// Read unk20, 24, 28, 2C
 		entity.m_unk20 = gmsBinaryReader->read<uint32_t, ZBio::Endianness::LE>();