- moved gl_clipper and gl_fakeflat to the hwrenderer folder because both files do not contain anything API specific.

This commit is contained in:
Christoph Oelckers 2018-04-23 22:18:13 +02:00
parent 60567f207c
commit 5ca1fca8d1
10 changed files with 25 additions and 22 deletions

View file

@ -825,8 +825,6 @@ set( FASTMATH_SOURCES
textures/hires/xbr/xbrz.cpp
textures/hires/xbr/xbrz_old.cpp
gl/scene/gl_bsp.cpp
gl/scene/gl_fakeflat.cpp
gl/scene/gl_clipper.cpp
gl/scene/gl_decal.cpp
gl/scene/gl_drawinfo.cpp
gl/scene/gl_flats.cpp
@ -845,6 +843,8 @@ set( FASTMATH_SOURCES
gl_load/gl_load.c
gl/models/gl_models.cpp
hwrenderer/dynlights/hw_dynlightdata.cpp
hwrenderer/scene/hw_fakeflat.cpp
hwrenderer/scene/hw_clipper.cpp
r_data/models/models.cpp
r_data/matrix.cpp
sound/adlmidi/adldata.cpp

View file

@ -234,19 +234,7 @@ public:
static float GetZFar() { return 65536.f; }
};
enum area_t
{
area_normal,
area_below,
area_above,
area_default
};
// Global functions. Make them members of GLRenderer later?
bool gl_CheckClip(side_t * sidedef, sector_t * frontsector, sector_t * backsector);
sector_t * gl_FakeFlat(sector_t * sec, sector_t * dest, area_t in_area, bool back);
area_t gl_CheckViewArea(area_t in_area, vertex_t *v1, vertex_t *v2, sector_t *frontsector, sector_t *backsector);
#include "hwrenderer/scene/hw_fakeflat.h"
struct TexFilter_s
{

View file

@ -46,7 +46,7 @@
#include "gl/renderer/gl_renderstate.h"
#include "gl/renderer/gl_quaddrawer.h"
#include "gl/data/gl_vertexbuffer.h"
#include "gl/scene/gl_clipper.h"
#include "hwrenderer/scene/hw_clipper.h"
#include "gl/scene/gl_drawinfo.h"
#include "gl/scene/gl_portal.h"
#include "gl/scene/gl_scenedrawer.h"

View file

@ -55,7 +55,7 @@
#include "gl/renderer/gl_renderstate.h"
#include "gl/renderer/gl_renderbuffers.h"
#include "gl/data/gl_vertexbuffer.h"
#include "gl/scene/gl_clipper.h"
#include "hwrenderer/scene/hw_clipper.h"
#include "gl/scene/gl_drawinfo.h"
#include "gl/scene/gl_portal.h"
#include "gl/scene/gl_scenedrawer.h"

View file

@ -2,7 +2,7 @@
#include "r_defs.h"
#include "m_fixed.h"
#include "gl_clipper.h"
#include "hwrenderer/scene/hw_clipper.h"
#include "gl_portal.h"
#include "gl/renderer/gl_lightdata.h"
#include "gl/renderer/gl_renderer.h"

View file

@ -3,7 +3,7 @@
#include "r_defs.h"
#include "m_fixed.h"
#include "gl_clipper.h"
#include "hwrenderer/scene/hw_clipper.h"
#include "gl_portal.h"
#include "gl/renderer/gl_lightdata.h"
#include "gl/renderer/gl_renderer.h"

View file

@ -35,7 +35,7 @@
**
*/
#include "gl/scene/gl_clipper.h"
#include "hw_clipper.h"
#include "g_levellocals.h"
unsigned Clipper::starttime;

View file

@ -30,8 +30,7 @@
#include "g_levellocals.h"
#include "a_sharedglobal.h"
#include "r_sky.h"
#include "gl/renderer/gl_renderer.h"
#include "gl/scene/gl_scenedrawer.h"
#include "hw_fakeflat.h"
//==========================================================================

View file

@ -0,0 +1,16 @@
#pragma once
enum area_t
{
area_normal,
area_below,
area_above,
area_default
};
// Global functions. Make them members of GLRenderer later?
bool gl_CheckClip(side_t * sidedef, sector_t * frontsector, sector_t * backsector);
sector_t * gl_FakeFlat(sector_t * sec, sector_t * dest, area_t in_area, bool back);
area_t gl_CheckViewArea(area_t in_area, vertex_t *v1, vertex_t *v2, sector_t *frontsector, sector_t *backsector);