From 4c20553a62e915862a2b5b7817133540a58d45c2 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Sun, 5 Aug 2018 20:17:50 +0200 Subject: [PATCH] Revert "Add RenderStyle API" This reverts commit 8c7d3b6ab812a5da24f7dd6908ac1e4e2159452d. With DTA_LegacyRenderStyle being added there is no pressing need for this. Aside from that there's an utterly unhealthy amount of information duplication here and it is missing some more recent additions. --- wadsrc/static/zscript/base.txt | 30 ---------------- wadsrc/static/zscript/constants.txt | 55 ----------------------------- 2 files changed, 85 deletions(-) diff --git a/wadsrc/static/zscript/base.txt b/wadsrc/static/zscript/base.txt index cceeaebb1d..dbf71a9424 100644 --- a/wadsrc/static/zscript/base.txt +++ b/wadsrc/static/zscript/base.txt @@ -304,36 +304,6 @@ struct Translation version("2.4") } } -struct RenderStyle -{ - static int CreateLegacy(ERenderStyle style) - { - switch(style) - { - case STYLE_None: return Create(STYLEOP_None, STYLEALPHA_Zero, STYLEALPHA_Zero, 0); - case STYLE_Normal: return Create(STYLEOP_Add, STYLEALPHA_Src, STYLEALPHA_InvSrc, STYLEF_Alpha1); - case STYLE_Fuzzy: return Create(STYLEOP_Fuzz, STYLEALPHA_Src, STYLEALPHA_InvSrc, 0); - case STYLE_SoulTrans: return Create(STYLEOP_Add, STYLEALPHA_Src, STYLEALPHA_InvSrc, STYLEF_TransSoulsAlpha); - case STYLE_OptFuzzy: return Create(STYLEOP_FuzzOrAdd, STYLEALPHA_Src, STYLEALPHA_InvSrc, 0); - case STYLE_Stencil: return Create(STYLEOP_Add, STYLEALPHA_Src, STYLEALPHA_InvSrc, STYLEF_Alpha1 | STYLEF_ColorIsFixed); - case STYLE_Translucent: return Create(STYLEOP_Add, STYLEALPHA_Src, STYLEALPHA_InvSrc, 0); - case STYLE_Add: return Create(STYLEOP_Add, STYLEALPHA_Src, STYLEALPHA_One, 0); - case STYLE_Shaded: return Create(STYLEOP_Add, STYLEALPHA_Src, STYLEALPHA_InvSrc, STYLEF_RedIsAlpha | STYLEF_ColorIsFixed); - case STYLE_TranslucentStencil: return Create(STYLEOP_Add, STYLEALPHA_Src, STYLEALPHA_InvSrc, STYLEF_ColorIsFixed); - case STYLE_Shadow: return Create(STYLEOP_Shadow, 0, 0, 0); - case STYLE_Subtract: return Create(STYLEOP_RevSub, STYLEALPHA_Src, STYLEALPHA_One, 0); - case STYLE_AddStencil: return Create(STYLEOP_Add, STYLEALPHA_Src, STYLEALPHA_One, STYLEF_Alpha1 | STYLEF_ColorIsFixed); - case STYLE_AddShaded: return Create(STYLEOP_Add, STYLEALPHA_Src, STYLEALPHA_One, STYLEF_RedIsAlpha | STYLEF_ColorIsFixed); - default: Object.ThrowAbortException("Unsupported or invalid legacy render style."); return 0; - } - } - - static int Create(ERenderOp blendOp, ERenderAlpha srcAlpha, ERenderAlpha dstAlpha, ERenderFlags flags) - { - return blendOp | (srcAlpha << 8) | (dstAlpha << 16) | (flags << 24); - } -} - struct Console native { native static void HideConsole(); diff --git a/wadsrc/static/zscript/constants.txt b/wadsrc/static/zscript/constants.txt index aae87d7845..156763a27e 100644 --- a/wadsrc/static/zscript/constants.txt +++ b/wadsrc/static/zscript/constants.txt @@ -850,61 +850,6 @@ enum ERenderStyle STYLE_AddShaded, }; -enum ERenderOp -{ - STYLEOP_None, // Do not draw - STYLEOP_Add, // Add source to destination - STYLEOP_Sub, // Subtract source from destination - STYLEOP_RevSub, // Subtract destination from source - STYLEOP_Fuzz, // Draw fuzzy on top of destination - ignores alpha and color - STYLEOP_FuzzOrAdd, // Draw fuzzy or add, based on user preference - STYLEOP_FuzzOrSub, // Draw fuzzy or subtract, based on user preference - STYLEOP_FuzzOrRevSub, // Draw fuzzy or reverse subtract, based on user preference - - // special styles - STYLEOP_Shadow, -}; - -enum ERenderAlpha -{ - STYLEALPHA_Zero, // Blend factor is 0.0 - STYLEALPHA_One, // Blend factor is 1.0 - STYLEALPHA_Src, // Blend factor is alpha - STYLEALPHA_InvSrc, // Blend factor is 1.0 - alpha -}; - -enum ERenderFlags -{ - // Use value of transsouls as alpha. - STYLEF_TransSoulsAlpha = 1, - - // Force alpha to 1. Not the same as STYLEALPHA_One, since that also - // ignores alpha from the texture. - STYLEF_Alpha1 = 2, - - // Use red component from grayscale/RGB texture as alpha. If the texture - // is paletted, the palette is ignored and it is treated as grayscale. - // This should generally be combined with STYLEF_ColorIsFixed, since that's - // all the software renderer supports, but hardware acceleration can do - // them separately should you want to do that for some reason. - STYLEF_RedIsAlpha = 4, - - // Ignore texture for RGB output. Color comes from fillcolor for actors - // or DTA_FillColor for DrawTexture(). - STYLEF_ColorIsFixed = 8, - - // Invert source color, either the texture color or the fixed color. - STYLEF_InvertSource = 16, - - // Invert overlay color. This is the fade for actors and DTA_ColorOverlay - // for DrawTexture(). - STYLEF_InvertOverlay = 32, - - // Actors only: Ignore sector fade and fade to black. To fade to white, - // combine this with STYLEF_InvertOverlay. - STYLEF_FadeToBlack = 64, -}; - // Type definition for the implicit 'callingstate' parameter that gets passed to action functions. enum EStateType {