zdoom
/
zdray
mirror of https://github.com/ZDoom/ZDRay.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove unused SurfaceLight class

This commit is contained in:
Magnus Norddahl 2021-11-06 03:03:07 +01:00
parent ca5c48836f
commit 9ce4c027bd
5 changed files with 0 additions and 367 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -156,7 +156,6 @@ set( SOURCES
src/nodebuilder/nodebuild_classify_nosse2.cpp
src/lightmap/pngwriter.cpp
src/lightmap/raytracer.cpp
src/lightmap/surfacelight.cpp
src/lightmap/surfaces.cpp
src/lightmap/worker.cpp
src/lightmap/collision.cpp
@ -213,7 +212,6 @@ set( HEADERS
src/framework/binfile.h
src/lightmap/pngwriter.h
src/lightmap/raytracer.h
src/lightmap/surfacelight.h
src/lightmap/surfaces.h
src/lightmap/worker.h
src/lightmap/collision.h

9
src/lightmap/gpuraytracer.cpp
View File

@ -3,7 +3,6 @@
#include "surfaces.h"
#include "level/level.h"
#include "gpuraytracer.h"
#include "surfacelight.h"
#include "worker.h"
#include "framework/binfile.h"
#include "framework/templates.h"
@ -67,14 +66,6 @@ GPURaytracer::GPURaytracer()
printf("Vulkan device: %s\n", props.deviceName);
printf("Vulkan device type: %s\n", deviceType.c_str());
printf("Vulkan version: %s (api) %s (driver)\n", apiVersion.c_str(), driverVersion.c_str());
/*
printf("Vulkan extensions:");
for (const VkExtensionProperties& p : device->physicalDevice.extensions)
{
printf(" %s", p.extensionName);
}
printf("\n");
*/
}
GPURaytracer::~GPURaytracer()

1
src/lightmap/raytracer.cpp
View File

@ -3,7 +3,6 @@
#include "surfaces.h"
#include "level/level.h"
#include "raytracer.h"
#include "surfacelight.h"
#include "worker.h"
#include "framework/binfile.h"
#include "framework/templates.h"

295
src/lightmap/surfacelight.cpp
View File

@ -1,295 +0,0 @@
//-----------------------------------------------------------------------------
// Note: this is a modified version of dlight. It is not the original software.
//-----------------------------------------------------------------------------
//
// Copyright (c) 2013-2014 Samuel Villarreal
// svkaiser@gmail.com
//
// This software is provided 'as-is', without any express or implied
// warranty. In no event will the authors be held liable for any damages
// arising from the use of this software.
//
// Permission is granted to anyone to use this software for any purpose,
// including commercial applications, and to alter it and redistribute it
// freely, subject to the following restrictions:
//
// 1. The origin of this software must not be misrepresented; you must not
// claim that you wrote the original software. If you use this software
// in a product, an acknowledgment in the product documentation would be
// appreciated but is not required.
//
// 2. Altered source versions must be plainly marked as such, and must not be
// misrepresented as being the original software.
//
// 3. This notice may not be removed or altered from any source
// distribution.
//
#include "math/mathlib.h"
#include "level/level.h"
#include "surfacelight.h"
SurfaceLight::SurfaceLight(const SurfaceLightDef &surfaceLightDef, Surface *surface)
{
this->intensity = surfaceLightDef.intensity;
this->distance = surfaceLightDef.distance;
this->rgb = surfaceLightDef.rgb;
this->surface = surface;
}
SurfaceLight::~SurfaceLight()
{
}
// Splits surface vertices into two groups while adding new ones caused by the split
void SurfaceLight::Clip(VertexBatch &points, const Vec3 &normal, float dist, VertexBatch *frontPoints, VertexBatch *backPoints)
{
std::vector<float> dists;
std::vector<char> sides;
// determines what sides the vertices lies on
for (size_t i = 0; i < points.size(); ++i)
{
float d = points[i].Dot(normal) - dist;
dists.push_back(d);
if (d > 0.1f)
{
sides.push_back(1); // front
}
else if (d < -0.1f)
{
sides.push_back(-1); // directly on the split plane
}
else
{
sides.push_back(0); // back
}
}
// add points
for (unsigned int i = 0; i < points.size(); ++i)
{
int next;
float frac;
Vec3 pt1, pt2, pt3;
switch (sides[i])
{
case -1:
backPoints->push_back(points[i]);
break;
case 1:
frontPoints->push_back(points[i]);
break;
default:
frontPoints->push_back(points[i]);
backPoints->push_back(points[i]);
// point is on the split plane so no new split vertex is needed
continue;
}
// check if the edge crosses the split plane
next = (i + 1) % points.size();
if (sides[next] == 0 || sides[next] == sides[i])
{
// didn't cross
continue;
}
pt1 = points[i];
pt2 = points[next];
// insert a new point caused by the split
frac = dists[i] / (dists[i] - dists[next]);
pt3 = pt1.Lerp(pt2, frac);
frontPoints->push_back(pt3);
backPoints->push_back(pt3);
}
}
// Recursively divides the surface
bool SurfaceLight::SubdivideRecursion(VertexBatch &surfPoints, float divide, std::vector<std::unique_ptr<VertexBatch>> &points)
{
BBox bounds;
Vec3 splitNormal;
float dist;
// get bounds from current set of points
for (unsigned int i = 0; i < surfPoints.size(); ++i)
{
bounds.AddPoint(surfPoints[i]);
}
for (int i = 0; i < 3; ++i)
{
// check if its large enough to be divided
if ((bounds.max[i] - bounds.min[i]) > divide)
{
splitNormal.Clear();
splitNormal[i] = 1;
dist = (bounds.max[i] + bounds.min[i]) * 0.5f;
auto frontPoints = std::make_unique<VertexBatch>();
auto backPoints = std::make_unique<VertexBatch>();
// start clipping
Clip(surfPoints, splitNormal, dist, frontPoints.get(), backPoints.get());
if (!SubdivideRecursion(*frontPoints, divide, points))
{
points.push_back(std::move(frontPoints));
}
if (!SubdivideRecursion(*backPoints, divide, points))
{
points.push_back(std::move(backPoints));
}
return true;
}
}
return false;
}
void SurfaceLight::Subdivide(const float divide)
{
if (surface->type == ST_CEILING || surface->type == ST_FLOOR)
{
std::vector<std::unique_ptr<VertexBatch>> points;
VertexBatch surfPoints;
for (int i = 0; i < surface->numVerts; ++i)
{
surfPoints.push_back(surface->verts[i]);
}
SubdivideRecursion(surfPoints, divide, points);
// from each group of vertices caused by the split, begin
// creating a origin point based on the center of that group
for (size_t i = 0; i < points.size(); ++i)
{
VertexBatch *vb = points[i].get();
Vec3 center;
for (unsigned int j = 0; j < vb->size(); ++j)
{
center += (*vb)[j];
}
origins.push_back(center / (float)vb->size());
}
}
else
{
float length = surface->verts[0].Distance(surface->verts[1]);
if (length < divide)
{
Vec3 top = surface->verts[0] * 0.5f + surface->verts[1] * 0.5f;
Vec3 bottom = surface->verts[2] * 0.5f + surface->verts[3] * 0.5f;
origins.push_back(top * 0.5f + bottom * 0.5f);
}
else
{
float frac = length / divide;
frac = frac - std::floor(frac);
float start = divide * 0.5f + frac * 0.5f * divide;
for (float i = start; i < length; i += divide)
{
float t = i / length;
Vec3 top = surface->verts[0] * (1.0f - t) + surface->verts[1] * t;
Vec3 bottom = surface->verts[2] * (1.0f - t) + surface->verts[3] * t;
float length2 = top.Distance(bottom);
if (length2 < divide)
{
origins.push_back(top * 0.5f + bottom * 0.5f);
}
else
{
float frac2 = length2 / divide;
frac2 = frac2 - std::floor(frac2);
float start2 = divide * 0.5f + frac2 * 0.5f * divide;
for (float j = start2; j < length2; j += divide)
{
float t2 = j / length2;
origins.push_back(top * (1.0f - t2) + bottom * t2);
}
}
}
}
}
}
float SurfaceLight::TraceSurface(LevelMesh *mesh, const Surface *fragmentSurface, const Vec3 &fragmentPos)
{
if (fragmentSurface == surface)
return 1.0f; // light surface will always be fullbright
Vec3 lightSurfaceNormal = surface->plane.Normal();
Vec3 fragmentNormal = fragmentSurface ? fragmentSurface->plane.Normal() : Vec3(0.0f, 0.0f, 0.0f);
float gzdoomRadiusScale = 2.0f; // 2.0 because gzdoom's dynlights do this and we want them to match
float total = 0.0f;
int count = 0;
float closestDistance = distance * gzdoomRadiusScale;
float maxDistanceSqr = closestDistance * closestDistance;
for (size_t i = 0; i < origins.size(); ++i)
{
Vec3 lightPos = origins[i];
Vec3 lightDir = (lightPos - fragmentPos);
float dsqr = Vec3::Dot(lightDir, lightDir);
if (dsqr > maxDistanceSqr)
continue; // out of range
count++;
float attenuation = fragmentSurface ? Vec3::Dot(lightDir, fragmentNormal) : 1.0f;
if (attenuation <= 0.0f)
continue; // not even facing the light surface
float d = std::sqrt(dsqr);
attenuation /= d;
if (surface->type != ST_CEILING && surface->type != ST_FLOOR)
{
if (fragmentPos.z >= surface->verts[0].z && fragmentPos.z <= surface->verts[2].z)
{
// since walls are always vertically straight, we can cheat a little by adjusting
// the sampling point height. this also allows us to do accurate light emitting
// while just using one sample point
lightPos.z = fragmentPos.z;
}
}
// trace the origin to the center of the light surface. nudge by the normals in
// case the start/end points are directly on or inside the surface
if (mesh->TraceAnyHit(lightPos + lightSurfaceNormal, fragmentPos + fragmentNormal))
continue; // something is obstructing it
if (d < closestDistance)
closestDistance = d;
total += attenuation;
}
if (count == 0)
return 0.0f;
float attenuation = 1.0f - closestDistance / (distance * gzdoomRadiusScale);
return attenuation * total / count;
}

60
src/lightmap/surfacelight.h
View File

@ -1,60 +0,0 @@
//-----------------------------------------------------------------------------
// Note: this is a modified version of dlight. It is not the original software.
//-----------------------------------------------------------------------------
//
// Copyright (c) 2013-2014 Samuel Villarreal
// svkaiser@gmail.com
//
// This software is provided 'as-is', without any express or implied
// warranty. In no event will the authors be held liable for any damages
// arising from the use of this software.
//
// Permission is granted to anyone to use this software for any purpose,
// including commercial applications, and to alter it and redistribute it
// freely, subject to the following restrictions:
//
// 1. The origin of this software must not be misrepresented; you must not
// claim that you wrote the original software. If you use this software
// in a product, an acknowledgment in the product documentation would be
// appreciated but is not required.
//
// 2. Altered source versions must be plainly marked as such, and must not be
// misrepresented as being the original software.
//
// 3. This notice may not be removed or altered from any source
// distribution.
//
#pragma once
#include "surfaces.h"
struct FLevel;
struct SurfaceLightDef;
class SurfaceLight
{
public:
SurfaceLight(const SurfaceLightDef &surfaceLightDef, Surface *surface);
~SurfaceLight();
void Subdivide(const float divide);
float TraceSurface(LevelMesh *map, const Surface *surface, const Vec3 &origin);
const float Distance() const { return distance; }
const float Intensity() const { return intensity; }
const Vec3 GetRGB() const { return rgb; }
const Surface *GetSurface() const { return surface; }
private:
typedef std::vector<Vec3> VertexBatch;
bool SubdivideRecursion(VertexBatch &surfPoints, float divide, std::vector<std::unique_ptr<VertexBatch>> &points);
void Clip(VertexBatch &points, const Vec3 &normal, float dist, VertexBatch *frontPoints, VertexBatch *backPoints);
float distance;
float intensity;
Vec3 rgb;
VertexBatch origins;
Surface *surface;
};