Skip to content

Commit a4b500d

Browse files
avdynutavdynut
committed
v0.1.8
1 parent 94aaceb commit a4b500d

14 files changed

Lines changed: 246 additions & 267 deletions

‎.github/workflows/build-package.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: Build XRSharp.CommunityToolkit
22
env:
33
package-source-myget: 'https://www.myget.org/F/xrsharp/api/v2/package'
44
nuget: 'https://api.nuget.org/v3/index.json'
5-
package-version: '0.1.7'
5+
package-version: '0.1.8'
66
suffix: 'preview'
77
on:
88
push:

‎build/build-nuget-package-XRSharp-CommunityToolkit-cicd.bat‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@ set "currentdatetime=%currentdatetime: =0%"
1111

1212
rem If argument 1 is not given, use default value for PackageVersion:
1313
set "PackageVersion=%~1"
14-
if not defined PackageVersion set "PackageVersion=0.1.7-private-%currentdatetime%"
14+
if not defined PackageVersion set "PackageVersion=0.1.8-private-%currentdatetime%"
1515

1616
rem If argument 2 is not given, use default value for XRSharpVersion:
1717
set "XRSharpVersion=%~2"
18-
if not defined XRSharpVersion set "XRSharpVersion=0.1.7-preview-2024-07-03-083945-ec96f694"
18+
if not defined XRSharpVersion set "XRSharpVersion=0.1.8-preview-2024-07-03-083945-ec96f694"
1919

2020
if not exist "nuspec/XRSharp.CommunityToolkit.nuspec" (
2121
echo Wrong working directory. Please navigate to the folder that contains the BAT file before executing it.

‎build/build-nuget-package-XRSharp-CommunityToolkit-private.bat‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ rem Define the escape character for colored text
1010
for /F %%a in ('"prompt $E$S & echo on & for %%b in (1) do rem"') do set "ESC=%%a"
1111

1212
rem Define the "%PackageVersion%" variable:
13-
set /p PackageVersion="%ESC%[92mXRSharp.CommunityToolkit version:%ESC%[0m 0.1.7-private-"
13+
set /p PackageVersion="%ESC%[92mXRSharp.CommunityToolkit version:%ESC%[0m 0.1.8-private-"
1414

15-
set PackageVersion="0.1.7-private-%PackageVersion%"
15+
set PackageVersion="0.1.8-private-%PackageVersion%"
1616

17-
set XRSharpVersion="0.1.7-preview-2024-07-03-083945-ec96f694"
17+
set XRSharpVersion="0.1.8-preview-2024-07-03-083945-ec96f694"
1818

1919
call "build-nuget-package-XRSharp-CommunityToolkit-cicd.bat" %PackageVersion% %XRSharpVersion%
2020

‎build/nuspec/XRSharp.CommunityToolkit.nuspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<repository type="git" url="$RepositoryUrl$" />
99
<requireLicenseAcceptance>false</requireLicenseAcceptance>
1010
<description>Collection of components and helpers for XR#</description>
11-
<copyright>Copyright (c) 2024, Userware. All rights reserved.</copyright>
11+
<copyright>Copyright (c) 2025, Userware. All rights reserved.</copyright>
1212
<tags>webassembly csharp xaml wasm dotnet .net C# javascript html html5 mono webxr extendedreality vr ar mr web3d XR WebXR 3D OpenSilver Oculus Meta Quest Virtual Reality Augmented Mixed XRSharp Community Toolkit</tags>
1313
<icon>images\XRSharp_icon.png</icon>
1414
<!--<licenseUrl>http://LICENSE_URL_HERE_OR_DELETE_THIS_LINE</licenseUrl>-->

‎src/XRSharp.CommunityToolkit.Networked/XRSharp.CommunityToolkit.Networked.csproj‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
</PropertyGroup>
99

1010
<ItemGroup>
11-
<PackageReference Include="XRSharp" Version="0.1.7-*" />
11+
<PackageReference Include="XRSharp" Version="0.1.8-preview-2025-07-11-092834-ca515795" />
1212
</ItemGroup>
1313

1414
<ItemGroup>
@@ -20,10 +20,10 @@
2020
</ItemGroup>
2121

2222
<ItemGroup>
23-
<EmbeddedResource Include="Resources\easyrtc.js" />
24-
<EmbeddedResource Include="Resources\networked-aframe.min.js" />
25-
<EmbeddedResource Include="Resources\networked-hand-tracking.js" />
26-
<EmbeddedResource Include="Resources\socket.io.slim.js" />
23+
<Resource Include="Resources\easyrtc.js" />
24+
<Resource Include="Resources\networked-aframe.min.js" />
25+
<Resource Include="Resources\networked-hand-tracking.js" />
26+
<Resource Include="Resources\socket.io.slim.js" />
2727
</ItemGroup>
2828

2929
<ItemGroup>

‎src/XRSharp.CommunityToolkit/XRSharp.CommunityToolkit.Browser/Interop/UnmarshalledJavaScriptExecutionHandler.cs‎

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

‎src/XRSharp.CommunityToolkit/XRSharp.CommunityToolkit.Browser/Pages/Index.cs‎

Lines changed: 7 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
1-
using DotNetForHtml5;
2-
using Microsoft.AspNetCore.Components;
1+
using Microsoft.AspNetCore.Components;
32
using Microsoft.AspNetCore.Components.Rendering;
4-
using Microsoft.JSInterop;
5-
using System;
3+
using OpenSilver.WebAssembly;
64
using System.Threading.Tasks;
7-
using XRSharp.CommunityToolkit.Browser.Interop;
85

96
namespace XRSharp.CommunityToolkit.Browser.Pages;
107

@@ -15,19 +12,12 @@ protected override void BuildRenderTree(RenderTreeBuilder __builder)
1512
{
1613
}
1714

18-
protected async override Task OnInitializedAsync()
15+
protected override async Task OnInitializedAsync()
1916
{
20-
await base.OnInitializedAsync();
21-
22-
if (!await JSRuntime.InvokeAsync<bool>("getOSFilesLoadedPromise"))
17+
await Runner.RunApplicationAsync(async () =>
2318
{
24-
throw new InvalidOperationException("Failed to initialize OpenSilver. Check your browser's console for error details.");
25-
}
26-
27-
Cshtml5Initializer.Initialize(new UnmarshalledJavaScriptExecutionHandler(JSRuntime));
28-
Program.RunApplication();
19+
await Root3D.Initialize();
20+
return new CommunityToolkit.App();
21+
});
2922
}
30-
31-
[Inject]
32-
private IJSRuntime JSRuntime { get; set; }
3323
}

‎src/XRSharp.CommunityToolkit/XRSharp.CommunityToolkit.Browser/Program.cs‎

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,15 @@
11
using Microsoft.AspNetCore.Components.WebAssembly.Hosting;
2-
using Microsoft.Extensions.DependencyInjection;
3-
using System;
4-
using System.Net.Http;
52
using System.Threading.Tasks;
6-
using System.Windows;
73

84
namespace XRSharp.CommunityToolkit.Browser;
5+
96
public class Program
107
{
118
public static async Task Main(string[] args)
129
{
1310
var builder = WebAssemblyHostBuilder.CreateDefault(args);
1411
builder.RootComponents.Add<App>("#app");
15-
16-
builder.Services.AddTransient(sp => new HttpClient { BaseAddress = new Uri(builder.HostEnvironment.BaseAddress) });
17-
1812
var host = builder.Build();
1913
await host.RunAsync();
2014
}
21-
22-
public static void RunApplication()
23-
{
24-
Application.RunApplication(async () =>
25-
{
26-
await XRSharp.Root3D.Initialize();
27-
var app = new XRSharp.CommunityToolkit.App();
28-
});
29-
}
3015
}

‎src/XRSharp.CommunityToolkit/XRSharp.CommunityToolkit.Browser/XRSharp.CommunityToolkit.Browser.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<PropertyGroup>
44
<TargetFramework>net8.0</TargetFramework>
55
<NoXamlPreprocessor>True</NoXamlPreprocessor>
6-
<OpenSilverType>6</OpenSilverType>
6+
<OpenSilverType>7</OpenSilverType>
77
<PublishTrimmed>true</PublishTrimmed>
88
<PublishIISAssets>true</PublishIISAssets>
99
<DisableImplicitNamespaceImports>True</DisableImplicitNamespaceImports>
@@ -12,9 +12,9 @@
1212
</PropertyGroup>
1313

1414
<ItemGroup>
15+
<PackageReference Include="OpenSilver.WebAssembly" Version="3.3.0-preview-2025-07-07-132018-3a1ef60c" />
1516
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.0" />
1617
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="8.0.0" PrivateAssets="all" />
17-
<PackageReference Include="XRSharp" Version="0.1.7-*" />
1818
</ItemGroup>
1919

2020
<ItemGroup>

‎src/XRSharp.CommunityToolkit/XRSharp.CommunityToolkit.Browser/wwwroot/index.html‎

Lines changed: 38 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -5,46 +5,62 @@
55
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" />
66
<title>XR# Community Toolkit</title>
77
<base href="/" />
8+
<style>
9+
:root {
10+
--opensilver-loading-background-color: #fff;
11+
--opensilver-loading-progress-bg: #f0f0f0;
12+
--opensilver-loading-progress-bar-color: #696969;
13+
--opensilver-loading-counter-color: #555;
14+
--opensilver-loading-progress-border-color: #c0c0c0;
15+
}
16+
</style>
817
<script>
918
(function () {
1019
const style = document.createElement('link');
1120
style.setAttribute('rel', 'stylesheet');
1221
style.setAttribute('type', 'text/css');
13-
style.setAttribute('href', 'loading-indicator.css?date=' + new Date().toISOString());
22+
style.setAttribute('href', 'modern/loading-indicator.css?date=' + new Date().toISOString());
1423
document.head.appendChild(style);
24+
1525
const script = document.createElement('script');
1626
script.setAttribute('type', 'application/javascript');
17-
script.setAttribute('src', 'libs/opensilver.js?date=' + new Date().toISOString());
27+
script.setAttribute('src', 'modern/loading-animation.js?date=' + new Date().toISOString());
1828
document.head.appendChild(script);
1929
})();
2030
</script>
2131
</head>
2232
<body>
2333
<div id="app">
24-
<div class="loading-indicator-wrapper">
25-
<div class="loading-indicator">
26-
<div class="loading-indicator-ball"></div>
27-
<div class="loading-indicator-ball"></div>
28-
<div class="loading-indicator-ball"></div>
29-
<div class="loading-indicator-ball"></div>
30-
<div class="loading-indicator-ball"></div>
31-
<div class="loading-indicator-ball"></div>
32-
<div class="loading-indicator-ball"></div>
33-
<div class="loading-indicator-ball"></div>
34-
<div class="loading-indicator-ball"></div>
35-
<div class="loading-indicator-ball"></div>
36-
<div class="loading-indicator-ball"></div>
37-
<div class="loading-indicator-ball"></div>
38-
<div class="loading-indicator-ball"></div>
39-
<div class="loading-indicator-ball"></div>
40-
<div class="loading-indicator-ball"></div>
41-
<div class="loading-indicator-ball"></div>
42-
<div class="loading-indicator-text"></div>
34+
<div class="opensilver-loading-indicator">
35+
<div class="opensilver-loader-container">
36+
<div class="opensilver-loader">
37+
<div class="opensilver-loader-progress">
38+
<div class="opensilver-loader-progress-bar"></div>
39+
</div>
40+
</div>
41+
<div class="opensilver-counter-container">
42+
<span class="opensilver-odometer"></span>
43+
<span class="opensilver-odometer"></span>
44+
<span class="opensilver-odometer"></span>
45+
</div>
4346
</div>
4447
</div>
4548
</div>
4649
<div id="opensilver-root" style="position: relative; width: 100%; height: 100%; overflow-x: hidden; overflow-y: hidden"></div>
4750

48-
<script src="_framework/blazor.webassembly.js"></script>
51+
<script>
52+
(function () {
53+
const script = document.createElement('script');
54+
script.setAttribute('type', 'application/javascript');
55+
script.setAttribute('src', 'libs/opensilver.js?date=' + new Date().toISOString());
56+
script.addEventListener('load', function () {
57+
const scriptWebAssembly = document.createElement('script');
58+
scriptWebAssembly.setAttribute('type', 'application/javascript');
59+
scriptWebAssembly.setAttribute('src', '_framework/blazor.webassembly.js?date=' + new Date().toISOString());
60+
document.body.appendChild(scriptWebAssembly);
61+
});
62+
document.body.appendChild(script);
63+
})();
64+
</script>
4965
</body>
5066
</html>

0 commit comments

Comments
 (0)