OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- moved the Plane class to vectors.h and deleted gl_geometric.h

Browse source
This commit is contained in:
Christoph Oelckers 2018-04-01 12:43:23 +02:00
commit d6fedd36b1
7 changed files with 51 additions and 99 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/gl/compatibility/gl_20.cpp
View file

@ -41,7 +41,6 @@
#include "actorinlines.h"
#include "g_levellocals.h"
#include "gl/dynlights/gl_dynlight.h"
#include "gl/utility/gl_geometric.h"
#include "gl/renderer/gl_renderer.h"
#include "gl/renderer/gl_lightdata.h"
#include "gl/system/gl_interface.h"
@ -641,7 +640,7 @@ void GLFlat::DrawSubsectorLights(subsector_t * sub, int pass)
continue;
}
p.Set(plane.plane);
p.Set(plane.plane.Normal(), plane.plane.fD());
if (!gl_SetupLight(sub->sector->PortalGroup, p, light, nearPt, up, right, scale, false, pass != GLPASS_LIGHTTEX))
{
node = node->nextLight;
@ -715,7 +714,8 @@ bool GLWall::PrepareLight(ADynamicLight * light, int pass)
FVector3 nearPt, up, right;
float scale;
p.Set(&glseg);
auto normal = glseg.Normal();
p.Set(normal, -normal.X * glseg.x1 - normal.Y * glseg.y1);
if (!p.ValidNormal())
{