Ignore ray cast collisions on some voxels.

Drying socks, store signs, and archways can't be hit in the original game.
afritz1 · Jul 28, 2024 · 46aba3a · 46aba3a
1 parent a21854e
commit 46aba3a
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 3 deletions.
diff --git a/OpenTESArena/src/Collision/CollisionChunkManager.cpp b/OpenTESArena/src/Collision/CollisionChunkManager.cpp
@@ -13,11 +13,14 @@ void CollisionChunkManager::populateChunk(int index, const ChunkInt2 &chunkPos,
 		{
 			for (SNInt x = 0; x < Chunk::WIDTH; x++)
 			{
-				// Colliders are dependent on the voxel mesh definition.
+				// Colliders are dependent on the mesh and any special traits.
 				const VoxelChunk::VoxelMeshDefID voxelMeshDefID = voxelChunk.getMeshDefID(x, y, z);
 				const CollisionChunk::CollisionMeshDefID collisionMeshDefID = collisionChunk.getOrAddMeshDefIdMapping(voxelChunk, voxelMeshDefID);
 				collisionChunk.meshDefIDs.set(x, y, z, collisionMeshDefID);
-				collisionChunk.enabledColliders.set(x, y, z, true);
+
+				const VoxelChunk::VoxelTraitsDefID voxelTraitsDefID = voxelChunk.getTraitsDefID(x, y, z);
+				const VoxelTraitsDefinition &voxelTraitsDef = voxelChunk.getTraitsDef(voxelTraitsDefID);
+				collisionChunk.enabledColliders.set(x, y, z, voxelTraitsDef.hasCollision());
 			}
 		}
 	}
@@ -32,7 +35,10 @@ void CollisionChunkManager::updateDirtyVoxels(const ChunkInt2 &chunkPos, const V
 		const VoxelChunk::VoxelMeshDefID voxelMeshDefID = voxelChunk.getMeshDefID(voxelPos.x, voxelPos.y, voxelPos.z);
 		const CollisionChunk::CollisionMeshDefID collisionMeshDefID = collisionChunk.getOrAddMeshDefIdMapping(voxelChunk, voxelMeshDefID);
 		collisionChunk.meshDefIDs.set(voxelPos.x, voxelPos.y, voxelPos.z, collisionMeshDefID);
-		collisionChunk.enabledColliders.set(voxelPos.x, voxelPos.y, voxelPos.z, true);
+
+		const VoxelChunk::VoxelTraitsDefID voxelTraitsDefID = voxelChunk.getTraitsDefID(voxelPos.x, voxelPos.y, voxelPos.z);
+		const VoxelTraitsDefinition &voxelTraitsDef = voxelChunk.getTraitsDef(voxelTraitsDefID);
+		collisionChunk.enabledColliders.set(voxelPos.x, voxelPos.y, voxelPos.z, voxelTraitsDef.hasCollision());
 	}
 
 	for (const VoxelInt3 &voxelPos : voxelChunk.getDirtyDoorAnimInstPositions())

diff --git a/OpenTESArena/src/Voxels/VoxelTraitsDefinition.cpp b/OpenTESArena/src/Voxels/VoxelTraitsDefinition.cpp
@@ -45,3 +45,16 @@ void VoxelTraitsDefinition::initChasm(ArenaTypes::ChasmType chasmType)
 	this->initGeneral(ArenaTypes::VoxelType::Chasm);
 	this->chasm.type = chasmType;
 }
+
+bool VoxelTraitsDefinition::hasCollision() const
+{
+	switch (this->type)
+	{
+	case ArenaTypes::VoxelType::TransparentWall:
+		return this->transparentWall.collider;
+	case ArenaTypes::VoxelType::Edge:
+		return this->edge.collider;
+	default:
+		return true;
+	}
+}
diff --git a/OpenTESArena/src/Voxels/VoxelTraitsDefinition.h b/OpenTESArena/src/Voxels/VoxelTraitsDefinition.h
@@ -63,6 +63,8 @@ struct VoxelTraitsDefinition
 	void initTransparentWall(bool collider);
 	void initEdge(VoxelFacing2D facing, bool collider);
 	void initChasm(ArenaTypes::ChasmType chasmType);
+
+	bool hasCollision() const;
 };
 
 #endif