AnarchistGamers/openmw
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-09-09 12:25:17 -04:00
Code Issues Packages Projects Releases Wiki Activity

Format

Browse Source
This commit is contained in:
AnyOldName3 2025-04-20 00:17:03 +01:00
parent 115fc08904
commit 4707c7e2fc
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
components/shader/shadervisitor.cpp
View File

@ -287,8 +287,8 @@ namespace Shader
addedState->setName("addedState"); addedState->setName("addedState");
} }
const char* defaultTextures[] = { "diffuseMap", "normalMap", "normalHeightMap", "emissiveMap", "darkMap", "detailMap", "envMap", const char* defaultTextures[] = { "diffuseMap", "normalMap", "normalHeightMap", "emissiveMap", "darkMap",
"specularMap", "decalMap", "bumpMap", "glossMap" }; "detailMap", "envMap", "specularMap", "decalMap", "bumpMap", "glossMap" };
bool isTextureNameRecognized(std::string_view name) bool isTextureNameRecognized(std::string_view name)
{ {
return std::find(std::begin(defaultTextures), std::end(defaultTextures), name) != std::end(defaultTextures); return std::find(std::begin(defaultTextures), std::end(defaultTextures), name) != std::end(defaultTextures);
@ -439,8 +439,9 @@ namespace Shader
if (!writableStateSet) if (!writableStateSet)
writableStateSet = getWritableStateSet(node); writableStateSet = getWritableStateSet(node);
writableStateSet->setTextureAttributeAndModes(unit, normalMapTex, osg::StateAttribute::ON); writableStateSet->setTextureAttributeAndModes(unit, normalMapTex, osg::StateAttribute::ON);
writableStateSet->setTextureAttributeAndModes( writableStateSet->setTextureAttributeAndModes(unit,
unit, new SceneUtil::TextureType(normalHeight ? "normalHeightMap" : "normalMap"), osg::StateAttribute::ON); new SceneUtil::TextureType(normalHeight ? "normalHeightMap" : "normalMap"),
osg::StateAttribute::ON);
mRequirements.back().mTextures[unit] = "normalMap"; mRequirements.back().mTextures[unit] = "normalMap";
mRequirements.back().mTexStageRequiringTangents = unit; mRequirements.back().mTexStageRequiringTangents = unit;
mRequirements.back().mShaderRequired = true; mRequirements.back().mShaderRequired = true;