Skip to content

Commit f62cc4a

Browse files
authored
Remove more unused render code (#141)
1 parent 8344842 commit f62cc4a

8 files changed

Lines changed: 3 additions & 291 deletions

File tree

src/apps/Highbyte.DotNet6502.App.SadConsole/SadConsoleHostApp.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
using Highbyte.DotNet6502.Impl.NAudio;
44
using Highbyte.DotNet6502.Impl.NAudio.NAudioOpenALProvider;
55
using Highbyte.DotNet6502.Impl.SadConsole;
6-
using Highbyte.DotNet6502.Impl.SadConsole.Commodore64.Video;
6+
using Highbyte.DotNet6502.Impl.SadConsole.Commodore64.Render;
77
using Highbyte.DotNet6502.Systems;
88
using Highbyte.DotNet6502.Systems.Commodore64;
99
using Highbyte.DotNet6502.Systems.Logging.InMem;
@@ -128,7 +128,6 @@ public void Run()
128128
.SetStartingScreen(CreateMainSadConsoleScreen)
129129
.IsStartingScreenFocused(false) // Let the object focused in the create method remain.
130130
.AddFrameUpdateEvent(UpdateSadConsole);
131-
//.AddFrameRenderEvent(RenderSadConsole); // Old rendering pipeline
132131

133132
Settings.WindowTitle = "Highbyte.DotNet6502 emulator + SadConsole (with NAudio)";
134133
Settings.ResizeMode = Settings.WindowResizeOptions.None;

src/apps/Highbyte.DotNet6502.App.SilkNetNative/SilkNetHostApp.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,6 @@ public void Run()
128128
_window.Load += OnLoad;
129129
_window.Closing += OnClosing;
130130
_window.Update += OnUpdate;
131-
//_window.Render += OnRender; // old rendering pipeline
132131
_window.Resize += OnResize;
133132

134133
_window.Run();

src/libraries/Highbyte.DotNet6502.Impl.SadConsole/Commodore64/Video/C64SadConsoleRenderTargetCustomization.cs renamed to src/libraries/Highbyte.DotNet6502.Impl.SadConsole/Commodore64/Render/C64SadConsoleRenderTargetCustomization.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
using Highbyte.DotNet6502.Systems.Commodore64;
22

3-
namespace Highbyte.DotNet6502.Impl.SadConsole.Commodore64.Video;
3+
namespace Highbyte.DotNet6502.Impl.SadConsole.Commodore64.Render;
44
public class C64SadConsoleRenderTargetCustomization
55
{
66
private readonly C64 _c64;

src/libraries/Highbyte.DotNet6502.Impl.SadConsole/Commodore64/Video/C64SadConsoleColors.cs

Lines changed: 0 additions & 31 deletions
This file was deleted.

src/libraries/Highbyte.DotNet6502.Impl.SadConsole/Commodore64/Video/C64SadConsoleRenderer.cs

Lines changed: 0 additions & 240 deletions
This file was deleted.

src/libraries/Highbyte.DotNet6502.Impl.Skia/Commodore64/Render/Legacy/v2/C64LegacyRenderTarget2.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ namespace Highbyte.DotNet6502.Impl.Skia.Commodore64.Render.Legacy.v2;
2828
/// - Fine scroll per frame.
2929
/// - Sprites (Standard, MultiColor)
3030
///
31-
/// Compared to C64SkiaRenderer:
31+
/// Compared to C64LegacyRenderTarget:
3232
/// - A bit slower, but supports Bitmap graphics and still able to run in a browser with Blazor WebAssembly.
3333
/// </summary>
3434
[DisplayName("Skia legacy v2")]

src/libraries/Highbyte.DotNet6502.Systems/HostApp.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,6 @@ public List<Type> GetAvailableSystemRenderProviderTypes()
182182
return available;
183183
}
184184

185-
186185
public async Task SelectSystem(string systemName)
187186
{
188187
if (EmulatorState != EmulatorState.Uninitialized)
@@ -387,7 +386,6 @@ public void RunEmulatorOneFrame()
387386

388387
public virtual void OnAfterRunEmulatorOneFrame(ExecEvaluatorTriggerResult execEvaluatorTriggerResult) { }
389388

390-
// New rendering pipeline
391389
private void InitRendererForSystem()
392390
{
393391
// Skip rendering initialization if no render config has been provided (e.g., in unit tests)

src/libraries/Highbyte.DotNet6502.Systems/SystemRunner.cs

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -28,16 +28,12 @@ public class SystemRunner
2828

2929
public SystemRunner(ISystem system, IInputHandler inputHandler, IAudioHandler audioHandler)
3030
{
31-
// if (system != renderer.System)
32-
// throw new DotNet6502Exception("Renderer must be for the same system as the SystemRunner.");
3331
if (system != inputHandler.System)
3432
throw new DotNet6502Exception("InputHandler must be for the same system as the SystemRunner.");
3533
if (system != audioHandler.System)
3634
throw new DotNet6502Exception("AudioHandler must be for the same system as the SystemRunner.");
3735

3836
_system = system;
39-
//_renderer = renderer; // Old renderer pipeline
40-
//_renderer = renderer ?? new NullRenderer(system);
4137
_inputHandler = inputHandler;
4238
_audioHandler = audioHandler;
4339
}
@@ -84,17 +80,8 @@ public ExecEvaluatorTriggerResult RunEmulatorOneFrame()
8480
return execEvaluatorTriggerResult;
8581
}
8682

87-
/// <summary>
88-
/// Called by host app that runs the emulator, once per frame tied to the host app rendering frequency.
89-
/// </summary>
90-
public void Draw()
91-
{
92-
//_renderer.DrawFrame();
93-
}
94-
9583
public void Cleanup()
9684
{
97-
//_renderer?.Cleanup(); // Old renderer pipeline
9885
_audioHandler.Cleanup();
9986
_inputHandler.Cleanup();
10087
}

0 commit comments

Comments
 (0)