Skip to content

Commit 4615847

Browse files
sescaladasescalada
committed
Update to Evergine 2025.3.12.192-nightly
- Up to Evergine 2025.3.12.192-nightly - Evergine API breaking changes - Re-serialized prefabs - Workaround: issues with prefab instantiation if you have name collisions along scenes&prefab file names - Fix: disable horizontal scroll in Help > Painter - Update streaming camera source
1 parent 3ec718e commit 4615847

File tree

85 files changed

+404
-16365
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

85 files changed

+404
-16365
lines changed

‎Directory.Build.props

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<!-- Nuget metadata -->
33
<PropertyGroup>
44
<Version>2023.0.0.0-preview</Version>
5-
<Copyright>Copyright (c) Evergine 2024</Copyright>
5+
<Copyright>Copyright (c) Evergine 2025</Copyright>
66
<Authors>Evergine Team</Authors>
77
<Company>Plain Concepts</Company>
88
<Product>XRV</Product>
@@ -38,7 +38,7 @@
3838
<IsAddOnProject Condition="'$(IsAddOnProject)'==''">false</IsAddOnProject>
3939
</PropertyGroup>
4040
<ItemGroup Condition="'$(IsAddOnProject)'=='true'">
41-
<PackageReference Include="Evergine.Packages.Targets" Version="2024.10.24.7" />
41+
<PackageReference Include="Evergine.Packages.Targets" Version="2025.3.12.192-nightly" />
4242
</ItemGroup>
4343

4444
<!-- Stylecop -->

‎samples/Content/Prefabs/WindowTitleView.weprefab.weprf

+2-1
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,5 @@ Source:
1212
Id: d0d94ea7-9aeb-4bc3-930a-c3dd5025b9bd
1313
IsCompressed: true
1414
LastModified: 0001-01-01T00:00:00.0000000
15-
PrefabData: null
15+
PrefabData:
16+
Id: 2efeaf5c-d9c3-492e-ba4e-1bf44be7b2e9

‎samples/Content/Scenes/HandMenu.wescene ‎samples/Content/Scenes/HandMenuScene.wescene

File renamed without changes.

‎samples/Content/Scenes/HandMenu.wescene.wesc ‎samples/Content/Scenes/HandMenuScene.wescene.wesc

File renamed without changes.

‎samples/Content/Scenes/HandMenu/Environment.wedir ‎samples/Content/Scenes/HandMenuScene/Environment.wedir

File renamed without changes.

‎samples/Content/Scenes/HandMenu/Environment/SceneReflectionProbe.wedir ‎samples/Content/Scenes/HandMenuScene/Environment/SceneReflectionProbe.wedir

File renamed without changes.

‎samples/Content/Scenes/HandMenu/Environment/SceneReflectionProbe.werp ‎samples/Content/Scenes/HandMenuScene/Environment/SceneReflectionProbe.werp

File renamed without changes.

‎samples/Content/Scenes/HandMenu/Environment/SceneReflectionProbe/Irradiance.texdmp ‎samples/Content/Scenes/HandMenuScene/Environment/SceneReflectionProbe/Irradiance.texdmp

File renamed without changes.

‎samples/Content/Scenes/HandMenu/Environment/SceneReflectionProbe/Irradiance.texdmp.wetx ‎samples/Content/Scenes/HandMenuScene/Environment/SceneReflectionProbe/Irradiance.texdmp.wetx

File renamed without changes.

‎samples/Content/Scenes/HandMenu/Environment/SceneReflectionProbe/Radiance.texdmp ‎samples/Content/Scenes/HandMenuScene/Environment/SceneReflectionProbe/Radiance.texdmp

File renamed without changes.

‎samples/Content/Scenes/HandMenu/Environment/SceneReflectionProbe/Radiance.texdmp.wetx ‎samples/Content/Scenes/HandMenuScene/Environment/SceneReflectionProbe/Radiance.texdmp.wetx

File renamed without changes.

‎samples/XrvSamples.Editor/XrvSamples.Editor.csproj

+4-4
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
<TargetFramework>net8.0</TargetFramework>
44
</PropertyGroup>
55
<ItemGroup>
6-
<PackageReference Include="Evergine.Common" Version="2024.10.24.804" />
7-
<PackageReference Include="Evergine.Components" Version="2024.10.24.804" />
8-
<PackageReference Include="Evergine.Framework" Version="2024.10.24.804" />
9-
<PackageReference Include="Evergine.Editor.Extension" Version="2024.10.24.804" />
6+
<PackageReference Include="Evergine.Common" Version="2025.3.12.192-nightly" />
7+
<PackageReference Include="Evergine.Components" Version="2025.3.12.192-nightly" />
8+
<PackageReference Include="Evergine.Framework" Version="2025.3.12.192-nightly" />
9+
<PackageReference Include="Evergine.Editor.Extension" Version="2025.3.12.192-nightly" />
1010
</ItemGroup>
1111
<ItemGroup>
1212
<ProjectReference Include="..\..\src\core\Evergine.Xrv.Core.Editor\Evergine.Xrv.Core.Editor.csproj" />

‎samples/XrvSamples.Pico/XrvSamples.Pico.csproj

+7-7
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@
1616
<None Remove="Resources\xml\network_security_config.xml" />
1717
</ItemGroup>
1818
<ItemGroup>
19-
<PackageReference Include="Evergine.Android" Version="2024.10.24.804" />
20-
<PackageReference Include="Evergine.Vulkan" Version="2024.10.24.804" />
21-
<PackageReference Include="Evergine.OpenXR" Version="2024.10.24.804" />
22-
<PackageReference Include="Evergine.HLSLEverywhere" Version="2024.10.24.804" />
23-
<PackageReference Include="Evergine.OpenAL" Version="2024.10.24.804" />
24-
<PackageReference Include="Evergine.Targets" Version="2024.10.24.804" />
25-
<PackageReference Include="Evergine.Targets.Android" Version="2024.10.24.804" />
19+
<PackageReference Include="Evergine.Android" Version="2025.3.12.192-nightly" />
20+
<PackageReference Include="Evergine.Vulkan" Version="2025.3.12.192-nightly" />
21+
<PackageReference Include="Evergine.OpenXR" Version="2025.3.12.192-nightly" />
22+
<PackageReference Include="Evergine.HLSLEverywhere" Version="2025.3.12.192-nightly" />
23+
<PackageReference Include="Evergine.OpenAL" Version="2025.3.12.192-nightly" />
24+
<PackageReference Include="Evergine.Targets" Version="2025.3.12.192-nightly" />
25+
<PackageReference Include="Evergine.Targets.Android" Version="2025.3.12.192-nightly" />
2626
<PackageReference Include="Evergine.LibBulletc.Natives" Version="2023.11.28.20" />
2727
<PackageReference Include="Evergine.OpenXR.Natives.Pico" Version="2023.2.10.2" />
2828
</ItemGroup>

‎samples/XrvSamples.Quest/XrvSamples.Quest.csproj

+7-7
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,15 @@
1616
<None Remove="Resources\xml\network_security_config.xml" />
1717
</ItemGroup>
1818
<ItemGroup>
19-
<PackageReference Include="Evergine.Android" Version="2024.10.24.804" />
19+
<PackageReference Include="Evergine.Android" Version="2025.3.12.192-nightly" />
2020
<PackageReference Include="Evergine.LibBulletc.Natives" Version="2023.11.28.20" />
2121
<PackageReference Include="Evergine.OpenXR.Natives.Quest" Version="2023.2.10.2" />
22-
<PackageReference Include="Evergine.Vulkan" Version="2024.10.24.804" />
23-
<PackageReference Include="Evergine.OpenXR" Version="2024.10.24.804" />
24-
<PackageReference Include="Evergine.HLSLEverywhere" Version="2024.10.24.804" />
25-
<PackageReference Include="Evergine.OpenAL" Version="2024.10.24.804" />
26-
<PackageReference Include="Evergine.Targets" Version="2024.10.24.804" />
27-
<PackageReference Include="Evergine.Targets.Android" Version="2024.10.24.804" />
22+
<PackageReference Include="Evergine.Vulkan" Version="2025.3.12.192-nightly" />
23+
<PackageReference Include="Evergine.OpenXR" Version="2025.3.12.192-nightly" />
24+
<PackageReference Include="Evergine.HLSLEverywhere" Version="2025.3.12.192-nightly" />
25+
<PackageReference Include="Evergine.OpenAL" Version="2025.3.12.192-nightly" />
26+
<PackageReference Include="Evergine.Targets" Version="2025.3.12.192-nightly" />
27+
<PackageReference Include="Evergine.Targets.Android" Version="2025.3.12.192-nightly" />
2828
</ItemGroup>
2929
<ItemGroup>
3030
<ProjectReference Include="..\XrvSamples\XrvSamples.csproj" />

‎samples/XrvSamples.Windows/XrvSamples.Windows.csproj

+6-6
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55
<UseWindowsForms>true</UseWindowsForms>
66
</PropertyGroup>
77
<ItemGroup>
8-
<PackageReference Include="Evergine.DirectX11" Version="2024.10.24.804" />
9-
<PackageReference Include="Evergine.HLSLEverywhere" Version="2024.10.24.804" />
10-
<PackageReference Include="Evergine.XAudio2" Version="2024.10.24.804" />
11-
<PackageReference Include="Evergine.Forms" Version="2024.10.24.804" />
12-
<PackageReference Include="Evergine.Targets" Version="2024.10.24.804" />
13-
<PackageReference Include="Evergine.Targets.Windows" Version="2024.10.24.804" />
8+
<PackageReference Include="Evergine.DirectX11" Version="2025.3.12.192-nightly" />
9+
<PackageReference Include="Evergine.HLSLEverywhere" Version="2025.3.12.192-nightly" />
10+
<PackageReference Include="Evergine.XAudio2" Version="2025.3.12.192-nightly" />
11+
<PackageReference Include="Evergine.Forms" Version="2025.3.12.192-nightly" />
12+
<PackageReference Include="Evergine.Targets" Version="2025.3.12.192-nightly" />
13+
<PackageReference Include="Evergine.Targets.Windows" Version="2025.3.12.192-nightly" />
1414
</ItemGroup>
1515
<ItemGroup>
1616
<ProjectReference Include="..\XrvSamples\XrvSamples.csproj" />

‎samples/XrvSamples/MyApplication.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ private void ConfigureXrv()
9595
})
9696
.AddModule(new StreamingViewerModule()
9797
{
98-
SourceURL = "http://94.124.210.59:8083/mjpg/video.mjpg"
98+
SourceURL = "http://flightcam1.pr.erau.edu/mjpg/video.mjpg"
9999
})
100100
.AddModule(new PainterModule());
101101

‎samples/XrvSamples/Services/FakeQrWatcherService.cs

+9-12
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
using Evergine.Common.Input.Keyboard;
33
using Evergine.Framework;
44
using Evergine.Framework.Graphics;
5+
using Evergine.Framework.Managers;
56
using Evergine.Framework.Services;
67
using Evergine.Framework.XR.QR;
78
using Evergine.Mathematics;
@@ -15,7 +16,7 @@ namespace XrvSamples.Services
1516
{
1617
public class FakeQRWatcherService : UpdatableService, IQRCodeWatcherService
1718
{
18-
private Scene currentScene;
19+
private RenderManager currentRenderManager;
1920
private Camera3D camera;
2021
private KeyboardDispatcher keyboardDispatcher;
2122
private List<QRCode> qrCodes;
@@ -65,7 +66,7 @@ protected override void OnDeactivated()
6566

6667
public override void Update(TimeSpan gameTime)
6768
{
68-
this.camera = this.currentScene?.Managers.RenderManager.ActiveCamera3D;
69+
this.camera = this.currentRenderManager?.ActiveCamera3D;
6970
this.keyboardDispatcher = this.graphicsPresenter.FocusedDisplay?.KeyboardDispatcher;
7071

7172
if (this.keyboardDispatcher == null || !this.IsWatcherRunning)
@@ -140,23 +141,19 @@ private void UpdateDetection()
140141

141142
if (this.DebugEnabled)
142143
{
143-
var lineBatch = this.currentScene.Managers.RenderManager.LineBatch3D;
144+
var lineBatch = this.currentRenderManager?.LineBatch3D;
144145
foreach (var code in this.qrCodes.Where(c => c.Transform.HasValue))
145146
{
146-
lineBatch.DrawAxis(code.Transform.Value, code.PhysicalSideLength * 2f);
147+
lineBatch?.DrawAxis(code.Transform.Value, code.PhysicalSideLength * 2f);
147148
}
148149
}
149150
}
150151

151-
private void ScreenContext_OnActivatingScene(Scene scene) => this.currentScene = scene;
152+
private void ScreenContext_OnActivatingScene(Scene scene) =>
153+
this.currentRenderManager = scene.Managers.FindManager<RenderManager>();
152154

153-
private void ScreenContext_OnDesactivatingScene(Scene scene)
154-
{
155-
if (this.currentScene == scene)
156-
{
157-
this.currentScene = null;
158-
}
159-
}
155+
private void ScreenContext_OnDesactivatingScene(Scene scene) =>
156+
this.currentRenderManager = null;
160157

161158
private class FakeQrCode : QRCode
162159
{

‎samples/XrvSamples/XrvSamples.csproj

+7-7
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@
77
<ReferenceMRTK>true</ReferenceMRTK>
88
</PropertyGroup>
99
<ItemGroup>
10-
<PackageReference Include="Evergine.Common" Version="2024.10.24.804" />
11-
<PackageReference Include="Evergine.Components" Version="2024.10.24.804" />
12-
<PackageReference Include="Evergine.Framework" Version="2024.10.24.804" />
13-
<PackageReference Include="Evergine.Mathematics" Version="2024.10.24.804" />
14-
<PackageReference Include="Evergine.Bullet" Version="2024.10.24.804" />
15-
<PackageReference Include="Evergine.Targets" Version="2024.10.24.804" />
16-
<PackageReference Include="Evergine.CodeScenes" Version="2024.10.24.804" />
10+
<PackageReference Include="Evergine.Common" Version="2025.3.12.192-nightly" />
11+
<PackageReference Include="Evergine.Components" Version="2025.3.12.192-nightly" />
12+
<PackageReference Include="Evergine.Framework" Version="2025.3.12.192-nightly" />
13+
<PackageReference Include="Evergine.Mathematics" Version="2025.3.12.192-nightly" />
14+
<PackageReference Include="Evergine.Bullet" Version="2025.3.12.192-nightly" />
15+
<PackageReference Include="Evergine.Targets" Version="2025.3.12.192-nightly" />
16+
<PackageReference Include="Evergine.CodeScenes" Version="2025.3.12.192-nightly" />
1717
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="7.0.0" />
1818
</ItemGroup>
1919
<ItemGroup>

‎src/core/Evergine.Xrv.Core.Assets/Content/XRV/Prefabs/About.weprefab.weprf

+2-1
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,5 @@ Source:
1212
Id: 7debf385-0197-4abb-85cb-ec910ecab997
1313
IsCompressed: true
1414
LastModified: 0001-01-01T00:00:00.0000000
15-
PrefabData: null
15+
PrefabData:
16+
Id: 715b5748-55be-4bfd-ad88-bea216ee7c15

‎src/core/Evergine.Xrv.Core.Assets/Content/XRV/Prefabs/GeneralHelp.weprefab

+10-1
Original file line numberDiff line numberDiff line change
@@ -487,12 +487,17 @@ Root:
487487
1a786ac8-3396-4d4b-8533-ae3616b443e0: 4ac6a0c0-0c37-40c6-9e31-e247c7ad6574
488488
1e6f84d9-4d17-40e9-a5ec-72e819f1294a: 777bf649-c25d-4496-a04f-4e5889f6aa25
489489
213d46b8-5775-4beb-8663-4f0b4bde873b: 606130ed-4826-4541-89e0-7601ccd3a951
490+
2b4a35e5-d779-404f-800b-a500fec741b4: 6da07ccd-12b3-4ccc-94b2-8069edaa91ba
490491
2b72dc7a-ae39-4f29-9f5f-5fe9db611114: 1ed746eb-41b7-4956-8508-146d4ed970b1
492+
2b732880-bf04-4f89-ac33-5a3ca446ae80: 6ef91ab6-d7a7-4dbf-9ce3-af50ad30816a
491493
319c2a3a-2b8a-4d1f-9ac4-b62ffe608079: 05f740fc-0348-4524-ae69-0dc70a71649c
494+
453b2628-634f-4794-b29d-6fbc383eab89: 65bbc216-4ebb-4024-99ae-4c3c1acb1e15
492495
6a889edd-bb1b-4ca2-b9de-dc4a16526466: f19c7e2a-51b8-449a-81e2-37c83367d332
493496
7a00d3b5-d1e3-424a-802c-78210815f22b: ceb75437-8210-4d28-8559-d6352f61aaff
494497
86e5edc1-2fc5-4200-b5ca-2a5199959a6a: 73b86d66-cf2a-41da-aa36-b7ffb318da2d
495498
9826dd37-8988-48d9-8ab6-1c04761913e1: 16cdede4-fee9-440b-a583-6a71a80f2620
499+
ab9d4941-4f7d-4b83-8abe-d6636baedb0b: ef009edb-9755-4744-8fd0-75284f1a2c54
500+
b323bd0e-2f25-42c2-ae93-76bc63b60357: 6f63911e-3b5c-48a9-ab7c-532e4ef1ede1
496501
cc1d45a0-f33c-4f34-ae0c-b5e53dda46d1: 4f352edb-39c4-4f6b-b242-55550634a028
497502
d23770a7-1916-4329-a95e-7e37439138cc: 4c33516a-9268-41ed-9c3a-4a82acde830a
498503
d7c30ba9-ed56-4547-8c0f-e8c28a5d70ff: 801c4ec7-f3f7-4379-b0fc-79ac68b760ca
@@ -516,9 +521,13 @@ Root:
516521
Name: Material
517522
Target: d7c30ba9-ed56-4547-8c0f-e8c28a5d70ff
518523
TypedValue: 16016b69-8771-4df2-a9fe-aeb192bff81f
524+
- !Evergine.Framework.Assets.AssetSources.Entities.PrefabModification%601[[System.Boolean,System.Private.CoreLib]],Evergine.Framework
525+
Name: IsEnabled
526+
Target: 453b2628-634f-4794-b29d-6fbc383eab89
527+
TypedValue: true
519528
- !Evergine.Framework.Assets.AssetSources.Entities.PrefabModification%601[[Evergine.Mathematics.Vector3,Evergine.Mathematics]],Evergine.Framework
520529
Name: LocalScale
521-
Target: 6a889edd-bb1b-4ca2-b9de-dc4a16526466
530+
Target: 2b4a35e5-d779-404f-800b-a500fec741b4
522531
TypedValue:
523532
X: 0.00400000019
524533
Y: 0.142641187

‎src/core/Evergine.Xrv.Core.Assets/Content/XRV/Prefabs/GeneralHelp.weprefab.weprf

+2-1
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,5 @@ Source:
1212
Id: aee1e382-4a3d-442c-a91c-3e3a8887f2af
1313
IsCompressed: true
1414
LastModified: 0001-01-01T00:00:00.0000000
15-
PrefabData: null
15+
PrefabData:
16+
Id: 4c66de2e-ee55-457e-8d64-1a8ed4ecf884

‎src/core/Evergine.Xrv.Core.Assets/Content/XRV/Prefabs/GeneralSettings.weprefab

+4
Original file line numberDiff line numberDiff line change
@@ -478,6 +478,10 @@ Root:
478478
X: -0.0790000036
479479
Y: -0.00300000003
480480
Z: 0.00800000038
481+
- !Evergine.Framework.Assets.AssetSources.Entities.PrefabModification%601[[System.Boolean,System.Private.CoreLib]],Evergine.Framework
482+
Name: IsVisuallyEnabled
483+
Target: 6a592044-3438-4a50-afde-89c6071e3ea4
484+
TypedValue: false
481485
- !Evergine.Framework.Assets.AssetSources.Entities.PrefabModification%601[[Evergine.Framework.Graphics.Material,Evergine.Framework]],Evergine.Framework
482486
Name: Material
483487
Target: 757b8161-4b6e-4787-9414-54eff06a2e16

0 commit comments

Comments
 (0)