Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
using Highbyte.DotNet6502.Impl.NAudio;
using Highbyte.DotNet6502.Impl.NAudio.NAudioOpenALProvider;
using Highbyte.DotNet6502.Impl.SadConsole;
using Highbyte.DotNet6502.Impl.SadConsole.Commodore64.Video;
using Highbyte.DotNet6502.Impl.SadConsole.Commodore64.Render;
using Highbyte.DotNet6502.Systems;
using Highbyte.DotNet6502.Systems.Commodore64;
using Highbyte.DotNet6502.Systems.Logging.InMem;
Expand Down Expand Up @@ -128,7 +128,6 @@ public void Run()
.SetStartingScreen(CreateMainSadConsoleScreen)
.IsStartingScreenFocused(false) // Let the object focused in the create method remain.
.AddFrameUpdateEvent(UpdateSadConsole);
//.AddFrameRenderEvent(RenderSadConsole); // Old rendering pipeline

Settings.WindowTitle = "Highbyte.DotNet6502 emulator + SadConsole (with NAudio)";
Settings.ResizeMode = Settings.WindowResizeOptions.None;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,6 @@ public void Run()
_window.Load += OnLoad;
_window.Closing += OnClosing;
_window.Update += OnUpdate;
//_window.Render += OnRender; // old rendering pipeline
_window.Resize += OnResize;

_window.Run();
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using Highbyte.DotNet6502.Systems.Commodore64;

namespace Highbyte.DotNet6502.Impl.SadConsole.Commodore64.Video;
namespace Highbyte.DotNet6502.Impl.SadConsole.Commodore64.Render;
public class C64SadConsoleRenderTargetCustomization
{
private readonly C64 _c64;
Expand Down

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ namespace Highbyte.DotNet6502.Impl.Skia.Commodore64.Render.Legacy.v2;
/// - Fine scroll per frame.
/// - Sprites (Standard, MultiColor)
///
/// Compared to C64SkiaRenderer:
/// Compared to C64LegacyRenderTarget:
/// - A bit slower, but supports Bitmap graphics and still able to run in a browser with Blazor WebAssembly.
/// </summary>
[DisplayName("Skia legacy v2")]
Expand Down
2 changes: 0 additions & 2 deletions src/libraries/Highbyte.DotNet6502.Systems/HostApp.cs
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,6 @@
return available;
}


public async Task SelectSystem(string systemName)
{
if (EmulatorState != EmulatorState.Uninitialized)
Expand Down Expand Up @@ -387,7 +386,6 @@

public virtual void OnAfterRunEmulatorOneFrame(ExecEvaluatorTriggerResult execEvaluatorTriggerResult) { }

// New rendering pipeline
private void InitRendererForSystem()
{
// Skip rendering initialization if no render config has been provided (e.g., in unit tests)
Expand All @@ -400,7 +398,7 @@
var renderTargetType = CurrentHostSystemConfig.SystemConfig.RenderTargetType;

// Assume CurrentSystemRunner.System.RenderProvider is set to the selected system's render provider (one of possibly many in in system.RenderProviders).
var renderTarget = _renderTargetProvider.CreateRenderTargetByRenderProviderType(CurrentSystemRunner.System.RenderProvider.GetType(), renderTargetType);

Check warning on line 401 in src/libraries/Highbyte.DotNet6502.Systems/HostApp.cs

View workflow job for this annotation

GitHub Actions / Analyze (csharp)

Dereference of a possibly null reference.

Check warning on line 401 in src/libraries/Highbyte.DotNet6502.Systems/HostApp.cs

View workflow job for this annotation

GitHub Actions / Analyze (csharp)

Dereference of a possibly null reference.

Check warning on line 401 in src/libraries/Highbyte.DotNet6502.Systems/HostApp.cs

View workflow job for this annotation

GitHub Actions / build

Dereference of a possibly null reference.

Check warning on line 401 in src/libraries/Highbyte.DotNet6502.Systems/HostApp.cs

View workflow job for this annotation

GitHub Actions / build

Dereference of a possibly null reference.
_renderCoordinator = _renderCoordinatorProvider.CreateRenderCoordinator(CurrentSystemRunner.System.RenderProvider, renderTarget, _instrumentations);
}

Expand All @@ -427,7 +425,7 @@
await _systemList.SetAudioEnabled(_selectedSystemName, enabled: enabled);
}

public async Task<ISystem> GetSelectedSystem()

Check warning on line 428 in src/libraries/Highbyte.DotNet6502.Systems/HostApp.cs

View workflow job for this annotation

GitHub Actions / Analyze (csharp)

This async method lacks 'await' operators and will run synchronously. Consider using the 'await' operator to await non-blocking API calls, or 'await Task.Run(...)' to do CPU-bound work on a background thread.

Check warning on line 428 in src/libraries/Highbyte.DotNet6502.Systems/HostApp.cs

View workflow job for this annotation

GitHub Actions / build

This async method lacks 'await' operators and will run synchronously. Consider using the 'await' operator to await non-blocking API calls, or 'await Task.Run(...)' to do CPU-bound work on a background thread.
{
if (EmulatorState == EmulatorState.Uninitialized)
{
Expand Down Expand Up @@ -486,7 +484,7 @@
// Sub-system stat: system
.Union(_systemRunner.System.Instrumentations.Stats.Select(x => (Name: $"{_hostName}-{SystemTimeStatName}-{x.Name}", x.Stat)))
// Sub-system stat: render
.Union(_renderCoordinator.Instrumentations.Stats.Select(x => (Name: $"{_hostName}-{RenderStatName}-{x.Name}", x.Stat)))

Check warning on line 487 in src/libraries/Highbyte.DotNet6502.Systems/HostApp.cs

View workflow job for this annotation

GitHub Actions / Analyze (csharp)

Dereference of a possibly null reference.

Check warning on line 487 in src/libraries/Highbyte.DotNet6502.Systems/HostApp.cs

View workflow job for this annotation

GitHub Actions / build

Dereference of a possibly null reference.
// Sub-system stat: audio
.Union(_systemRunner.AudioHandler.Instrumentations.Stats.Select(x => (Name: $"{_hostName}-{AudioTimeStatName}-{x.Name}", x.Stat)))
// Sub-system stat: input
Expand Down
13 changes: 0 additions & 13 deletions src/libraries/Highbyte.DotNet6502.Systems/SystemRunner.cs
Original file line number Diff line number Diff line change
Expand Up @@ -28,16 +28,12 @@ public class SystemRunner

public SystemRunner(ISystem system, IInputHandler inputHandler, IAudioHandler audioHandler)
{
// if (system != renderer.System)
// throw new DotNet6502Exception("Renderer must be for the same system as the SystemRunner.");
if (system != inputHandler.System)
throw new DotNet6502Exception("InputHandler must be for the same system as the SystemRunner.");
if (system != audioHandler.System)
throw new DotNet6502Exception("AudioHandler must be for the same system as the SystemRunner.");

_system = system;
//_renderer = renderer; // Old renderer pipeline
//_renderer = renderer ?? new NullRenderer(system);
_inputHandler = inputHandler;
_audioHandler = audioHandler;
}
Expand Down Expand Up @@ -84,17 +80,8 @@ public ExecEvaluatorTriggerResult RunEmulatorOneFrame()
return execEvaluatorTriggerResult;
}

/// <summary>
/// Called by host app that runs the emulator, once per frame tied to the host app rendering frequency.
/// </summary>
public void Draw()
{
//_renderer.DrawFrame();
}

public void Cleanup()
{
//_renderer?.Cleanup(); // Old renderer pipeline
_audioHandler.Cleanup();
_inputHandler.Cleanup();
}
Expand Down
Loading