mirror
/
openmw
mirror of https://github.com/OpenMW/openmw.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Add comma to the last array element to prevent putting multiple elements on a single line

Browse Source
make_linux_ci_do_zoomies
elsid 2 years ago
parent 5b1d6917ef
commit 52b7b66e9f
No known key found for this signature in database
GPG Key ID: 4DE04C198CBA7625
7 changed files with 48 additions and 47 deletions
Show Stats Download Patch File Download Diff File

36
apps/esmtool/labels.cpp
Unescape Escape View File

@ -46,7 +46,7 @@ std::string bodyPartLabel(int idx)
"Right Shoulder", "Right Shoulder",
"Left Shoulder", "Left Shoulder",
"Weapon", "Weapon",
"Tail" "Tail",
}; };
return bodyPartLabels[idx]; return bodyPartLabels[idx];
} }
@ -73,7 +73,7 @@ std::string meshPartLabel(int idx)
"Knee", "Knee",
"Upper Leg", "Upper Leg",
"Clavicle", "Clavicle",
"Tail" "Tail",
}; };
return meshPartLabels[idx]; return meshPartLabels[idx];
} }
@ -88,7 +88,7 @@ std::string meshTypeLabel(int idx)
static const char *meshTypeLabels[] = { static const char *meshTypeLabels[] = {
"Skin", "Skin",
"Clothing", "Clothing",
"Armor" "Armor",
}; };
return meshTypeLabels[idx]; return meshTypeLabels[idx];
} }
@ -110,7 +110,7 @@ std::string clothingTypeLabel(int idx)
"Left Glove", "Left Glove",
"Skirt", "Skirt",
"Ring", "Ring",
"Amulet" "Amulet",
}; };
return clothingTypeLabels[idx]; return clothingTypeLabels[idx];
} }
@ -133,7 +133,7 @@ std::string armorTypeLabel(int idx)
"Right Gauntlet", "Right Gauntlet",
"Shield", "Shield",
"Left Bracer", "Left Bracer",
"Right Bracer" "Right Bracer",
}; };
return armorTypeLabels[idx]; return armorTypeLabels[idx];
} }
@ -150,7 +150,7 @@ std::string dialogTypeLabel(int idx)
"Voice", "Voice",
"Greeting", "Greeting",
"Persuasion", "Persuasion",
"Journal" "Journal",
}; };
return dialogTypeLabels[idx]; return dialogTypeLabels[idx];
} }
@ -169,7 +169,7 @@ std::string questStatusLabel(int idx)
"Name", "Name",
"Finished", "Finished",
"Restart", "Restart",
"Deleted" "Deleted",
}; };
return questStatusLabels[idx]; return questStatusLabels[idx];
} }
@ -205,7 +205,7 @@ std::string soundTypeLabel(int idx)
"Moan", "Moan",
"Roar", "Roar",
"Scream", "Scream",
"Land" "Land",
}; };
return soundTypeLabels[idx]; return soundTypeLabels[idx];
} }
@ -231,7 +231,7 @@ std::string weaponTypeLabel(int idx)
"Marksman Crossbow", "Marksman Crossbow",
"Marksman Thrown", "Marksman Thrown",
"Arrow", "Arrow",
"Bolt" "Bolt",
}; };
return weaponTypeLabels[idx]; return weaponTypeLabels[idx];
} }
@ -396,7 +396,7 @@ std::string magicEffectLabel(int idx)
"sEffectSummonCreature02", "sEffectSummonCreature02",
"sEffectSummonCreature03", "sEffectSummonCreature03",
"sEffectSummonCreature04", "sEffectSummonCreature04",
"sEffectSummonCreature05" "sEffectSummonCreature05",
}; };
return magicEffectLabels[idx]; return magicEffectLabels[idx];
} }
@ -416,7 +416,7 @@ std::string attributeLabel(int idx)
"Speed", "Speed",
"Endurance", "Endurance",
"Personality", "Personality",
"Luck" "Luck",
}; };
return attributeLabels[idx]; return attributeLabels[idx];
} }
@ -434,7 +434,7 @@ std::string spellTypeLabel(int idx)
"Blight Disease", "Blight Disease",
"Disease", "Disease",
"Curse", "Curse",
"Powers" "Powers",
}; };
return spellTypeLabels[idx]; return spellTypeLabels[idx];
} }
@ -449,7 +449,7 @@ std::string specializationLabel(int idx)
const char* specializationLabels [] = { const char* specializationLabels [] = {
"Combat", "Combat",
"Magic", "Magic",
"Stealth" "Stealth",
}; };
return specializationLabels[idx]; return specializationLabels[idx];
} }
@ -488,7 +488,7 @@ std::string skillLabel(int idx)
"Marksman", "Marksman",
"Mercantile", "Mercantile",
"Speechcraft", "Speechcraft",
"Hand-to-hand" "Hand-to-hand",
}; };
return skillLabels[idx]; return skillLabels[idx];
} }
@ -519,7 +519,7 @@ std::string rangeTypeLabel(int idx)
const char* rangeTypeLabels [] = { const char* rangeTypeLabels [] = {
"Self", "Self",
"Touch", "Touch",
"Target" "Target",
}; };
return rangeTypeLabels[idx]; return rangeTypeLabels[idx];
} }
@ -537,7 +537,7 @@ std::string schoolLabel(int idx)
"Destruction", "Destruction",
"Illusion", "Illusion",
"Mysticism", "Mysticism",
"Restoration" "Restoration",
}; };
return schoolLabels[idx]; return schoolLabels[idx];
} }
@ -553,7 +553,7 @@ std::string enchantTypeLabel(int idx)
"Cast Once", "Cast Once",
"Cast When Strikes", "Cast When Strikes",
"Cast When Used", "Cast When Used",
"Constant Effect" "Constant Effect",
}; };
return enchantTypeLabels[idx]; return enchantTypeLabels[idx];
} }
@ -638,7 +638,7 @@ std::string ruleFunction(int idx)
"Alarm", "Alarm",
"Flee", "Flee",
"Should Attack", "Should Attack",
"Werewolf" "Werewolf",
}; };
return ruleFunctions[idx]; return ruleFunctions[idx];
} }

3
apps/opencs/model/world/columns.cpp
Unescape Escape View File

@ -375,7 +375,8 @@ namespace CSMWorld
{ ColumnId_LevelledCreatureId,"Levelled Creature" }, { ColumnId_LevelledCreatureId,"Levelled Creature" },
{ -1, 0 } // end marker // end marker
{ -1, 0 },
}; };
} }
} }

20
apps/opencs/model/world/defaultgmsts.cpp
Unescape Escape View File

@ -267,7 +267,7 @@ const char* CSMWorld::DefaultGmsts::Floats[CSMWorld::DefaultGmsts::FloatCount] =
"fWereWolfStrength", "fWereWolfStrength",
"fWereWolfUnarmored", "fWereWolfUnarmored",
"fWereWolfWillPower", "fWereWolfWillPower",
"fWortChanceValue" "fWortChanceValue",
}; };
const char * CSMWorld::DefaultGmsts::Ints[CSMWorld::DefaultGmsts::IntCount] = const char * CSMWorld::DefaultGmsts::Ints[CSMWorld::DefaultGmsts::IntCount] =
@ -360,7 +360,7 @@ const char * CSMWorld::DefaultGmsts::Ints[CSMWorld::DefaultGmsts::IntCount] =
"iWereWolfBounty", "iWereWolfBounty",
"iWereWolfFightMod", "iWereWolfFightMod",
"iWereWolfFleeMod", "iWereWolfFleeMod",
"iWereWolfLevelToAttack" "iWereWolfLevelToAttack",
}; };
const char * CSMWorld::DefaultGmsts::Strings[CSMWorld::DefaultGmsts::StringCount] = const char * CSMWorld::DefaultGmsts::Strings[CSMWorld::DefaultGmsts::StringCount] =
@ -1538,7 +1538,7 @@ const char * CSMWorld::DefaultGmsts::Strings[CSMWorld::DefaultGmsts::StringCount
"sXTimes", "sXTimes",
"sXTimesINT", "sXTimesINT",
"sYes", "sYes",
"sYourGold" "sYourGold",
}; };
const char * CSMWorld::DefaultGmsts::OptionalFloats[CSMWorld::DefaultGmsts::OptionalFloatCount] = const char * CSMWorld::DefaultGmsts::OptionalFloats[CSMWorld::DefaultGmsts::OptionalFloatCount] =
@ -1584,7 +1584,7 @@ const char * CSMWorld::DefaultGmsts::OptionalFloats[CSMWorld::DefaultGmsts::Opti
"fWereWolfSpeed", "fWereWolfSpeed",
"fWereWolfStrength", "fWereWolfStrength",
"fWereWolfUnarmored", "fWereWolfUnarmored",
"fWereWolfWillPower" "fWereWolfWillPower",
}; };
const char * CSMWorld::DefaultGmsts::OptionalInts[CSMWorld::DefaultGmsts::OptionalIntCount] = const char * CSMWorld::DefaultGmsts::OptionalInts[CSMWorld::DefaultGmsts::OptionalIntCount] =
@ -1592,7 +1592,7 @@ const char * CSMWorld::DefaultGmsts::OptionalInts[CSMWorld::DefaultGmsts::Option
"iWereWolfBounty", "iWereWolfBounty",
"iWereWolfFightMod", "iWereWolfFightMod",
"iWereWolfFleeMod", "iWereWolfFleeMod",
"iWereWolfLevelToAttack" "iWereWolfLevelToAttack",
}; };
const char * CSMWorld::DefaultGmsts::OptionalStrings[CSMWorld::DefaultGmsts::OptionalStringCount] = const char * CSMWorld::DefaultGmsts::OptionalStrings[CSMWorld::DefaultGmsts::OptionalStringCount] =
@ -1622,7 +1622,7 @@ const char * CSMWorld::DefaultGmsts::OptionalStrings[CSMWorld::DefaultGmsts::Opt
"sWerewolfAlarmMessage", "sWerewolfAlarmMessage",
"sWerewolfPopup", "sWerewolfPopup",
"sWerewolfRefusal", "sWerewolfRefusal",
"sWerewolfRestMessage" "sWerewolfRestMessage",
}; };
const float CSMWorld::DefaultGmsts::FloatsDefaultValues[CSMWorld::DefaultGmsts::FloatCount] = const float CSMWorld::DefaultGmsts::FloatsDefaultValues[CSMWorld::DefaultGmsts::FloatCount] =
@ -1884,7 +1884,7 @@ const float CSMWorld::DefaultGmsts::FloatsDefaultValues[CSMWorld::DefaultGmsts::
150.0f, // fWereWolfStrength 150.0f, // fWereWolfStrength
100.0f, // fWereWolfUnarmored 100.0f, // fWereWolfUnarmored
1.0f, // fWereWolfWillPower 1.0f, // fWereWolfWillPower
15.0f // fWortChanceValue 15.0f, // fWortChanceValue
}; };
const int CSMWorld::DefaultGmsts::IntsDefaultValues[CSMWorld::DefaultGmsts::IntCount] = const int CSMWorld::DefaultGmsts::IntsDefaultValues[CSMWorld::DefaultGmsts::IntCount] =
@ -1977,7 +1977,7 @@ const int CSMWorld::DefaultGmsts::IntsDefaultValues[CSMWorld::DefaultGmsts::IntC
10000, // iWereWolfBounty 10000, // iWereWolfBounty
100, // iWereWolfFightMod 100, // iWereWolfFightMod
100, // iWereWolfFleeMod 100, // iWereWolfFleeMod
20 // iWereWolfLevelToAttack 20, // iWereWolfLevelToAttack
}; };
const float CSMWorld::DefaultGmsts::FloatLimits[CSMWorld::DefaultGmsts::FloatCount * 2] = const float CSMWorld::DefaultGmsts::FloatLimits[CSMWorld::DefaultGmsts::FloatCount * 2] =
@ -2239,7 +2239,7 @@ const float CSMWorld::DefaultGmsts::FloatLimits[CSMWorld::DefaultGmsts::FloatCou
-FInf, FInf, // fWereWolfStrength -FInf, FInf, // fWereWolfStrength
-FInf, FInf, // fWereWolfUnarmored -FInf, FInf, // fWereWolfUnarmored
-FInf, FInf, // fWereWolfWillPower -FInf, FInf, // fWereWolfWillPower
0, FInf // fWortChanceValue 0, FInf, // fWortChanceValue
}; };
const int CSMWorld::DefaultGmsts::IntLimits[CSMWorld::DefaultGmsts::IntCount * 2] = const int CSMWorld::DefaultGmsts::IntLimits[CSMWorld::DefaultGmsts::IntCount * 2] =
@ -2332,5 +2332,5 @@ const int CSMWorld::DefaultGmsts::IntLimits[CSMWorld::DefaultGmsts::IntCount * 2
IMin, IMax, // iWereWolfBounty IMin, IMax, // iWereWolfBounty
IMin, IMax, // iWereWolfFightMod IMin, IMax, // iWereWolfFightMod
IMin, IMax, // iWereWolfFleeMod IMin, IMax, // iWereWolfFleeMod
IMin, IMax // iWereWolfLevelToAttack IMin, IMax, // iWereWolfLevelToAttack
}; };

10
apps/openmw/mwlua/inputbindings.cpp
Unescape Escape View File

@ -140,7 +140,7 @@ namespace MWLua
{"TogglePostProcessorHUD", MWInput::A_TogglePostProcessorHUD}, {"TogglePostProcessorHUD", MWInput::A_TogglePostProcessorHUD},
{"ZoomIn", MWInput::A_ZoomIn}, {"ZoomIn", MWInput::A_ZoomIn},
{"ZoomOut", MWInput::A_ZoomOut} {"ZoomOut", MWInput::A_ZoomOut},
})); }));
api["CONTROL_SWITCH"] = LuaUtil::makeStrictReadOnly(context.mLua->tableFromPairs<std::string_view, std::string_view>({ api["CONTROL_SWITCH"] = LuaUtil::makeStrictReadOnly(context.mLua->tableFromPairs<std::string_view, std::string_view>({
@ -150,7 +150,7 @@ namespace MWLua
{"Looking", "playerlooking"}, {"Looking", "playerlooking"},
{"Magic", "playermagic"}, {"Magic", "playermagic"},
{"ViewMode", "playerviewswitch"}, {"ViewMode", "playerviewswitch"},
{"VanityMode", "vanitymode"} {"VanityMode", "vanitymode"},
})); }));
api["CONTROLLER_BUTTON"] = LuaUtil::makeStrictReadOnly(context.mLua->tableFromPairs<std::string_view, SDL_GameControllerButton>({ api["CONTROLLER_BUTTON"] = LuaUtil::makeStrictReadOnly(context.mLua->tableFromPairs<std::string_view, SDL_GameControllerButton>({
@ -168,7 +168,7 @@ namespace MWLua
{"DPadUp", SDL_CONTROLLER_BUTTON_DPAD_UP}, {"DPadUp", SDL_CONTROLLER_BUTTON_DPAD_UP},
{"DPadDown", SDL_CONTROLLER_BUTTON_DPAD_DOWN}, {"DPadDown", SDL_CONTROLLER_BUTTON_DPAD_DOWN},
{"DPadLeft", SDL_CONTROLLER_BUTTON_DPAD_LEFT}, {"DPadLeft", SDL_CONTROLLER_BUTTON_DPAD_LEFT},
{"DPadRight", SDL_CONTROLLER_BUTTON_DPAD_RIGHT} {"DPadRight", SDL_CONTROLLER_BUTTON_DPAD_RIGHT},
})); }));
api["CONTROLLER_AXIS"] = LuaUtil::makeStrictReadOnly(context.mLua->tableFromPairs<std::string_view, int>({ api["CONTROLLER_AXIS"] = LuaUtil::makeStrictReadOnly(context.mLua->tableFromPairs<std::string_view, int>({
@ -182,7 +182,7 @@ namespace MWLua
{"LookUpDown", SDL_CONTROLLER_AXIS_MAX + static_cast<int>(MWInput::A_LookUpDown)}, {"LookUpDown", SDL_CONTROLLER_AXIS_MAX + static_cast<int>(MWInput::A_LookUpDown)},
{"LookLeftRight", SDL_CONTROLLER_AXIS_MAX + static_cast<int>(MWInput::A_LookLeftRight)}, {"LookLeftRight", SDL_CONTROLLER_AXIS_MAX + static_cast<int>(MWInput::A_LookLeftRight)},
{"MoveForwardBackward", SDL_CONTROLLER_AXIS_MAX + static_cast<int>(MWInput::A_MoveForwardBackward)}, {"MoveForwardBackward", SDL_CONTROLLER_AXIS_MAX + static_cast<int>(MWInput::A_MoveForwardBackward)},
{"MoveLeftRight", SDL_CONTROLLER_AXIS_MAX + static_cast<int>(MWInput::A_MoveLeftRight)} {"MoveLeftRight", SDL_CONTROLLER_AXIS_MAX + static_cast<int>(MWInput::A_MoveLeftRight)},
})); }));
api["KEY"] = LuaUtil::makeStrictReadOnly(context.mLua->tableFromPairs<std::string_view, SDL_Scancode>({ api["KEY"] = LuaUtil::makeStrictReadOnly(context.mLua->tableFromPairs<std::string_view, SDL_Scancode>({
@ -293,7 +293,7 @@ namespace MWLua
{"Semicolon", SDL_SCANCODE_SEMICOLON}, {"Semicolon", SDL_SCANCODE_SEMICOLON},
{"Slash", SDL_SCANCODE_SLASH}, {"Slash", SDL_SCANCODE_SLASH},
{"Space", SDL_SCANCODE_SPACE}, {"Space", SDL_SCANCODE_SPACE},
{"Tab", SDL_SCANCODE_TAB} {"Tab", SDL_SCANCODE_TAB},
})); }));
return LuaUtil::makeReadOnly(api); return LuaUtil::makeReadOnly(api);

10
components/esm/attr.cpp
Unescape Escape View File

@ -10,7 +10,7 @@ const Attribute::AttributeID Attribute::sAttributeIds[Attribute::Length] = {
Attribute::Speed, Attribute::Speed,
Attribute::Endurance, Attribute::Endurance,
Attribute::Personality, Attribute::Personality,
Attribute::Luck Attribute::Luck,
}; };
const std::string Attribute::sAttributeNames[Attribute::Length] = { const std::string Attribute::sAttributeNames[Attribute::Length] = {
@ -21,7 +21,7 @@ const std::string Attribute::sAttributeNames[Attribute::Length] = {
"Speed", "Speed",
"Endurance", "Endurance",
"Personality", "Personality",
"Luck" "Luck",
}; };
const std::string Attribute::sGmstAttributeIds[Attribute::Length] = { const std::string Attribute::sGmstAttributeIds[Attribute::Length] = {
@ -32,7 +32,7 @@ const std::string Attribute::sGmstAttributeIds[Attribute::Length] = {
"sAttributeSpeed", "sAttributeSpeed",
"sAttributeEndurance", "sAttributeEndurance",
"sAttributePersonality", "sAttributePersonality",
"sAttributeLuck" "sAttributeLuck",
}; };
const std::string Attribute::sGmstAttributeDescIds[Attribute::Length] = { const std::string Attribute::sGmstAttributeDescIds[Attribute::Length] = {
@ -43,7 +43,7 @@ const std::string Attribute::sGmstAttributeDescIds[Attribute::Length] = {
"sSpdDesc", "sSpdDesc",
"sEndDesc", "sEndDesc",
"sPerDesc", "sPerDesc",
"sLucDesc" "sLucDesc",
}; };
const std::string Attribute::sAttributeIcons[Attribute::Length] = { const std::string Attribute::sAttributeIcons[Attribute::Length] = {
@ -54,5 +54,5 @@ const std::string Attribute::sAttributeIcons[Attribute::Length] = {
"icons\\k\\attribute_speed.dds", "icons\\k\\attribute_speed.dds",
"icons\\k\\attribute_endurance.dds", "icons\\k\\attribute_endurance.dds",
"icons\\k\\attribute_personality.dds", "icons\\k\\attribute_personality.dds",
"icons\\k\\attribute_luck.dds" "icons\\k\\attribute_luck.dds",
}; };

2
components/esm3/loadmgef.cpp
Unescape Escape View File

@ -160,7 +160,7 @@ namespace
"SummonBear", "SummonBear",
"SummonBonewolf", "SummonBonewolf",
"SummonCreature04", "SummonCreature04",
"SummonCreature05" "SummonCreature05",
}; };
const int NumberOfHardcodedFlags = 143; const int NumberOfHardcodedFlags = 143;

14
components/fx/parse_constants.hpp
Unescape Escape View File

@ -23,7 +23,7 @@ namespace fx
{"disable_underwater" , Technique::Flag_Disable_Underwater}, {"disable_underwater" , Technique::Flag_Disable_Underwater},
{"disable_abovewater" , Technique::Flag_Disable_Abovewater}, {"disable_abovewater" , Technique::Flag_Disable_Abovewater},
{"disable_sunglare" , Technique::Flag_Disable_SunGlare}, {"disable_sunglare" , Technique::Flag_Disable_SunGlare},
{"hidden" , Technique::Flag_Hidden} {"hidden" , Technique::Flag_Hidden},
}}; }};
constexpr std::array<std::pair<std::string_view, int>, 6> SourceFormat = {{ constexpr std::array<std::pair<std::string_view, int>, 6> SourceFormat = {{
@ -63,7 +63,7 @@ namespace fx
{"depth_component16" , GL_DEPTH_COMPONENT16}, {"depth_component16" , GL_DEPTH_COMPONENT16},
{"depth_component24" , GL_DEPTH_COMPONENT24}, {"depth_component24" , GL_DEPTH_COMPONENT24},
{"depth_component32" , GL_DEPTH_COMPONENT32}, {"depth_component32" , GL_DEPTH_COMPONENT32},
{"depth_component32f", GL_DEPTH_COMPONENT32F} {"depth_component32f", GL_DEPTH_COMPONENT32F},
}}; }};
constexpr std::array<std::pair<std::string_view, osg::Texture::InternalFormatMode>, 13> Compression = {{ constexpr std::array<std::pair<std::string_view, osg::Texture::InternalFormatMode>, 13> Compression = {{
@ -79,7 +79,7 @@ namespace fx
{"rgtc1" , osg::Texture::USE_RGTC1_COMPRESSION}, {"rgtc1" , osg::Texture::USE_RGTC1_COMPRESSION},
{"rgtc2" , osg::Texture::USE_RGTC2_COMPRESSION}, {"rgtc2" , osg::Texture::USE_RGTC2_COMPRESSION},
{"s3tc_dxt1c" , osg::Texture::USE_S3TC_DXT1c_COMPRESSION}, {"s3tc_dxt1c" , osg::Texture::USE_S3TC_DXT1c_COMPRESSION},
{"s3tc_dxt1a" , osg::Texture::USE_S3TC_DXT1a_COMPRESSION} {"s3tc_dxt1a" , osg::Texture::USE_S3TC_DXT1a_COMPRESSION},
}}; }};
constexpr std::array<std::pair<std::string_view, osg::Texture::WrapMode>, 6> WrapMode = {{ constexpr std::array<std::pair<std::string_view, osg::Texture::WrapMode>, 6> WrapMode = {{
@ -87,7 +87,7 @@ namespace fx
{"clamp_to_edge" , osg::Texture::CLAMP_TO_EDGE}, {"clamp_to_edge" , osg::Texture::CLAMP_TO_EDGE},
{"clamp_to_border", osg::Texture::CLAMP_TO_BORDER}, {"clamp_to_border", osg::Texture::CLAMP_TO_BORDER},
{"repeat" , osg::Texture::REPEAT}, {"repeat" , osg::Texture::REPEAT},
{"mirror" , osg::Texture::MIRROR} {"mirror" , osg::Texture::MIRROR},
}}; }};
constexpr std::array<std::pair<std::string_view, osg::Texture::FilterMode>, 6> FilterMode = {{ constexpr std::array<std::pair<std::string_view, osg::Texture::FilterMode>, 6> FilterMode = {{
@ -96,7 +96,7 @@ namespace fx
{"linear_mipmap_nearest" , osg::Texture::LINEAR_MIPMAP_NEAREST}, {"linear_mipmap_nearest" , osg::Texture::LINEAR_MIPMAP_NEAREST},
{"nearest" , osg::Texture::NEAREST}, {"nearest" , osg::Texture::NEAREST},
{"nearest_mipmap_linear" , osg::Texture::NEAREST_MIPMAP_LINEAR}, {"nearest_mipmap_linear" , osg::Texture::NEAREST_MIPMAP_LINEAR},
{"nearest_mipmap_nearest", osg::Texture::NEAREST_MIPMAP_NEAREST} {"nearest_mipmap_nearest", osg::Texture::NEAREST_MIPMAP_NEAREST},
}}; }};
constexpr std::array<std::pair<std::string_view, osg::BlendFunc::BlendFuncMode>, 15> BlendFunc = {{ constexpr std::array<std::pair<std::string_view, osg::BlendFunc::BlendFuncMode>, 15> BlendFunc = {{
@ -114,7 +114,7 @@ namespace fx
{"one_minus_constant_color" , osg::BlendFunc::ONE_MINUS_CONSTANT_COLOR}, {"one_minus_constant_color" , osg::BlendFunc::ONE_MINUS_CONSTANT_COLOR},
{"constant_alpha" , osg::BlendFunc::CONSTANT_ALPHA}, {"constant_alpha" , osg::BlendFunc::CONSTANT_ALPHA},
{"one_minus_constant_alpha" , osg::BlendFunc::ONE_MINUS_CONSTANT_ALPHA}, {"one_minus_constant_alpha" , osg::BlendFunc::ONE_MINUS_CONSTANT_ALPHA},
{"zero" , osg::BlendFunc::ZERO} {"zero" , osg::BlendFunc::ZERO},
}}; }};
constexpr std::array<std::pair<std::string_view, osg::BlendEquation::Equation>, 8> BlendEquation = {{ constexpr std::array<std::pair<std::string_view, osg::BlendEquation::Equation>, 8> BlendEquation = {{
@ -125,7 +125,7 @@ namespace fx
{"logic_op" , osg::BlendEquation::LOGIC_OP}, {"logic_op" , osg::BlendEquation::LOGIC_OP},
{"add" , osg::BlendEquation::FUNC_ADD}, {"add" , osg::BlendEquation::FUNC_ADD},
{"subtract" , osg::BlendEquation::FUNC_SUBTRACT}, {"subtract" , osg::BlendEquation::FUNC_SUBTRACT},
{"reverse_subtract" , osg::BlendEquation::FUNC_REVERSE_SUBTRACT} {"reverse_subtract" , osg::BlendEquation::FUNC_REVERSE_SUBTRACT},
}}; }};
} }
} }

Write Preview
Loading…
Cancel
Save