Scarfski/filament
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add support for basic PCSS

Browse Source
This commit is contained in:
Mathias Agopian
2021-12-08 00:17:12 -06:00
committed by Mathias Agopian
parent 332d5681e6
commit 078de4e422
23 changed files with 371 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libs/viewer/src/Settings.cpp
+39 -1
View File
@@ -213,6 +213,7 @@ static int parse(jsmntok_t const* tokens, int i, const char* jsonChunk, ShadowTy
if (0 == compare(tokens[i], jsonChunk, "PCF")) { *out = ShadowType::PCF; }
else if (0 == compare(tokens[i], jsonChunk, "VSM")) { *out = ShadowType::VSM; }
else if (0 == compare(tokens[i], jsonChunk, "DPCF")) { *out = ShadowType::DPCF; }
else if (0 == compare(tokens[i], jsonChunk, "PCSS")) { *out = ShadowType::PCSS; }
else {
slog.w << "Invalid ShadowType: '" << STR(tokens[i], jsonChunk) << "'" << io::endl;
}
@@ -880,6 +881,30 @@ static int parse(jsmntok_t const* tokens, int i, const char* jsonChunk,
return i;
}
static int parse(jsmntok_t const* tokens, int i, const char* jsonChunk,
SoftShadowOptions* out) {
CHECK_TOKTYPE(tokens[i], JSMN_OBJECT);
int size = tokens[i++].size;
math::float3 splitsVector;
for (int j = 0; j < size; ++j) {
const jsmntok_t tok = tokens[i];
CHECK_KEY(tok);
if (compare(tok, jsonChunk, "penumbraScale") == 0) {
i = parse(tokens, i + 1, jsonChunk, &out->penumbraScale);
} else if (compare(tok, jsonChunk, "penumbraRatioScale") == 0) {
i = parse(tokens, i + 1, jsonChunk, &out->penumbraRatioScale);
} else {
slog.w << "Invalid soft shadow options key: '" << STR(tok, jsonChunk) << "'" << io::endl;
i = parse(tokens, i + 1);
}
if (i < 0) {
slog.e << "Invalid soft shadow options value: '" << STR(tok, jsonChunk) << "'" << io::endl;
return i;
}
}
return i;
}
static int parse(jsmntok_t const* tokens, int i, const char* jsonChunk, LightSettings* out) {
CHECK_TOKTYPE(tokens[i], JSMN_OBJECT);
int size = tokens[i++].size;
@@ -892,6 +917,8 @@ static int parse(jsmntok_t const* tokens, int i, const char* jsonChunk, LightSet
i = parse(tokens, i + 1, jsonChunk, &out->enableSunlight);
} else if (compare(tok, jsonChunk, "shadowOptions") == 0) {
i = parse(tokens, i + 1, jsonChunk, &out->shadowOptions);
} else if (compare(tok, jsonChunk, "softShadowOptions") == 0) {
i = parse(tokens, i + 1, jsonChunk, &out->softShadowOptions);
} else if (compare(tok, jsonChunk, "sunlightIntensity") == 0) {
i = parse(tokens, i + 1, jsonChunk, &out->sunlightIntensity);
} else if (compare(tok, jsonChunk, "sunlightDirection") == 0) {
@@ -1011,7 +1038,7 @@ void applySettings(const MaterialSettings& settings, MaterialInstance* dest) {
}
void applySettings(const LightSettings& settings, IndirectLight* ibl, utils::Entity sunlight,
utils::Entity* sceneLights, size_t sceneLightCount, LightManager* lm, Scene* scene) {
utils::Entity* sceneLights, size_t sceneLightCount, LightManager* lm, Scene* scene, View* view) {
auto light = lm->getInstance(sunlight);
if (light) {
if (settings.enableSunlight) {
@@ -1036,6 +1063,7 @@ void applySettings(const LightSettings& settings, IndirectLight* ibl, utils::Ent
}
lm->setShadowOptions(light, settings.shadowOptions);
}
view->setSoftShadowOptions(settings.softShadowOptions);
}
static LinearColor inverseTonemapSRGB(sRGBColor x) {
@@ -1130,6 +1158,7 @@ static std::ostream& operator<<(std::ostream& out, ShadowType in) {
case ShadowType::PCF: return out << "\"PCF\"";
case ShadowType::VSM: return out << "\"VSM\"";
case ShadowType::DPCF: return out << "\"DPCF\"";
case ShadowType::PCSS: return out << "\"PCSS\"";
}
return out << "\"INVALID\"";
}
@@ -1400,11 +1429,20 @@ static std::ostream& operator<<(std::ostream& out, const MaterialSettings& in) {
return out << result;
}
static std::ostream& operator<<(std::ostream& out, const SoftShadowOptions& in) {
return out << "{\n"
<< "\"penumbraScale\": " << in.penumbraScale << ",\n"
<< "\"penumbraRatioScale\": " << in.penumbraRatioScale << "\n"
<< "}";
}
static std::ostream& operator<<(std::ostream& out, const LightSettings& in) {
return out << "{\n"
<< "\"enableShadows\": " << to_string(in.enableShadows) << ",\n"
<< "\"enableSunlight\": " << to_string(in.enableSunlight) << ",\n"
<< "\"shadowOptions\": " << (in.shadowOptions) << ",\n"
<< "\"softShadowOptions\": " << (in.softShadowOptions) << ",\n"
<< "\"sunlightIntensity\": " << (in.sunlightIntensity) << ",\n"
<< "\"sunlightDirection\": " << (in.sunlightDirection) << ",\n"
<< "\"sunlightColor\": " << (in.sunlightColor) << ",\n"