diff --git a/src/Blazorex.Web/Pages/Index.razor b/src/Blazorex.Web/Pages/Index.razor index 394a596..7d5499c 100644 --- a/src/Blazorex.Web/Pages/Index.razor +++ b/src/Blazorex.Web/Pages/Index.razor @@ -38,14 +38,6 @@ if (!firstRender) return; - _canvasManager.CreateCanvas("main", new CanvasCreationOptions() - { - Hidden = false, - Width = _width, - Height = _height, - OnCanvasReady = this.OnMainCanvasReady, - OnFrameReady = this.OnMainFrameReady, - }); _canvasManager.CreateCanvas("fire", new CanvasCreationOptions() { Hidden = false, @@ -54,7 +46,14 @@ OnCanvasReady = this.OnFireCanvasReady, OnFrameReady = this.OnFireCanvasFrameReady, }); - + _canvasManager.CreateCanvas("main", new CanvasCreationOptions() + { + Hidden = false, + Width = _width, + Height = _height, + OnCanvasReady = this.OnMainCanvasReady, + OnFrameReady = this.OnMainFrameReady, + }); } private void OnFireCanvasReady(CanvasBase canvas) @@ -100,10 +99,7 @@ { _context.ClearRect(0, 0, _width, _height); - //_context.DrawImage(_fireCanvas.ElementReference, 0,0, _fireWidth, _fireHeight); - - _context.FillStyle = "green"; - _context.FillRect(0, 0, _width, _height); + _context.DrawImage(_fireCanvas.ElementReference, 0, 0, _width, _height); _context.StrokeStyle = "rgb(255, 255,0)"; _context.LineWidth = 3; diff --git a/src/Blazorex.Web/Services/FireRenderer.cs b/src/Blazorex.Web/Services/FireRenderer.cs index b518136..b1963e1 100644 --- a/src/Blazorex.Web/Services/FireRenderer.cs +++ b/src/Blazorex.Web/Services/FireRenderer.cs @@ -1,6 +1,4 @@ -using Microsoft.AspNetCore.Components; - -namespace Blazorex.Web.Services +namespace Blazorex.Web.Services { public class FireRenderer { @@ -47,7 +45,7 @@ public void Update() public void Render() { - _context.PutImageData(_renderTarget, fireColorData, 10, 50); + _context.PutImageData(_renderTarget, fireColorData, 0, 0); } private void UpdateFireIntensityPerPixel(int currentPixelIndex) @@ -66,7 +64,7 @@ private void UpdateFireIntensityPerPixel(int currentPixelIndex) fireData[fireDataIndex] = newFireIntensity; int colorIndex = fireDataIndex * 4; - var color = Color.White;// (newFireIntensity >= palette.Length) ? Color.White : palette[newFireIntensity]; + var color = (newFireIntensity >= palette.Length) ? Color.White : palette[newFireIntensity]; fireColorData[colorIndex] = color.R; fireColorData[colorIndex + 1] = color.G; fireColorData[colorIndex + 2] = color.B;