zdoom/zdray
0
0
Fork 0
mirror of https://github.com/ZDoom/ZDRay.git synced 2024-11-21 19:50:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

Move portal stuff from levelmesh.h to portal.h

Browse source
This commit is contained in:
RaveYard 2022-10-30 14:28:07 +01:00
parent 364d71a24a
commit 1a94878e4e
3 changed files with 72 additions and 81 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CMakeLists.txt
View file

@ -196,6 +196,7 @@ set( SOURCES
src/lightmap/glsl_vert.h
src/lightmap/glsl_frag_resolve.h
src/lightmap/renderdoc_app.h
src/lightmap/portal.h
src/math/mat.cpp
src/math/plane.cpp
src/math/angle.cpp

82
src/lightmap/levelmesh.h
View file

@ -38,6 +38,7 @@
#include "lightmaptexture.h"
#include "math/mathlib.h"
#include "collision.h"
#include "portal.h"
#include "dp_rect_pack/dp_rect_pack.h"
@ -61,87 +62,6 @@ enum SurfaceType
ST_FLOOR
};
struct Portal
{
mat4 transformation = mat4::identity();
int sourceSectorGroup = 0;
int targetSectorGroup = 0;
inline vec3 TransformPosition(const vec3& pos) const
{
auto v = transformation * vec4(pos, 1.0);
return vec3(v.x, v.y, v.z);
}
inline vec3 TransformRotation(const vec3& dir) const
{
auto v = transformation * vec4(dir, 0.0);
return vec3(v.x, v.y, v.z);
}
// Check if the portal is inverse
inline bool IsInversePortal(const Portal& portal) const
{
auto diff = portal.TransformPosition(TransformPosition(vec3(0)));
return abs(diff.x) < 0.001 && abs(diff.y) < 0.001 && abs(diff.z) < 0.001;
}
// Check if the portal transformation is equal
inline bool IsEqualPortal(const Portal& portal) const
{
auto diff = portal.TransformPosition(vec3(0)) - TransformPosition(vec3(0));
return (abs(diff.x) < 0.001 && abs(diff.y) < 0.001 && abs(diff.z) < 0.001);
}
// Do the portals travel between the same group of sectors?
/*
inline bool IsTravelingBetweenSameSectorGroupsInEitherDirection(const Portal& portal) const
{
int thisGroupA = sourceSectorGroup < targetSectorGroup ? sourceSectorGroup : targetSectorGroup;
int thisGroupB = sourceSectorGroup > targetSectorGroup ? sourceSectorGroup : targetSectorGroup;
int otherGroupA = portal.sourceSectorGroup < portal.targetSectorGroup ? portal.sourceSectorGroup : portal.targetSectorGroup;
int otherGroupB = portal.sourceSectorGroup > portal.targetSectorGroup ? portal.sourceSectorGroup : portal.targetSectorGroup;
return thisGroupA == otherGroupA && thisGroupB == otherGroupB;
}
*/
// do both portals travel from sector group A to sector group B?
inline bool IsTravelingBetweenSameSectorGroups(const Portal& portal) const
{
return sourceSectorGroup == portal.sourceSectorGroup && targetSectorGroup == portal.targetSectorGroup;
}
};
// for use with std::set to recursively go through portals
struct RejectRecursivePortals
{
inline bool IsEqual(const Portal& a, const Portal& b) const
{
return a.IsInversePortal(b) || a.IsEqualPortal(b);
}
bool operator()(const Portal& a, const Portal& b) const
{
return !IsEqual(a, b) && std::memcmp(&a.transformation, &b.transformation, sizeof(mat4)) < 0;
}
};
// for use with std::map to reject portals which have equal transformation between equal sector groups
struct IdenticalPortalComparator
{
inline bool IsEqual(const Portal& a, const Portal& b) const
{
return a.IsEqualPortal(b) && a.IsTravelingBetweenSameSectorGroups(b);
}
bool operator()(const Portal& a, const Portal& b) const
{
return !IsEqual(a, b) && std::memcmp(&a.transformation, &b.transformation, sizeof(mat4)) < 0;
}
};
struct Surface
{
// Surface geometry

70
src/lightmap/portal.h Normal file
View file

@ -0,0 +1,70 @@
#pragma once
#include "math/mathlib.h"
struct Portal
{
mat4 transformation = mat4::identity();
int sourceSectorGroup = 0;
int targetSectorGroup = 0;
inline vec3 TransformPosition(const vec3& pos) const
{
auto v = transformation * vec4(pos, 1.0);
return vec3(v.x, v.y, v.z);
}
inline vec3 TransformRotation(const vec3& dir) const
{
auto v = transformation * vec4(dir, 0.0);
return vec3(v.x, v.y, v.z);
}
// Check if the portal is inverse
inline bool IsInversePortal(const Portal& portal) const
{
auto diff = portal.TransformPosition(TransformPosition(vec3(0)));
return abs(diff.x) < 0.001 && abs(diff.y) < 0.001 && abs(diff.z) < 0.001;
}
// Check if the portal transformation is equal
inline bool IsEqualPortal(const Portal& portal) const
{
auto diff = portal.TransformPosition(vec3(0)) - TransformPosition(vec3(0));
return (abs(diff.x) < 0.001 && abs(diff.y) < 0.001 && abs(diff.z) < 0.001);
}
// Do both portals travel from sector group A to sector group B?
inline bool IsTravelingBetweenSameSectorGroups(const Portal& portal) const
{
return sourceSectorGroup == portal.sourceSectorGroup && targetSectorGroup == portal.targetSectorGroup;
}
};
// for use with std::set to recursively go through portals
struct RejectRecursivePortals
{
inline bool IsEqual(const Portal& a, const Portal& b) const
{
return a.IsInversePortal(b) || a.IsEqualPortal(b);
}
bool operator()(const Portal& a, const Portal& b) const
{
return !IsEqual(a, b) && std::memcmp(&a.transformation, &b.transformation, sizeof(mat4)) < 0;
}
};
// for use with std::map to reject portals which have equal transformation between equal sector groups
struct IdenticalPortalComparator
{
inline bool IsEqual(const Portal& a, const Portal& b) const
{
return a.IsEqualPortal(b) && a.IsTravelingBetweenSameSectorGroups(b);
}
bool operator()(const Portal& a, const Portal& b) const
{
return !IsEqual(a, b) && std::memcmp(&a.transformation, &b.transformation, sizeof(mat4)) < 0;
}
};