Skip to content

Commit

Permalink
Refactor: Marmora: less comparisons.
Browse files Browse the repository at this point in the history
  • Loading branch information
Bloodbat committed Oct 20, 2024
1 parent 11dcd99 commit a71032c
Showing 1 changed file with 7 additions and 8 deletions.
15 changes: 7 additions & 8 deletions src/marmora.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -309,18 +309,14 @@ struct Marmora : SanguineModule {
lights[LIGHT_X_RANGE + 0].setBrightness(xRange == 0 || xRange == 1 ? 0.75f : 0.f);
lights[LIGHT_X_RANGE + 1].setBrightness(xRange == 1 || xRange == 2 ? 0.75f : 0.f);

if (!bScaleEditMode) {
lights[LIGHT_EXTERNAL + 0].setBrightnessSmooth(params[PARAM_EXTERNAL].getValue() ? 0.75f : 0.f, sampleTime);
lights[LIGHT_EXTERNAL + 1].setBrightnessSmooth(params[PARAM_EXTERNAL].getValue() ? 0.75f : 0.f, sampleTime);
} else {
lights[LIGHT_EXTERNAL + 0].setBrightnessSmooth(0.75f, sampleTime);
lights[LIGHT_EXTERNAL + 1].setBrightnessSmooth(0.f, sampleTime);
}

drawLight(LIGHT_SCALE + 0, scaleLights[xScale][0], sampleTime, systemTimeMs);
drawLight(LIGHT_SCALE + 1, scaleLights[xScale][1], sampleTime, systemTimeMs);

if (!bScaleEditMode) {
float lightExternalBrightness = params[PARAM_EXTERNAL].getValue() ? 0.75f : 0.f;
lights[LIGHT_EXTERNAL + 0].setBrightnessSmooth(lightExternalBrightness, sampleTime);
lights[LIGHT_EXTERNAL + 1].setBrightnessSmooth(lightExternalBrightness, sampleTime);

// T1 and T3 are booleans: they'll never go negative.
lights[LIGHT_T1 + 0].setBrightnessSmooth(bGates[blockIndex * 2 + 0], sampleTime);
//lights[LIGHT_T1 + 1].setBrightnessSmooth(-bGates[blockIndex * 2 + 0], sampleTime);
Expand All @@ -345,6 +341,9 @@ struct Marmora : SanguineModule {
lights[LIGHT_X3 + 0].setBrightnessSmooth(outputVoltage, sampleTime);
lights[LIGHT_X3 + 1].setBrightnessSmooth(-outputVoltage, sampleTime);
} else {
lights[LIGHT_EXTERNAL + 0].setBrightnessSmooth(0.75f, sampleTime);
lights[LIGHT_EXTERNAL + 1].setBrightnessSmooth(0.f, sampleTime);

lights[LIGHT_T1 + 0].setBrightnessSmooth(bLastGate, sampleTime);

lights[LIGHT_T2 + 0].setBrightnessSmooth(bLastGate, sampleTime);
Expand Down

0 comments on commit a71032c

Please sign in to comment.