Skip to content

Commit

Permalink
- removed the Polymost renderer.
Browse files Browse the repository at this point in the history
  • Loading branch information
coelckers committed Aug 3, 2022
1 parent 7debab7 commit 291726c
Show file tree
Hide file tree
Showing 38 changed files with 45 additions and 6,621 deletions.
9 changes: 0 additions & 9 deletions source/CMakeLists.txt
Expand Up @@ -601,7 +601,6 @@ include_directories( ${CMAKE_CURRENT_BINARY_DIR} )
# there's generally a new cpp for every header so this file will get changed
file( GLOB HEADER_FILES
build/include/*.h
glbackend/*.h
core/*.h
core/2d/*.h
core/utility/*.h
Expand Down Expand Up @@ -681,9 +680,6 @@ set( NOT_COMPILED_SOURCE_FILES
zcc-parse.h
common/platform/win32/zutil.natvis
common/rendering/vulkan/thirdparty/vk_mem_alloc/vk_mem_alloc.natvis
games/blood/src/_polymost.cpp
games/duke/src/_polymost.cpp
games/sw/src/_polymost.cpp

# Blood
games/blood/src/actor.cpp
Expand Down Expand Up @@ -998,16 +994,12 @@ set (PCH_SOURCES

common/thirdparty/richpresence.cpp

glbackend/glbackend.cpp
glbackend/gl_texture.cpp

thirdparty/src/md4.cpp

# Todo: Split out the license-safe code from this.
build/src/clip.cpp
build/src/engine.cpp
build/src/mdsprite.cpp
build/src/polymost.cpp

core/actorinfo.cpp
core/zcc_compile_raze.cpp
Expand Down Expand Up @@ -1550,7 +1542,6 @@ source_group("Core\\DObject" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/co
source_group("Core\\Menu" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/core/menu/.+")
source_group("Core\\Rendering" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/core/rendering/.+")
source_group("Core\\Rendering\\Scene" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/core/rendering/scene/.+")
source_group("Rendering" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/glbackend/.+")
source_group("Platform" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/platform/.+")
source_group("Platform\\Win32" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/platform/win32/.+")
source_group("Platform\\POSIX" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/platform/posix/.+")
Expand Down
10 changes: 0 additions & 10 deletions source/build/include/build.h
Expand Up @@ -142,9 +142,7 @@ EXTERN int32_t enginecompatibility_mode;

void engineInit(void);

void videoSetCorrectedAspect();
void videoSetViewableArea(int32_t x1, int32_t y1, int32_t x2, int32_t y2);
void renderSetAspect(int32_t daxrange, int32_t daaspect);

FCanvasTexture *renderSetTarget(int16_t tilenume);
void renderRestoreTarget();
Expand Down Expand Up @@ -264,8 +262,6 @@ EXTERN_CVAR(Bool, r_voxels)

extern int32_t mdtims, omdtims;

extern int32_t r_rortexture;
extern int32_t r_rortexturerange;
extern int32_t r_rorphase;

// flags bitset: 1 = don't compress
Expand Down Expand Up @@ -318,12 +314,6 @@ int32_t md_definehud (int32_t modelid, int32_t tilex, FVector3 add,
int32_t md_undefinetile(int32_t tile);
int32_t md_undefinemodel(int32_t modelid);

#ifdef USE_OPENGL
# include "polymost.h"
#endif

extern int skiptile;

static vec2_t const zerovec = { 0, 0 };

#define SET_AND_RETURN(Lval, Rval) \
Expand Down
75 changes: 0 additions & 75 deletions source/build/include/polymost.h

This file was deleted.

26 changes: 0 additions & 26 deletions source/build/src/engine.cpp
Expand Up @@ -35,9 +35,7 @@

#ifdef USE_OPENGL
# include "mdsprite.h"
# include "polymost.h"
#include "v_video.h"
#include "../../glbackend/glbackend.h"
#include "gl_renderer.h"
#endif

Expand Down Expand Up @@ -78,22 +76,6 @@ static void getclosestpointonwall_internal(vec2_t const p, int32_t const dawall,
*closest = { (int32_t)(w.X + ((d.X * i) >> 30)), (int32_t)(w.Y + ((d.Y * i) >> 30)) };
}

int32_t xdimen = -1, xdimenscale, xdimscale;
float fxdimen = -1.f;
int32_t ydimen;

int32_t globalposx, globalposy, globalposz;
fixed_t qglobalhoriz;
float fglobalposx, fglobalposy, fglobalposz;
int16_t globalang, globalcursectnum;
fixed_t qglobalang;
int32_t globalpal, globalfloorpal, cosglobalang, singlobalang;
int32_t cosviewingrangeglobalang, sinviewingrangeglobalang;

int32_t viewingrangerecip;

int32_t globalshade, globalorientation;
int16_t globalpicnum;


static int32_t globaly1, globalx2;
Expand Down Expand Up @@ -667,13 +649,6 @@ void videoSetViewableArea(int32_t x1, int32_t y1, int32_t x2, int32_t y2)
windowxy1.Y = y1;
windowxy2.X = x2;
windowxy2.Y = y2;

xdimen = (x2-x1)+1;
ydimen = (y2-y1)+1;

fxdimen = (float) xdimen;
fydimen = (float) ydimen;
videoSetCorrectedAspect();
}


Expand Down Expand Up @@ -711,7 +686,6 @@ FCanvasTexture* renderSetTarget(int16_t tilenume)
xdim = ysiz;
ydim = xsiz;
videoSetViewableArea(0,0,ysiz-1,xsiz-1);
renderSetAspect(65536,65536);
return canvas;
}

Expand Down
15 changes: 0 additions & 15 deletions source/build/src/engine_priv.h
Expand Up @@ -13,21 +13,6 @@
#ifndef ENGINE_PRIV_H
#define ENGINE_PRIV_H

extern int32_t globalpal, globalfloorpal;
extern int32_t xdimen, xdimenscale, xdimscale, ydimen;
extern float fxdimen;
extern int32_t globalposx, globalposy, globalposz;
extern fixed_t qglobalhoriz, qglobalang;
extern float fglobalposx, fglobalposy, fglobalposz;
extern int16_t globalang, globalcursectnum;
extern int32_t globalpal, cosglobalang, singlobalang;
extern int32_t cosviewingrangeglobalang, sinviewingrangeglobalang;
extern int32_t xyaspect;
extern int32_t globalshade;
extern int16_t globalpicnum;

extern int32_t globalorientation;

extern int32_t hitallsprites;

int32_t animateoffs(int tilenum, int fakevar);
Expand Down

0 comments on commit 291726c

Please sign in to comment.