viewer: add SCCT to JSON serializer.

This commit is contained in:
Philip Rideout
2020-09-29 10:47:35 -07:00
parent e9ace4e5fb
commit 6472f645fc
3 changed files with 74 additions and 3 deletions
+1 -1
View File
@@ -229,7 +229,7 @@ public:
* Screen Space Cone Tracing (SSCT) options
* Ambient shadows from dominant light
*/
struct {
struct Ssct {
float lightConeRad = 1.0f; //!< full cone angle in radian, between 0 and pi/2
float startTraceDistance = 0.01f; //!< distance where tracing starts
float contactDistanceMax = 1.0f; //!< max distance shadows are cast
+60 -1
View File
@@ -282,6 +282,45 @@ static int parse(jsmntok_t const* tokens, int i, const char* jsonChunk, ColorGra
return i;
}
static int parse(jsmntok_t const* tokens, int i, const char* jsonChunk,
AmbientOcclusionOptions::Ssct* out) {
CHECK_TOKTYPE(tokens[i], JSMN_OBJECT);
int size = tokens[i++].size;
for (int j = 0; j < size; ++j) {
const jsmntok_t tok = tokens[i];
CHECK_KEY(tok);
if (compare(tok, jsonChunk, "enabled") == 0) {
i = parse(tokens, i + 1, jsonChunk, &out->enabled);
} else if (compare(tok, jsonChunk, "lightConeRad") == 0) {
i = parse(tokens, i + 1, jsonChunk, &out->lightConeRad);
} else if (compare(tok, jsonChunk, "startTraceDistance") == 0) {
i = parse(tokens, i + 1, jsonChunk, &out->startTraceDistance);
} else if (compare(tok, jsonChunk, "contactDistanceMax") == 0) {
i = parse(tokens, i + 1, jsonChunk, &out->contactDistanceMax);
} else if (compare(tok, jsonChunk, "intensity") == 0) {
i = parse(tokens, i + 1, jsonChunk, &out->intensity);
} else if (compare(tok, jsonChunk, "lightDirection") == 0) {
i = parse(tokens, i + 1, jsonChunk, &out->lightDirection);
} else if (compare(tok, jsonChunk, "depthBias") == 0) {
i = parse(tokens, i + 1, jsonChunk, &out->depthBias);
} else if (compare(tok, jsonChunk, "depthSlopeBias") == 0) {
i = parse(tokens, i + 1, jsonChunk, &out->depthSlopeBias);
} else if (compare(tok, jsonChunk, "scale") == 0) {
i = parse(tokens, i + 1, jsonChunk, &out->scale);
} else if (compare(tok, jsonChunk, "sampleCount") == 0){
i = parse(tokens, i + 1, jsonChunk, &out->sampleCount);
} else {
slog.w << "Invalid SSCT key: '" << STR(tok, jsonChunk) << "'" << io::endl;
i = parse(tokens, i + 1);
}
if (i < 0) {
slog.e << "Invalid SSCT value: '" << STR(tok, jsonChunk) << "'" << io::endl;
return i;
}
}
return i;
}
static int parse(jsmntok_t const* tokens, int i, const char* jsonChunk,
AmbientOcclusionOptions* out) {
CHECK_TOKTYPE(tokens[i], JSMN_OBJECT);
@@ -307,6 +346,8 @@ static int parse(jsmntok_t const* tokens, int i, const char* jsonChunk,
i = parse(tokens, i + 1, jsonChunk, &out->enabled);
} else if (compare(tok, jsonChunk, "minHorizonAngleRad") == 0) {
i = parse(tokens, i + 1, jsonChunk, &out->minHorizonAngleRad);
} else if (compare(tok, jsonChunk, "ssct") == 0) {
i = parse(tokens, i + 1, jsonChunk, &out->ssct);
} else {
slog.w << "Invalid AO key: '" << STR(tok, jsonChunk) << "'" << io::endl;
i = parse(tokens, i + 1);
@@ -718,6 +759,23 @@ std::string writeJson(const ColorGradingSettings& in) {
return oss.str();
}
std::string writeJson(const AmbientOcclusionOptions::Ssct& in) {
std::ostringstream oss;
oss << "{\n"
<< "\"enabled\": " << writeJson(in.enabled) << ",\n"
<< "\"lightConeRad\": " << writeJson(in.lightConeRad) << ",\n"
<< "\"startTraceDistance\": " << writeJson(in.startTraceDistance) << ",\n"
<< "\"contactDistanceMax\": " << writeJson(in.contactDistanceMax) << ",\n"
<< "\"intensity\": " << writeJson(in.intensity) << ",\n"
<< "\"lightDirection\": " << writeJson(in.lightDirection) << ",\n"
<< "\"depthBias\": " << writeJson(in.depthBias) << ",\n"
<< "\"depthSlopeBias\": " << writeJson(in.depthSlopeBias) << ",\n"
<< "\"scale\": " << writeJson(in.scale) << ",\n"
<< "\"sampleCount\": " << writeJson(in.sampleCount) << "\n"
<< "}";
return oss.str();
}
std::string writeJson(const AmbientOcclusionOptions& in) {
std::ostringstream oss;
oss << "{\n"
@@ -729,7 +787,8 @@ std::string writeJson(const AmbientOcclusionOptions& in) {
<< "\"quality\": " << writeJson(in.quality) << ",\n"
<< "\"upsampling\": " << writeJson(in.upsampling) << ",\n"
<< "\"enabled\": " << writeJson(in.enabled) << ",\n"
<< "\"minHorizonAngleRad\": " << writeJson(in.minHorizonAngleRad) << "\n"
<< "\"minHorizonAngleRad\": " << writeJson(in.minHorizonAngleRad) << ",\n"
<< "\"ssct\": " << writeJson(in.ssct) << "\n"
<< "}";
return oss.str();
}
+13 -1
View File
@@ -65,7 +65,19 @@ static const char* JSON_TEST_DEFAULTS = R"TXT(
"intensity": 1.0,
"quality": "LOW",
"upsampling": "LOW",
"minHorizonAngleRad": 0.0
"minHorizonAngleRad": 0.0,
"ssct": {
"enabled": false,
"lightConeRad": 1.0,
"startTraceDistance": 0.01,
"contactDistanceMax": 1.0,
"intensity": 0.8,
"lightDirection": [0, -1, 0],
"depthBias": 0.1,
"depthSlopeBias": 0.1,
"scale": 1.0,
"sampleCount": 4
}
},
"bloom": {
"enabled": false,