electron-rare/AV-Live
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

feat(of): scope4 only + 0-9 demoscene toggles

Browse Source 
User : "scope4 uniquement et les touches 0 à 9 sont différents
effets type demoscene".

- Touches 1..9 toggle chacune un effet du Scope4 :
    1 tunnel 3D
    2 starfield (remplace tunnel)
    3 sine scroller (greetings.txt)
    4 copper bars
    5 logo bobs
    6 HUD aléatoire sub-10Hz
    7 spectro circular ring
    8 polar central
    9 waveform circulaire CRT
  0 = reset all toggles aux défauts.
- Suppression des bindings 1-9/0/-/q qui changeaient de mode_,
  Scope4 est désormais le seul rendu actif.
- Suppression des toggles symboles redondants ' ; , .
- Synchro DemoFx::*Enabled() avec scope4_ flags dans drawScope4.
This commit is contained in:
L'électron rare
2026-05-07 20:35:57 +02:00
parent 720d116f2b
commit f95cedeb5f
2 changed files with 61 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
oscope-of/src/ofApp.cpp
+48 -44
View File
@@ -397,35 +397,47 @@ void ofApp::drawPanelLabel(int x, int y, const char* title,
}
void ofApp::drawScope4(int W, int H) {
// 1) Fond : tunnel 3D OU starfield demoscene si toggle actif.
if (starfieldReplaceTunnel_) {
// Synchronise les flags du DemoFx avec ScopeToggles (touches 0-9).
demo_.scrollerEnabled() = scope4_.scroller;
demo_.copperEnabled() = scope4_.copperBars;
demo_.bobsEnabled() = scope4_.bobs;
demo_.starfieldEnabled() = scope4_.starfield;
// 1) Fond : starfield remplace le tunnel si toggle actif, sinon tunnel.
if (scope4_.starfield) {
ofBackground(0);
demo_.drawStarfield(W, H);
} else {
} else if (scope4_.tunnel) {
tunnel_->draw(0, 0, W, H);
} else {
ofBackground(0);
}
// 1bis) HUD pseudo-aléatoire de valeurs sub-10 Hz sur les "carreaux".
drawTunnelHud(W, H);
// 1bis) HUD pseudo-aléatoire de valeurs sub-10 Hz.
if (scope4_.tunnelHud) drawTunnelHud(W, H);
// 1ter) Copper bars demoscene en haut + logo bobs.
demo_.drawCopperBars(W, H);
demo_.drawBobs(W, H, "AV-LIVE");
// 1ter) Copper bars + logo bobs.
if (scope4_.copperBars) demo_.drawCopperBars(W, H);
if (scope4_.bobs) demo_.drawBobs(W, H, "AV-LIVE");
const float cx = W * 0.5f;
const float cy = H * 0.5f;
const float minSide = static_cast<float>(std::min(W, H));
// 2) Polar central, focal, centré PILE sur le tunnel (cx, cy).
const int polarS = static_cast<int>(minSide * 0.55f);
polar_->draw(static_cast<int>(cx) - polarS / 2,
static_cast<int>(cy) - polarS / 2,
polarS, polarS);
// 2) Polar central — toggle 8.
if (scope4_.polar) {
const int polarS = static_cast<int>(minSide * 0.55f);
polar_->draw(static_cast<int>(cx) - polarS / 2,
static_cast<int>(cy) - polarS / 2,
polarS, polarS);
}
// 3) Spectrogramme circulaire en anneau autour du polar.
const float ringInner = minSide * 0.27f;
const float ringOuter = minSide * 0.36f;
spectro_->drawCircular(cx, cy, ringInner, ringOuter);
// 3) Spectro ring colorisé — toggle 7.
if (scope4_.spectroRing) {
const float ringInner = minSide * 0.27f;
const float ringOuter = minSide * 0.36f;
spectro_->drawCircular(cx, cy, ringInner, ringOuter);
}
// 4) Lissajous additif fullscreen pour le glow ambiant (sous le scope).
ofEnableBlendMode(OF_BLENDMODE_ADD);
@@ -493,14 +505,14 @@ void ofApp::drawScope4(int W, int H) {
ofPopStyle();
}
// 5) WAVEFORM circulaire FULLSCREEN, en PREMIER PLAN — look CRT rétro
// avec phosphor additif, ticks de timeline, vignette interne. Les
// rings CH1/CH2/slow font le tour complet (timeline → angle 0..2π).
waveform_->setCircular(true);
waveform_->draw(0, 0, W, H);
waveform_->setCircular(false);
// 5) WAVEFORM circulaire CRT rétro — toggle 9.
if (scope4_.waveform) {
waveform_->setCircular(true);
waveform_->draw(0, 0, W, H);
waveform_->setCircular(false);
}
// 6) Sine scroller demoscene depuis greetings.txt, par-dessus tout.
// 6) Sine scroller — toggle 3 (synchronisé avec demo_.scrollerEnabled).
demo_.drawScroller(W, H);
}
@@ -589,19 +601,19 @@ void ofApp::windowResized(int w, int h) {
}
void ofApp::keyPressed(int key) {
// Toggles Scope4 — touches 1..9 chacune un effet demoscene, 0 = reset.
auto resetToggles = [&]() { scope4_ = ScopeToggles{}; };
switch (key) {
case '1': mode_ = Mode::Lissajous; break;
case '2': mode_ = Mode::Spectrogram; break;
case '3': mode_ = Mode::Reactive; break;
case '4': mode_ = Mode::Hybrid; break;
case '5': mode_ = Mode::Waveform; break;
case '6': mode_ = Mode::Polar; break;
case '7': mode_ = Mode::Plasma; break;
case '8': mode_ = Mode::Particles; break;
case '9': mode_ = Mode::Kaleido; break;
case '0': mode_ = Mode::Tunnel; break;
case '-': mode_ = Mode::Mesh; break;
case 'q': mode_ = Mode::Scope4; break;
case '1': scope4_.tunnel = !scope4_.tunnel; break;
case '2': scope4_.starfield = !scope4_.starfield; break;
case '3': scope4_.scroller = !scope4_.scroller; break;
case '4': scope4_.copperBars = !scope4_.copperBars; break;
case '5': scope4_.bobs = !scope4_.bobs; break;
case '6': scope4_.tunnelHud = !scope4_.tunnelHud; break;
case '7': scope4_.spectroRing = !scope4_.spectroRing; break;
case '8': scope4_.polar = !scope4_.polar; break;
case '9': scope4_.waveform = !scope4_.waveform; break;
case '0': resetToggles(); break;
case 'f':
fullscreen_ = !fullscreen_;
ofSetFullscreen(fullscreen_);
@@ -611,14 +623,6 @@ void ofApp::keyPressed(int key) {
case 'k': autoGlitchOnKick_ = !autoGlitchOnKick_; break;
case ' ': postfx_.triggerGlitch(0.8f); break;
// Demoscene toggles (touches symboles, hors zone a-z FX live).
case '\'': demo_.scrollerEnabled() = !demo_.scrollerEnabled(); break;
case ';': demo_.copperEnabled() = !demo_.copperEnabled(); break;
case ',': demo_.bobsEnabled() = !demo_.bobsEnabled(); break;
case '.':
demo_.starfieldEnabled() = !demo_.starfieldEnabled();
starfieldReplaceTunnel_ = demo_.starfieldEnabled();
break;
case 'r':
lissajous_->reloadShaders();
reactive_->reloadShaders();
oscope-of/src/ofApp.h
+13 -1
View File
@@ -72,7 +72,19 @@ private:
oscope::PostFx postfx_;
oscope::AudioAnalyzer audio_;
oscope::DemoFx demo_;
bool starfieldReplaceTunnel_ = false;
// Toggles Scope4 — touches 1-9 + 0 reset.
struct ScopeToggles {
bool tunnel = true; // 1 — tunnel 3D background
bool starfield = false; // 2 — starfield (remplace le tunnel)
bool scroller = true; // 3 — sine scroller greetings.txt
bool copperBars = true; // 4 — copper bars haut
bool bobs = true; // 5 — logo bobs
bool tunnelHud = true; // 6 — HUD aléatoire sub-10Hz
bool spectroRing = true; // 7 — spectro circular ring
bool polar = true; // 8 — polar central
bool waveform = true; // 9 — waveform circular CRT
} scope4_;
std::unique_ptr<oscope::LissajousVis> lissajous_;
std::unique_ptr<oscope::SpectrogramVis> spectro_;