14.27 round 1: Blending 0, Balance, luminance and order pinned; dead serializers gone
This commit is contained in:
4 files changed
+27
-21
No files matched your search
@@ -196,15 +196,6 @@ std::array<double, 8> CameraRawMixerSettings::weights(double degrees)
|
||||
return result;
|
||||
}
|
||||
|
||||
std::vector<float> CameraRawMixerSettings::mixerFloats() const
|
||||
{
|
||||
std::vector<float> result;
|
||||
for (const std::array<double, 8> *values : {&hue, &saturation, &luminance})
|
||||
for (const double value : *values)
|
||||
result.push_back(float(value / 100));
|
||||
return result;
|
||||
}
|
||||
|
||||
std::vector<float> CameraRawMixerSettings::pointFloats() const
|
||||
{
|
||||
std::vector<float> result;
|
||||
@@ -258,15 +249,6 @@ bool CameraRawGradingSettings::adjusts() const
|
||||
return std::any_of(all.begin(), all.end(), [](const CameraRawGradeWheel &wheel) { return wheel.saturation != 0 || wheel.luminance != 0; });
|
||||
}
|
||||
|
||||
std::vector<float> CameraRawGradingSettings::gradeFloats() const
|
||||
{
|
||||
std::vector<float> result;
|
||||
for (const CameraRawGradeWheel &wheel : wheels())
|
||||
for (const double value : {wheel.hue / 360, wheel.saturation / 100, wheel.luminance / 100})
|
||||
result.push_back(float(value));
|
||||
return result;
|
||||
}
|
||||
|
||||
CameraRawGradingSettings CameraRawGradingSettings::normalized() const
|
||||
{
|
||||
return {shadows.normalized(), midtones.normalized(), highlights.normalized(), global.normalized(), clamp(blending, 0, 100, 50),
|
||||
|
||||
@@ -77,7 +77,6 @@ struct CameraRawMixerSettings {
|
||||
bool adjusts() const;
|
||||
// How much each family shares a hue; neighbours overlap.
|
||||
static std::array<double, 8> weights(double degrees);
|
||||
std::vector<float> mixerFloats() const;
|
||||
std::vector<float> pointFloats() const;
|
||||
CameraRawMixerSettings normalized() const;
|
||||
friend bool operator==(const CameraRawMixerSettings &, const CameraRawMixerSettings &) = default;
|
||||
@@ -103,7 +102,6 @@ struct CameraRawGradingSettings {
|
||||
double balance = 0;
|
||||
std::array<CameraRawGradeWheel, 4> wheels() const;
|
||||
bool adjusts() const;
|
||||
std::vector<float> gradeFloats() const;
|
||||
CameraRawGradingSettings normalized() const;
|
||||
friend bool operator==(const CameraRawGradingSettings &, const CameraRawGradingSettings &) = default;
|
||||
};
|
||||
Reference in new issue
Block a user