Skip to content

Commit

Permalink
API: Removed caps DD_MONOCHROME_PATCHES and DD_UPSCALE_AND_SHARPEN_PA…
Browse files Browse the repository at this point in the history
…TCHES

These caps are no longer used because the application of the filters
are determined when preparing a context variant of a patch texture
according to the variant specification.
  • Loading branch information
danij-deng committed Mar 4, 2013
1 parent d1e95de commit a6f4966
Show file tree
Hide file tree
Showing 5 changed files with 0 additions and 19 deletions.
2 changes: 0 additions & 2 deletions doomsday/api/dd_share.h
Expand Up @@ -155,10 +155,8 @@ enum {
DD_NUMLUMPS,
DD_CLIENT_PAUSED,
DD_WEAPON_OFFSET_SCALE_Y, ///< 1000x
DD_MONOCHROME_PATCHES, ///< Convert patch image data to monochrome. 1= linear 2= weighted.
DD_GAME_DATA_FORMAT,
DD_GAME_DRAW_HUD_HINT, ///< Doomsday advises not to draw the HUD.
DD_UPSCALE_AND_SHARPEN_PATCHES,
DD_SYMBOLIC_ECHO,
DD_MAX_TEXTURE_UNITS,
DD_CURRENT_CLIENT_FINALE_ID,
Expand Down
1 change: 0 additions & 1 deletion doomsday/client/include/gl/gl_texmanager.h
Expand Up @@ -53,7 +53,6 @@ DENG_EXTERN_C int mipmapping, filterUI, texQuality, filterSprites;
DENG_EXTERN_C int texMagMode, texAniso;
DENG_EXTERN_C int useSmartFilter;
DENG_EXTERN_C int texMagMode;
DENG_EXTERN_C int monochrome, upscaleAndSharpenPatches;
DENG_EXTERN_C int glmode[6];
DENG_EXTERN_C boolean fillOutlines;
DENG_EXTERN_C boolean noHighResTex;
Expand Down
8 changes: 0 additions & 8 deletions doomsday/client/src/dd_main.cpp
Expand Up @@ -67,7 +67,6 @@
#include "api_map.h"

extern int renderTextures;
extern int monochrome;

using namespace de;

Expand Down Expand Up @@ -2345,25 +2344,18 @@ ddvalue_t ddValues[DD_LAST_VALUE - DD_FIRST_VALUE - 1] = {
{0, 0},
#endif
{&weaponOffsetScaleY, &weaponOffsetScaleY},
#ifdef __CLIENT__
{&monochrome, &monochrome},
#else
{0, 0},
#endif
{&gameDataFormat, &gameDataFormat},
#ifdef __CLIENT__
{&gameDrawHUD, 0},
#else
{0, 0},
#endif
#ifdef __CLIENT__
{&upscaleAndSharpenPatches, &upscaleAndSharpenPatches},
{&symbolicEchoMode, &symbolicEchoMode},
{&numTexUnits, 0}
#else
{0, 0},
{0, 0},
{0, 0},
#endif
};
/* *INDENT-ON* */
Expand Down
2 changes: 0 additions & 2 deletions doomsday/client/src/gl/gl_texmanager.cpp
Expand Up @@ -51,11 +51,9 @@

using namespace de;

int monochrome = 0; // desaturate a patch (average colours)
int mipmapping = 5;
int filterUI = 1;
int texQuality = TEXQ_BEST;
int upscaleAndSharpenPatches = 0;

enum uploadcontentmethod_t
{
Expand Down
6 changes: 0 additions & 6 deletions doomsday/client/src/resource/r_data.cpp
Expand Up @@ -211,12 +211,6 @@ DENG_EXTERN_C patchid_t R_DeclarePatch(char const *name)
Texture::Flags flags;
if(file.container().hasCustom()) flags |= Texture::Custom;

#ifdef __CLIENT__
// Take a copy of the current texture filter state.
if(monochrome) flags |= Texture::Monochrome;
if(upscaleAndSharpenPatches) flags |= Texture::UpscaleAndSharpen;
#endif

Vector2i dimensions;
Vector2i origin;

Expand Down

0 comments on commit a6f4966

Please sign in to comment.