wbrawner/reone
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor: Refactor lighting and shading conditionals

Browse source
This commit is contained in:
Vsevolod Kremianskii 2021-02-17 21:52:29 +07:00
parent e794f2ced9
commit 14c3ee3722
1 changed files with 26 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
src/scene/node/modelnodescenenode.cpp
View file

@ -105,25 +105,33 @@ bool ModelNodeSceneNode::isTransparent() const {
return mesh->isTransparent() || _modelNode->alpha() < 1.0f; return mesh->isTransparent() || _modelNode->alpha() < 1.0f;
} }
static bool isLightingEnabled(ModelSceneNode::Classification clazz) { static bool isLightingEnabledByClassification(ModelSceneNode::Classification classification) {
switch (clazz) { if (classification == ModelSceneNode::Classification::Room) {
case ModelSceneNode::Classification::Room: return isFeatureEnabled(Feature::DynamicRoomLighting);
return isFeatureEnabled(Feature::DynamicRoomLighting);
case ModelSceneNode::Classification::Creature:
case ModelSceneNode::Classification::Placeable:
case ModelSceneNode::Classification::Door:
case ModelSceneNode::Classification::Equipment:
case ModelSceneNode::Classification::Other:
return true;
default:
return false;
} }
return classification != ModelSceneNode::Classification::Projectile;
} }
static bool isReceivingShadows(ModelSceneNode::Classification clazz) { static bool isLightingEnabled(const ModelSceneNode &model, const ModelNode &modelNode, const shared_ptr<Texture> &diffuse) {
return clazz == ModelSceneNode::Classification::Room; if (!isLightingEnabledByClassification(model.classification())) return false;
// Lighting is disabled for lightmapped models, unless dynamic room lighting is enabled
if (modelNode.mesh()->hasLightmapTexture() && !isFeatureEnabled(Feature::DynamicRoomLighting)) return false;
// Lighting is disabled for self-illuminated room model nodes, e.g. the skybox
if (modelNode.isSelfIllumEnabled() && model.classification() == ModelSceneNode::Classification::Room) return false;
// Lighting is disabled when diffuse texture is additive
if (diffuse && diffuse->isAdditive()) return false;
return true;
}
static bool isReceivingShadows(const ModelSceneNode &modelSceneNode, const ModelNode &modelNode) {
// Only room models receive shadows, unless model node is self-illuminated
return
modelSceneNode.classification() == ModelSceneNode::Classification::Room &&
!modelNode.isSelfIllumEnabled();
} }
void ModelNodeSceneNode::renderSingle(bool shadowPass) { void ModelNodeSceneNode::renderSingle(bool shadowPass) {
@ -181,7 +189,7 @@ void ModelNodeSceneNode::renderSingle(bool shadowPass) {
uniforms.bumpmap.swizzled = mesh->isBumpmapSwizzled(); uniforms.bumpmap.swizzled = mesh->isBumpmapSwizzled();
} }
bool receivesShadows = isReceivingShadows(_modelSceneNode->classification()) && !_modelNode->isSelfIllumEnabled(); bool receivesShadows = isReceivingShadows(*_modelSceneNode, *_modelNode);
if (receivesShadows) { if (receivesShadows) {
uniforms.general.featureMask |= UniformFeatureFlags::shadows; uniforms.general.featureMask |= UniformFeatureFlags::shadows;
} }
@ -208,11 +216,7 @@ void ModelNodeSceneNode::renderSingle(bool shadowPass) {
uniforms.general.featureMask |= UniformFeatureFlags::selfIllum; uniforms.general.featureMask |= UniformFeatureFlags::selfIllum;
uniforms.general.selfIllumColor = glm::vec4(_modelNode->selfIllumColor(), 1.0f); uniforms.general.selfIllumColor = glm::vec4(_modelNode->selfIllumColor(), 1.0f);
} }
if (isLightingEnabled(_modelSceneNode->classification()) && if (isLightingEnabled(*_modelSceneNode, *_modelNode, diffuseTexture)) {
(!mesh->hasLightmapTexture() || isFeatureEnabled(Feature::DynamicRoomLighting)) &&
(!_modelNode->isSelfIllumEnabled() || _modelSceneNode->classification() != ModelSceneNode::Classification::Room) &&
(!diffuseTexture || !diffuseTexture->isAdditive())) {
const vector<LightSceneNode *> &lights = _modelSceneNode->lightsAffectedBy(); const vector<LightSceneNode *> &lights = _modelSceneNode->lightsAffectedBy();
uniforms.general.featureMask |= UniformFeatureFlags::lighting; uniforms.general.featureMask |= UniformFeatureFlags::lighting;