removed redundant code
Some checks failed
CI / React UI Build (push) Successful in 10s
CI / Native Windows Build And Tests (push) Successful in 2m22s
CI / Windows Release Package (push) Has been cancelled

This commit is contained in:
2026-05-08 18:40:56 +10:00
parent d650cac857
commit 0af9a72937
8 changed files with 12 additions and 81 deletions

View File

@@ -82,17 +82,6 @@ bool TryParseLayerIdNumber(const std::string& layerId, uint64_t& number)
return true; return true;
} }
std::vector<double> JsonArrayToNumbers(const JsonValue& value)
{
std::vector<double> numbers;
for (const JsonValue& item : value.asArray())
{
if (item.isNumber())
numbers.push_back(item.asNumber());
}
return numbers;
}
bool LooksLikePackagedRuntimeRoot(const std::filesystem::path& candidate) bool LooksLikePackagedRuntimeRoot(const std::filesystem::path& candidate)
{ {
return std::filesystem::exists(candidate / "config" / "runtime-host.json") && return std::filesystem::exists(candidate / "config" / "runtime-host.json") &&
@@ -1688,12 +1677,6 @@ bool RuntimeHost::ScanShaderPackages(std::string& error)
return true; return true;
} }
bool RuntimeHost::ParseShaderManifest(const std::filesystem::path& manifestPath, ShaderPackage& shaderPackage, std::string& error) const
{
ShaderPackageRegistry registry(mConfig.maxTemporalHistoryFrames);
return registry.ParseManifest(manifestPath, shaderPackage, error);
}
bool RuntimeHost::NormalizeAndValidateValue(const ShaderParameterDefinition& definition, const JsonValue& value, ShaderParameterValue& normalizedValue, std::string& error) const bool RuntimeHost::NormalizeAndValidateValue(const ShaderParameterDefinition& definition, const JsonValue& value, ShaderParameterValue& normalizedValue, std::string& error) const
{ {
return NormalizeAndValidateParameterValue(definition, value, normalizedValue, error); return NormalizeAndValidateParameterValue(definition, value, normalizedValue, error);

View File

@@ -116,7 +116,6 @@ private:
bool LoadPersistentState(std::string& error); bool LoadPersistentState(std::string& error);
bool SavePersistentState(std::string& error) const; bool SavePersistentState(std::string& error) const;
bool ScanShaderPackages(std::string& error); bool ScanShaderPackages(std::string& error);
bool ParseShaderManifest(const std::filesystem::path& manifestPath, ShaderPackage& shaderPackage, std::string& error) const;
bool NormalizeAndValidateValue(const ShaderParameterDefinition& definition, const JsonValue& value, ShaderParameterValue& normalizedValue, std::string& error) const; bool NormalizeAndValidateValue(const ShaderParameterDefinition& definition, const JsonValue& value, ShaderParameterValue& normalizedValue, std::string& error) const;
ShaderParameterValue DefaultValueForDefinition(const ShaderParameterDefinition& definition) const; ShaderParameterValue DefaultValueForDefinition(const ShaderParameterDefinition& definition) const;
void EnsureLayerDefaultsLocked(LayerPersistentState& layerState, const ShaderPackage& shaderPackage) const; void EnsureLayerDefaultsLocked(LayerPersistentState& layerState, const ShaderPackage& shaderPackage) const;

View File

@@ -661,3 +661,14 @@ std::string SerializeJson(const JsonValue& value, bool pretty)
SerializeJsonImpl(value, output, pretty, 0); SerializeJsonImpl(value, output, pretty, 0);
return output.str(); return output.str();
} }
std::vector<double> JsonArrayToNumbers(const JsonValue& value)
{
std::vector<double> numbers;
for (const JsonValue& item : value.asArray())
{
if (item.isNumber())
numbers.push_back(item.asNumber());
}
return numbers;
}

View File

@@ -62,3 +62,4 @@ private:
bool ParseJson(const std::string& text, JsonValue& value, std::string& error); bool ParseJson(const std::string& text, JsonValue& value, std::string& error);
std::string SerializeJson(const JsonValue& value, bool pretty = false); std::string SerializeJson(const JsonValue& value, bool pretty = false);
std::vector<double> JsonArrayToNumbers(const JsonValue& value);

View File

@@ -26,17 +26,6 @@ bool IsFiniteNumber(double value)
return std::isfinite(value) != 0; return std::isfinite(value) != 0;
} }
std::vector<double> JsonArrayToNumbers(const JsonValue& value)
{
std::vector<double> numbers;
for (const JsonValue& item : value.asArray())
{
if (item.isNumber())
numbers.push_back(item.asNumber());
}
return numbers;
}
std::string NormalizeTextValue(const std::string& text, unsigned maxLength) std::string NormalizeTextValue(const std::string& text, unsigned maxLength)
{ {
std::string normalized; std::string normalized;

View File

@@ -29,17 +29,6 @@ bool IsFiniteNumber(double value)
return std::isfinite(value) != 0; return std::isfinite(value) != 0;
} }
std::vector<double> JsonArrayToNumbers(const JsonValue& value)
{
std::vector<double> numbers;
for (const JsonValue& item : value.asArray())
{
if (item.isNumber())
numbers.push_back(item.asNumber());
}
return numbers;
}
bool ParseShaderParameterType(const std::string& typeName, ShaderParameterType& type) bool ParseShaderParameterType(const std::string& typeName, ShaderParameterType& type)
{ {
if (typeName == "float") if (typeName == "float")

View File

@@ -1,28 +0,0 @@
function formatNumber(value, digits = 3) {
return Number(value ?? 0).toFixed(digits);
}
export function formatParameterValue(parameterType, value) {
if (parameterType === "float") {
return formatNumber(value);
}
if (parameterType === "vec2" || parameterType === "color") {
return (value ?? []).map((item) => formatNumber(item)).join(", ");
}
if (parameterType === "bool") {
return value ? "Enabled" : "Disabled";
}
if (parameterType === "trigger") {
return `Triggered ${Number(value ?? 0)} time${Number(value ?? 0) === 1 ? "" : "s"}`;
}
return `${value ?? ""}`;
}
export function ParameterValueDisplay({ parameterType, value, pending }) {
const valueText = formatParameterValue(parameterType, value);
return (
<div className={`parameter__value${pending ? " parameter__value--pending" : ""}`}>
{pending ? `Applied: ${valueText}` : valueText}
</div>
);
}

View File

@@ -700,7 +700,6 @@ pre {
.shader-picker__selected, .shader-picker__selected,
.shader-picker__meta, .shader-picker__meta,
.shader-picker__empty, .shader-picker__empty,
.parameter__value,
.parameter__osc, .parameter__osc,
.parameter__reset { .parameter__reset {
color: var(--app-muted); color: var(--app-muted);
@@ -952,10 +951,6 @@ pre {
flex: 0 0 auto; flex: 0 0 auto;
} }
.parameter__value--pending {
color: var(--app-warning);
}
.parameter__control { .parameter__control {
position: relative; position: relative;
min-width: 0; min-width: 0;
@@ -1115,14 +1110,6 @@ pre {
box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.65), 0 1px 4px rgba(0, 0, 0, 0.45); box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.65), 0 1px 4px rgba(0, 0, 0, 0.45);
} }
.parameter__value-slider strong {
text-align: right;
min-height: 1rem;
color: var(--app-text);
font-size: 0.74rem;
line-height: 1;
}
.parameter__trigger { .parameter__trigger {
min-width: 7rem; min-width: 7rem;
} }