LOVE/love
1
0
Fork 0
mirror of https://github.com/love2d/love.git synced 2026-08-21 21:15:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

Simplify some boilerplate internal code

Browse Source
This commit is contained in:
Alex Szpakowski
2020-08-02 16:00:08 -03:00
parent f168333938
commit aa219c0d7a
2 changed files with 24 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/graphics/renderstate.cpp
+17 -113
View File
@@ -123,7 +123,7 @@ CompareMode getReversedCompareMode(CompareMode mode)
} }
} }
static StringMap<BlendMode, BLEND_MAX_ENUM>::Entry blendModeEntries[] = STRINGMAP_BEGIN(BlendMode, BLEND_MAX_ENUM, blendMode)
{ {
{ "alpha", BLEND_ALPHA }, { "alpha", BLEND_ALPHA },
{ "add", BLEND_ADD }, { "add", BLEND_ADD },
@@ -135,19 +135,17 @@ static StringMap<BlendMode, BLEND_MAX_ENUM>::Entry blendModeEntries[] =
{ "replace", BLEND_REPLACE }, { "replace", BLEND_REPLACE },
{ "none", BLEND_NONE }, { "none", BLEND_NONE },
{ "custom", BLEND_CUSTOM }, { "custom", BLEND_CUSTOM },
}; }
STRINGMAP_END(BlendMode, BLEND_MAX_ENUM, blendMode)
static StringMap<BlendMode, BLEND_MAX_ENUM> blendModes(blendModeEntries, sizeof(blendModeEntries)); STRINGMAP_BEGIN(BlendAlpha, BLENDALPHA_MAX_ENUM, blendAlpha)
static StringMap<BlendAlpha, BLENDALPHA_MAX_ENUM>::Entry blendAlphaEntries[] =
{ {
{ "alphamultiply", BLENDALPHA_MULTIPLY }, { "alphamultiply", BLENDALPHA_MULTIPLY },
{ "premultiplied", BLENDALPHA_PREMULTIPLIED }, { "premultiplied", BLENDALPHA_PREMULTIPLIED },
}; }
STRINGMAP_END(BlendAlpha, BLENDALPHA_MAX_ENUM, blendAlpha)
static StringMap<BlendAlpha, BLENDALPHA_MAX_ENUM> blendAlphaModes(blendAlphaEntries, sizeof(blendAlphaEntries)); STRINGMAP_BEGIN(BlendFactor, BLENDFACTOR_MAX_ENUM, blendFactor)
static StringMap<BlendFactor, BLENDFACTOR_MAX_ENUM>::Entry blendFactorEntries[] =
{ {
{ "zero", BLENDFACTOR_ZERO }, { "zero", BLENDFACTOR_ZERO },
{ "one", BLENDFACTOR_ONE }, { "one", BLENDFACTOR_ONE },
@@ -160,22 +158,20 @@ static StringMap<BlendFactor, BLENDFACTOR_MAX_ENUM>::Entry blendFactorEntries[]
{ "dstalpha", BLENDFACTOR_DST_ALPHA }, { "dstalpha", BLENDFACTOR_DST_ALPHA },
{ "oneminusdstalpha", BLENDFACTOR_ONE_MINUS_DST_ALPHA }, { "oneminusdstalpha", BLENDFACTOR_ONE_MINUS_DST_ALPHA },
{ "srcalphasaturated", BLENDFACTOR_SRC_ALPHA_SATURATED }, { "srcalphasaturated", BLENDFACTOR_SRC_ALPHA_SATURATED },
}; }
STRINGMAP_END(BlendFactor, BLENDFACTOR_MAX_ENUM, blendFactor)
static StringMap<BlendFactor, BLENDFACTOR_MAX_ENUM> blendFactors(blendFactorEntries, sizeof(blendFactorEntries)); STRINGMAP_BEGIN(BlendOperation, BLENDOP_MAX_ENUM, blendOperation)
static StringMap<BlendOperation, BLENDOP_MAX_ENUM>::Entry blendOperationEntries[] =
{ {
{ "add", BLENDOP_ADD }, { "add", BLENDOP_ADD },
{ "subtract", BLENDOP_SUBTRACT }, { "subtract", BLENDOP_SUBTRACT },
{ "reversesubtract", BLENDOP_REVERSE_SUBTRACT }, { "reversesubtract", BLENDOP_REVERSE_SUBTRACT },
{ "min", BLENDOP_MIN }, { "min", BLENDOP_MIN },
{ "max", BLENDOP_MAX }, { "max", BLENDOP_MAX },
}; }
STRINGMAP_END(BlendOperation, BLENDOP_MAX_ENUM, blendOperation)
static StringMap<BlendOperation, BLENDOP_MAX_ENUM> blendOperations(blendOperationEntries, sizeof(blendOperationEntries)); STRINGMAP_BEGIN(StencilAction, STENCIL_MAX_ENUM, stencilAction)
static StringMap<StencilAction, STENCIL_MAX_ENUM>::Entry stencilActionEntries[] =
{ {
{ "keep", STENCIL_KEEP }, { "keep", STENCIL_KEEP },
{ "zero", STENCIL_ZERO }, { "zero", STENCIL_ZERO },
@@ -185,11 +181,10 @@ static StringMap<StencilAction, STENCIL_MAX_ENUM>::Entry stencilActionEntries[]
{ "incrementwrap", STENCIL_INCREMENT_WRAP }, { "incrementwrap", STENCIL_INCREMENT_WRAP },
{ "decrementwrap", STENCIL_DECREMENT_WRAP }, { "decrementwrap", STENCIL_DECREMENT_WRAP },
{ "invert", STENCIL_INVERT }, { "invert", STENCIL_INVERT },
}; }
STRINGMAP_END(StencilAction, STENCIL_MAX_ENUM, stencilAction)
static StringMap<StencilAction, STENCIL_MAX_ENUM> stencilActions(stencilActionEntries, sizeof(stencilActionEntries)); STRINGMAP_BEGIN(CompareMode, COMPARE_MAX_ENUM, compareMode)
static StringMap<CompareMode, COMPARE_MAX_ENUM>::Entry compareModeEntries[] =
{ {
{ "less", COMPARE_LESS }, { "less", COMPARE_LESS },
{ "lequal", COMPARE_LEQUAL }, { "lequal", COMPARE_LEQUAL },
@@ -199,99 +194,8 @@ static StringMap<CompareMode, COMPARE_MAX_ENUM>::Entry compareModeEntries[] =
{ "notequal", COMPARE_NOTEQUAL }, { "notequal", COMPARE_NOTEQUAL },
{ "always", COMPARE_ALWAYS }, { "always", COMPARE_ALWAYS },
{ "never", COMPARE_NEVER }, { "never", COMPARE_NEVER },
};
static StringMap<CompareMode, COMPARE_MAX_ENUM> compareModes(compareModeEntries, sizeof(compareModeEntries));
bool getConstant(const char *in, BlendMode &out)
{
return blendModes.find(in, out);
}
bool getConstant(BlendMode in, const char *&out)
{
return blendModes.find(in, out);
}
std::vector<std::string> getConstants(BlendMode)
{
return blendModes.getNames();
}
bool getConstant(const char *in, BlendAlpha &out)
{
return blendAlphaModes.find(in, out);
}
bool getConstant(BlendAlpha in, const char *&out)
{
return blendAlphaModes.find(in, out);
}
std::vector<std::string> getConstants(BlendAlpha)
{
return blendAlphaModes.getNames();
}
bool getConstant(const char *in, BlendFactor &out)
{
return blendFactors.find(in, out);
}
bool getConstant(BlendFactor in, const char *&out)
{
return blendFactors.find(in, out);
}
std::vector<std::string> getConstants(BlendFactor)
{
return blendFactors.getNames();
}
bool getConstant(const char *in, BlendOperation &out)
{
return blendOperations.find(in, out);
}
bool getConstant(BlendOperation in, const char *&out)
{
return blendOperations.find(in, out);
}
std::vector<std::string> getConstants(BlendOperation)
{
return blendOperations.getNames();
}
bool getConstant(const char *in, StencilAction &out)
{
return stencilActions.find(in, out);
}
bool getConstant(StencilAction in, const char *&out)
{
return stencilActions.find(in, out);
}
std::vector<std::string> getConstants(StencilAction)
{
return stencilActions.getNames();
}
bool getConstant(const char *in, CompareMode &out)
{
return compareModes.find(in, out);
}
bool getConstant(CompareMode in, const char *&out)
{
return compareModes.find(in, out);
}
std::vector<std::string> getConstants(CompareMode)
{
return compareModes.getNames();
} }
STRINGMAP_END(CompareMode, COMPARE_MAX_ENUM, compareMode)
} // graphics } // graphics
} // love } // love
src/modules/graphics/renderstate.h
+7 -23
View File
@@ -22,6 +22,7 @@
#include "common/int.h" #include "common/int.h"
#include "common/math.h" #include "common/math.h"
#include "common/StringMap.h"
#include "vertex.h" #include "vertex.h"
#include <vector> #include <vector>
@@ -203,29 +204,12 @@ bool isAlphaMultiplyBlendSupported(BlendMode mode);
**/ **/
CompareMode getReversedCompareMode(CompareMode mode); CompareMode getReversedCompareMode(CompareMode mode);
bool getConstant(const char *in, BlendMode &out); STRINGMAP_DECLARE(BlendMode);
bool getConstant(BlendMode in, const char *&out); STRINGMAP_DECLARE(BlendAlpha);
std::vector<std::string> getConstants(BlendMode); STRINGMAP_DECLARE(BlendFactor);
STRINGMAP_DECLARE(BlendOperation);
bool getConstant(const char *in, BlendAlpha &out); STRINGMAP_DECLARE(StencilAction);
bool getConstant(BlendAlpha in, const char *&out); STRINGMAP_DECLARE(CompareMode);
std::vector<std::string> getConstants(BlendAlpha);
bool getConstant(const char *in, BlendFactor &out);
bool getConstant(BlendFactor in, const char *&out);
std::vector<std::string> getConstants(BlendFactor);
bool getConstant(const char *in, BlendOperation &out);
bool getConstant(BlendOperation in, const char *&out);
std::vector<std::string> getConstants(BlendOperation);
bool getConstant(const char *in, StencilAction &out);
bool getConstant(StencilAction in, const char *&out);
std::vector<std::string> getConstants(StencilAction);
bool getConstant(const char *in, CompareMode &out);
bool getConstant(CompareMode in, const char *&out);
std::vector<std::string> getConstants(CompareMode);
} // graphics } // graphics
} // love } // love