OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

More clean up

Browse source
This commit is contained in:
Magnus Norddahl 2023-10-01 12:52:23 +02:00
commit 864925df25
2 changed files with 17 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

41
src/rendering/hwrenderer/doom_levelmesh.cpp
View file

@ -1309,34 +1309,29 @@ void DoomLevelSubmesh::PackLightmapAtlas()
for (LevelMeshSurface* surf : sortedSurfaces)
{
FinishSurface(LMTextureSize, LMTextureSize, packer, *surf);
int sampleWidth = surf->AtlasTile.Width;
int sampleHeight = surf->AtlasTile.Height;
auto result = packer.insert(sampleWidth, sampleHeight);
int x = result.pos.x, y = result.pos.y;
surf->AtlasTile.X = x;
surf->AtlasTile.Y = y;
surf->AtlasTile.ArrayIndex = (int)result.pageIndex;
// calculate final texture coordinates
for (int i = 0; i < (int)surf->numVerts; i++)
{
auto& u = LightmapUvs[surf->startUvIndex + i].X;
auto& v = LightmapUvs[surf->startUvIndex + i].Y;
u = (u + x) / (float)LMTextureSize;
v = (v + y) / (float)LMTextureSize;
}
}
LMTextureCount = (int)packer.getNumPages();
}
void DoomLevelSubmesh::FinishSurface(int lightmapTextureWidth, int lightmapTextureHeight, RectPacker& packer, LevelMeshSurface& surface)
{
int sampleWidth = surface.AtlasTile.Width;
int sampleHeight = surface.AtlasTile.Height;
auto result = packer.insert(sampleWidth, sampleHeight);
int x = result.pos.x, y = result.pos.y;
surface.AtlasTile.ArrayIndex = (int)result.pageIndex;
// calculate final texture coordinates
for (int i = 0; i < (int)surface.numVerts; i++)
{
auto& u = LightmapUvs[surface.startUvIndex + i].X;
auto& v = LightmapUvs[surface.startUvIndex + i].Y;
u = (u + x) / (float)lightmapTextureWidth;
v = (v + y) / (float)lightmapTextureHeight;
}
surface.AtlasTile.X = x;
surface.AtlasTile.Y = y;
}
BBox DoomLevelSubmesh::GetBoundsFromSurface(const LevelMeshSurface& surface) const
{
constexpr float M_INFINITY = 1e30f; // TODO cleanup

1
src/rendering/hwrenderer/doom_levelmesh.h
View file

@ -115,7 +115,6 @@ private:
inline int AllocUvs(int amount) { return LightmapUvs.Reserve(amount); }
void BuildSurfaceParams(int lightMapTextureWidth, int lightMapTextureHeight, LevelMeshSurface& surface);
void FinishSurface(int lightmapTextureWidth, int lightmapTextureHeight, RectPacker& packer, LevelMeshSurface& surface);
static bool IsDegenerate(const FVector3& v0, const FVector3& v1, const FVector3& v2);