1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-10 23:44:24 +00:00

Restructure OpenGLDemo and UnitTestsDemo and remove unused macro from DemoRunner

This commit is contained in:
ed 2019-03-29 16:03:58 +00:00
parent aa498afce2
commit d6fb474c39
5 changed files with 809 additions and 821 deletions

View file

@ -80,50 +80,50 @@
void registerDemos_One() noexcept
{
REGISTER_DEMO (AudioAppDemo, Audio, false)
REGISTER_DEMO (AudioLatencyDemo, Audio, false)
REGISTER_DEMO (AudioPlaybackDemo, Audio, false)
REGISTER_DEMO (AudioRecordingDemo, Audio, false)
REGISTER_DEMO (AudioSettingsDemo, Audio, false)
REGISTER_DEMO (AudioSynthesiserDemo, Audio, false)
REGISTER_DEMO (MidiDemo, Audio, false)
REGISTER_DEMO (MPEDemo, Audio, false)
REGISTER_DEMO (PluckedStringsDemo, Audio, false)
REGISTER_DEMO (AudioAppDemo, Audio, false)
REGISTER_DEMO (AudioLatencyDemo, Audio, false)
REGISTER_DEMO (AudioPlaybackDemo, Audio, false)
REGISTER_DEMO (AudioRecordingDemo, Audio, false)
REGISTER_DEMO (AudioSettingsDemo, Audio, false)
REGISTER_DEMO (AudioSynthesiserDemo, Audio, false)
REGISTER_DEMO (MidiDemo, Audio, false)
REGISTER_DEMO (MPEDemo, Audio, false)
REGISTER_DEMO (PluckedStringsDemo, Audio, false)
#if JUCE_HAS_CONSTEXPR
REGISTER_DEMO (SimpleFFTDemo, Audio, false)
REGISTER_DEMO (BlocksDrawingDemo, BLOCKS, false)
REGISTER_DEMO (BlocksMonitorDemo, BLOCKS, false)
REGISTER_DEMO (BlocksSynthDemo, BLOCKS, false)
REGISTER_DEMO (SimpleFFTDemo, Audio, false)
REGISTER_DEMO (BlocksDrawingDemo, BLOCKS, false)
REGISTER_DEMO (BlocksMonitorDemo, BLOCKS, false)
REGISTER_DEMO (BlocksSynthDemo, BLOCKS, false)
REGISTER_DEMO (ConvolutionDemo, DSP, false)
REGISTER_DEMO (FIRFilterDemo, DSP, false)
REGISTER_DEMO (GainDemo, DSP, false)
REGISTER_DEMO (IIRFilterDemo, DSP, false)
REGISTER_DEMO (OscillatorDemo, DSP, false)
REGISTER_DEMO (OverdriveDemo, DSP, false)
REGISTER_DEMO (ConvolutionDemo, DSP, false)
REGISTER_DEMO (FIRFilterDemo, DSP, false)
REGISTER_DEMO (GainDemo, DSP, false)
REGISTER_DEMO (IIRFilterDemo, DSP, false)
REGISTER_DEMO (OscillatorDemo, DSP, false)
REGISTER_DEMO (OverdriveDemo, DSP, false)
#if JUCE_USE_SIMD
REGISTER_DEMO (SIMDRegisterDemo, DSP, false)
REGISTER_DEMO (SIMDRegisterDemo, DSP, false)
#endif
REGISTER_DEMO (StateVariableFilterDemo, DSP, false)
REGISTER_DEMO (WaveShaperTanhDemo, DSP, false)
REGISTER_DEMO (StateVariableFilterDemo, DSP, false)
REGISTER_DEMO (WaveShaperTanhDemo, DSP, false)
#endif
REGISTER_DEMO (Box2DDemo, Utilities, false)
REGISTER_DEMO (Box2DDemo, Utilities, false)
#if JUCE_MAC || JUCE_WINDOWS || JUCE_LINUX
REGISTER_DEMO (ChildProcessDemo, Utilities, false)
REGISTER_DEMO (ChildProcessDemo, Utilities, false)
#endif
REGISTER_DEMO (CryptographyDemo, Utilities, false)
REGISTER_DEMO (JavaScriptDemo, Utilities, false)
REGISTER_DEMO (LiveConstantDemo, Utilities, false)
REGISTER_DEMO (MultithreadingDemo, Utilities, false)
REGISTER_DEMO (NetworkingDemo, Utilities, false)
REGISTER_DEMO (OSCDemo, Utilities, false)
REGISTER_DEMO (SystemInfoDemo, Utilities, false)
REGISTER_DEMO (TimersAndEventsDemo, Utilities, false)
REGISTER_DEMO_WITH_FILENAME (UnitTestClasses::UnitTestsDemo, Utilities, UnitTestsDemo, false)
REGISTER_DEMO (ValueTreesDemo, Utilities, false)
REGISTER_DEMO (XMLandJSONDemo, Utilities, false)
REGISTER_DEMO (CryptographyDemo, Utilities, false)
REGISTER_DEMO (JavaScriptDemo, Utilities, false)
REGISTER_DEMO (LiveConstantDemo, Utilities, false)
REGISTER_DEMO (MultithreadingDemo, Utilities, false)
REGISTER_DEMO (NetworkingDemo, Utilities, false)
REGISTER_DEMO (OSCDemo, Utilities, false)
REGISTER_DEMO (SystemInfoDemo, Utilities, false)
REGISTER_DEMO (TimersAndEventsDemo, Utilities, false)
REGISTER_DEMO (UnitTestsDemo, Utilities, false)
REGISTER_DEMO (ValueTreesDemo, Utilities, false)
REGISTER_DEMO (XMLandJSONDemo, Utilities, false)
}
Component* createIntroDemo()

View file

@ -70,42 +70,42 @@
void registerDemos_Two() noexcept
{
REGISTER_DEMO (AnimationAppDemo, GUI, false)
REGISTER_DEMO (AnimationDemo, GUI, false)
REGISTER_DEMO (BouncingBallWavetableDemo, GUI, false)
REGISTER_DEMO (AnimationAppDemo, GUI, false)
REGISTER_DEMO (AnimationDemo, GUI, false)
REGISTER_DEMO (BouncingBallWavetableDemo, GUI, false)
#if JUCE_USE_CAMERA && ! JUCE_LINUX
REGISTER_DEMO (CameraDemo, GUI, true)
REGISTER_DEMO (CameraDemo, GUI, true)
#endif
#if ! JUCE_ANDROID
REGISTER_DEMO (CodeEditorDemo, GUI, false)
REGISTER_DEMO (CodeEditorDemo, GUI, false)
#endif
REGISTER_DEMO (ComponentDemo, GUI, false)
REGISTER_DEMO (ComponentTransformsDemo, GUI, false)
REGISTER_DEMO (DialogsDemo, GUI, false)
REGISTER_DEMO (FlexBoxDemo, GUI, false)
REGISTER_DEMO (FontsDemo, GUI, false)
REGISTER_DEMO (GraphicsDemo, GUI, false)
REGISTER_DEMO (ComponentDemo, GUI, false)
REGISTER_DEMO (ComponentTransformsDemo, GUI, false)
REGISTER_DEMO (DialogsDemo, GUI, false)
REGISTER_DEMO (FlexBoxDemo, GUI, false)
REGISTER_DEMO (FontsDemo, GUI, false)
REGISTER_DEMO (GraphicsDemo, GUI, false)
#if JUCE_HAS_CONSTEXPR
REGISTER_DEMO (GridDemo, GUI, false)
REGISTER_DEMO (GridDemo, GUI, false)
#endif
REGISTER_DEMO (ImagesDemo, GUI, false)
REGISTER_DEMO (KeyMappingsDemo, GUI, false)
REGISTER_DEMO (LookAndFeelDemo, GUI, false)
REGISTER_DEMO (MDIDemo, GUI, false)
REGISTER_DEMO (MenusDemo, GUI, false)
REGISTER_DEMO (MultiTouchDemo, GUI, false)
REGISTER_DEMO (ImagesDemo, GUI, false)
REGISTER_DEMO (KeyMappingsDemo, GUI, false)
REGISTER_DEMO (LookAndFeelDemo, GUI, false)
REGISTER_DEMO (MDIDemo, GUI, false)
REGISTER_DEMO (MenusDemo, GUI, false)
REGISTER_DEMO (MultiTouchDemo, GUI, false)
#if JUCE_OPENGL
REGISTER_DEMO (OpenGLAppDemo, GUI, true)
REGISTER_DEMO (OpenGLDemo2D, GUI, true)
REGISTER_DEMO_WITH_FILENAME (OpenGLDemoClasses::OpenGLDemo, GUI, OpenGLDemo, true)
REGISTER_DEMO (OpenGLAppDemo, GUI, true)
REGISTER_DEMO (OpenGLDemo2D, GUI, true)
REGISTER_DEMO (OpenGLDemo, GUI, true)
#endif
REGISTER_DEMO (PropertiesDemo, GUI, false)
REGISTER_DEMO (PropertiesDemo, GUI, false)
#if ! JUCE_LINUX
REGISTER_DEMO (VideoDemo, GUI, true)
REGISTER_DEMO (VideoDemo, GUI, true)
#endif
REGISTER_DEMO (WebBrowserDemo, GUI, true)
REGISTER_DEMO (WidgetsDemo, GUI, false)
REGISTER_DEMO (WindowsDemo, GUI, false)
REGISTER_DEMO (WebBrowserDemo, GUI, true)
REGISTER_DEMO (WidgetsDemo, GUI, false)
REGISTER_DEMO (WindowsDemo, GUI, false)
}
CodeEditorComponent::ColourScheme getDarkColourScheme()

View file

@ -34,7 +34,6 @@
#define CREATE_FILEPATH(DemoName, category) JUCE_STRINGIFY(EXPAND(category)/EXPAND(DemoName)EXPAND(FILE_EXT))
#define REGISTER_DEMO(DemoName, category, heavyweight) JUCEDemos::registerDemo ([] { return new DemoName(); }, CREATE_FILEPATH(DemoName, category), JUCE_STRINGIFY (category), heavyweight);
#define REGISTER_DEMO_WITH_FILENAME(DemoName, category, fileName, heavyweight) JUCEDemos::registerDemo ([] { return new DemoName(); }, CREATE_FILEPATH(fileName, category), JUCE_STRINGIFY (category), heavyweight);
//==============================================================================
struct JUCEDemos