Skip to content
Open
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
33 changes: 6 additions & 27 deletions src/blagario/AgarElements/Player.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
using System;
using System.Threading.Tasks;
using System.Timers;
using BlazorPro.BlazorSize;
using Microsoft.AspNetCore.Components;
using Microsoft.JSInterop;

Expand Down Expand Up @@ -143,36 +144,14 @@ public bool OnArea(AgarElement e)
/* --- */
private System.Timers.Timer aTimer;

[JSInvokable]
public async Task OnBrowserResize()
public async void WindowResized(object _, BrowserWindowSize window)
{
if (aTimer == null)
{
await CheckVisibleArea();
aTimer = new System.Timers.Timer(500);
aTimer.Elapsed += CheckVisibleAreaWrapper;
aTimer.AutoReset = false;
}
else{
aTimer.Stop();
aTimer.Start();
}
this.VisibleAreaX = window.Width;
this.VisibleAreaY = window.Height;
Console.WriteLine($" {window} {window.Width} {window.Height} ");
await Task.CompletedTask;
}

private void CheckVisibleAreaWrapper(Object source, ElapsedEventArgs e)
{
Task.Run( async() => await CheckVisibleArea() );
}

public async Task CheckVisibleArea(IJSRuntime jsRuntime = null)
{
JsRuntime = jsRuntime ?? JsRuntime;
var visibleArea = await JsRuntime.InvokeAsync<long[]>("GetSize");
this.VisibleAreaX = visibleArea[0];
this.VisibleAreaY = visibleArea[1];
await JsRuntime.InvokeAsync<object>("AreaResized", DotNetObjectReference.Create(this) );
}

public async Task SetFocusToUniverse(IJSRuntime jsRuntime = null)
{
JsRuntime = jsRuntime ?? JsRuntime;
Expand Down
8 changes: 7 additions & 1 deletion src/blagario/Pages/Index.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
using System.Linq;
using System.Threading.Tasks;
using blagario.elements;
using BlazorPro.BlazorSize;
using Microsoft.AspNetCore.Components;
using Microsoft.AspNetCore.Components.Web;
using Microsoft.JSInterop;
Expand All @@ -13,6 +14,8 @@ public abstract class BaseIndex : ComponentBase, IDisposable
[Inject] protected Universe Universe {get; set; }
[Inject] protected Player Player {get; set; }
[Inject] protected IJSRuntime JsRuntime {get; set; }
[Inject] ResizeListener listener {get; set; }
BrowserWindowSize browser = new BrowserWindowSize();

public void Dispose() {
Universe.World.OnTicReached -= UpdateUi;
Expand Down Expand Up @@ -71,12 +74,15 @@ protected async override Task OnAfterRenderAsync(bool firstRender)
{
if (firstRender)
{
listener.OnResized += Player.WindowResized;
await OnAfterFirstRenderAsync();
}
}
protected async Task OnAfterFirstRenderAsync()
{
await Player.CheckVisibleArea(JsRuntime);
//this.VisibleAreaX = window.Width;
//this.VisibleAreaY = window.Height;

await Player.SetFocusToUniverse(JsRuntime);
}

Expand Down
1 change: 1 addition & 0 deletions src/blagario/Pages/_Host.cshtml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
<app>@(await Html.RenderComponentAsync<App>(RenderMode.Server))</app>

<script src="_framework/blazor.server.js"></script>
<script src="_content/BlazorPro.BlazorSize/blazorSize.min.js"></script>

<script>

Expand Down
1 change: 1 addition & 0 deletions src/blagario/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ public static IHostBuilder CreateHostBuilder(string[] args) =>
Host.CreateDefaultBuilder(args)
.ConfigureWebHostDefaults(webBuilder =>
{
webBuilder.UseStaticWebAssets();
webBuilder.UseStartup<Startup>();
});
}
Expand Down
2 changes: 2 additions & 0 deletions src/blagario/Startup.cs
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Hosting;
using blagario.elements;
using BlazorPro.BlazorSize;

namespace blagario
{
Expand All @@ -28,6 +29,7 @@ public void ConfigureServices(IServiceCollection services)
{
services.AddRazorPages();
services.AddServerSideBlazor();
services.AddScoped<ResizeListener>();
services.AddSingleton<Universe>();
services.AddScoped<Player>();
services.AddHostedService<TimedHostedService>();
Expand Down
8 changes: 8 additions & 0 deletions src/blagario/blagario.csproj
Original file line number Diff line number Diff line change
@@ -1,8 +1,16 @@
<Project Sdk="Microsoft.NET.Sdk.Web">



<PropertyGroup>
<TargetFramework>netcoreapp3.0</TargetFramework>
<LangVersion>7.3</LangVersion>
</PropertyGroup>



<ItemGroup>
<PackageReference Include="BlazorPro.BlazorSize" Version="1.2.2" />
</ItemGroup>

</Project>