Skip to content

Commit cbf1a11

Browse files
canhorncanhorn
authored
Merge pull request #45 from canhorn/feature/action_result_callback_support
Action Result Callback Support
2 parents 0750eb3 + ae921c0 commit cbf1a11

File tree

366 files changed

+625
-108
lines changed

Some content is hidden

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

366 files changed

+625
-108
lines changed

‎.github/workflows/dotnet-core.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
run: dotnet publish --configuration Release -o published ./Sample/EventHorizon.Blazor.BabylonJS
3737
- name: Publish Static Site
3838
id: builddeploy
39-
uses: Azure/static-web-apps-deploy@v0.0.1-preview
39+
uses: Azure/static-web-apps-deploy@v1
4040
with:
4141
azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_WONDERFUL_POND_05F7B3B10 }}
4242
repo_token: ${{ secrets.GITHUB_TOKEN }} # Used for Github integrations (i.e. PR comments)
@@ -54,7 +54,7 @@ jobs:
5454
steps:
5555
- name: Close Pull Request
5656
id: closepullrequest
57-
uses: Azure/static-web-apps-deploy@v0.0.1-preview
57+
uses: Azure/static-web-apps-deploy@v1
5858
with:
5959
azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_WONDERFUL_POND_05F7B3B10 }}
6060
action: 'close'

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ on:
55
branches: [ main ]
66
pull_request:
77
types: [opened, synchronize]
8-
branches: [ main ]
8+
branches: [ main, dev ]
99

1010
jobs:
1111
build:

‎Sample/_generated/EventHorizon.Blazor.BabylonJS.WASM/AbstractActionManager.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ namespace BABYLON
77
using System.Threading.Tasks;
88
using EventHorizon.Blazor.Interop;
99
using EventHorizon.Blazor.Interop.Callbacks;
10+
using EventHorizon.Blazor.Interop.ResultCallbacks;
1011
using Microsoft.JSInterop;
1112

1213

@@ -227,7 +228,7 @@ public bool hasSpecificTriggers2(decimal triggerA, decimal triggerB)
227228
);
228229
}
229230

230-
public bool hasSpecificTrigger(decimal trigger, ActionCallback<object> parameterPredicate = null)
231+
public bool hasSpecificTrigger(decimal trigger, ActionResultCallback<object, bool> parameterPredicate = null)
231232
{
232233
return EventHorizonBlazorInterop.Func<bool>(
233234
new object[]

‎Sample/_generated/EventHorizon.Blazor.BabylonJS.WASM/AbstractMesh.cs‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ namespace BABYLON
77
using System.Threading.Tasks;
88
using EventHorizon.Blazor.Interop;
99
using EventHorizon.Blazor.Interop.Callbacks;
10+
using EventHorizon.Blazor.Interop.ResultCallbacks;
1011
using Microsoft.JSInterop;
1112

1213

@@ -1646,7 +1647,7 @@ public BoundingInfo getBoundingInfo()
16461647
);
16471648
}
16481649

1649-
public AbstractMesh normalizeToUnitCube(System.Nullable<bool> includeDescendants = null, System.Nullable<bool> ignoreRotation = null, ActionCallback<AbstractMesh> predicate = null)
1650+
public AbstractMesh normalizeToUnitCube(System.Nullable<bool> includeDescendants = null, System.Nullable<bool> ignoreRotation = null, ActionResultCallback<AbstractMesh, bool> predicate = null)
16501651
{
16511652
return EventHorizonBlazorInterop.FuncClass<AbstractMesh>(
16521653
entity => new AbstractMesh() { ___guid = entity.___guid },
@@ -1785,7 +1786,7 @@ public AbstractMesh moveWithCollisions(Vector3 displacement)
17851786
);
17861787
}
17871788

1788-
public PickingInfo intersects(Ray ray, System.Nullable<bool> fastCheck = null, ActionCallback<Vector3, Vector3, Vector3, Ray> trianglePredicate = null, System.Nullable<bool> onlyBoundingInfo = null, Matrix worldToUse = null, System.Nullable<bool> skipBoundingInfo = null)
1789+
public PickingInfo intersects(Ray ray, System.Nullable<bool> fastCheck = null, ActionResultCallback<Vector3, Vector3, Vector3, Ray, bool> trianglePredicate = null, System.Nullable<bool> onlyBoundingInfo = null, Matrix worldToUse = null, System.Nullable<bool> skipBoundingInfo = null)
17891790
{
17901791
return EventHorizonBlazorInterop.FuncClass<PickingInfo>(
17911792
entity => new PickingInfo() { ___guid = entity.___guid },

‎Sample/_generated/EventHorizon.Blazor.BabylonJS.WASM/AbstractScene.cs‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ namespace BABYLON
77
using System.Threading.Tasks;
88
using EventHorizon.Blazor.Interop;
99
using EventHorizon.Blazor.Interop.Callbacks;
10+
using EventHorizon.Blazor.Interop.ResultCallbacks;
1011
using Microsoft.JSInterop;
1112

1213

@@ -43,7 +44,7 @@ public static ActionCallback<CachedEntity, Scene, AssetContainer, string> GetPar
4344
);
4445
}
4546

46-
public static void AddIndividualParser(string name, ActionCallback<CachedEntity, Scene, string> parser)
47+
public static void AddIndividualParser(string name, ActionResultCallback<CachedEntity, Scene, string, CachedEntity> parser)
4748
{
4849
EventHorizonBlazorInterop.Func<CachedEntity>(
4950
new object[]
@@ -53,9 +54,9 @@ public static void AddIndividualParser(string name, ActionCallback<CachedEntity,
5354
);
5455
}
5556

56-
public static ActionCallback<CachedEntity, Scene, string> GetIndividualParser(string name)
57+
public static ActionResultCallback<CachedEntity, Scene, string, CachedEntity> GetIndividualParser(string name)
5758
{
58-
return EventHorizonBlazorInterop.Func<ActionCallback<CachedEntity, Scene, string>>(
59+
return EventHorizonBlazorInterop.Func<ActionResultCallback<CachedEntity, Scene, string, CachedEntity>>(
5960
new object[]
6061
{
6162
new string[] { "BABYLON", "AbstractScene", "GetIndividualParser" }, name

‎Sample/_generated/EventHorizon.Blazor.BabylonJS.WASM/ActionManager.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ namespace BABYLON
77
using System.Threading.Tasks;
88
using EventHorizon.Blazor.Interop;
99
using EventHorizon.Blazor.Interop.Callbacks;
10+
using EventHorizon.Blazor.Interop.ResultCallbacks;
1011
using Microsoft.JSInterop;
1112

1213

@@ -339,7 +340,7 @@ public bool hasSpecificTriggers2(decimal triggerA, decimal triggerB)
339340
);
340341
}
341342

342-
public bool hasSpecificTrigger(decimal trigger, ActionCallback<object> parameterPredicate = null)
343+
public bool hasSpecificTrigger(decimal trigger, ActionResultCallback<object, bool> parameterPredicate = null)
343344
{
344345
return EventHorizonBlazorInterop.Func<bool>(
345346
new object[]

‎Sample/_generated/EventHorizon.Blazor.BabylonJS.WASM/AlphaState.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ namespace BABYLON
77
using System.Threading.Tasks;
88
using EventHorizon.Blazor.Interop;
99
using EventHorizon.Blazor.Interop.Callbacks;
10+
using EventHorizon.Blazor.Interop.ResultCallbacks;
1011
using Microsoft.JSInterop;
1112

1213

‎Sample/_generated/EventHorizon.Blazor.BabylonJS.WASM/Analyser.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ namespace BABYLON
77
using System.Threading.Tasks;
88
using EventHorizon.Blazor.Interop;
99
using EventHorizon.Blazor.Interop.Callbacks;
10+
using EventHorizon.Blazor.Interop.ResultCallbacks;
1011
using Microsoft.JSInterop;
1112

1213

‎Sample/_generated/EventHorizon.Blazor.BabylonJS.WASM/Animatable.cs‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ namespace BABYLON
77
using System.Threading.Tasks;
88
using EventHorizon.Blazor.Interop;
99
using EventHorizon.Blazor.Interop.Callbacks;
10+
using EventHorizon.Blazor.Interop.ResultCallbacks;
1011
using Microsoft.JSInterop;
1112

1213

@@ -324,7 +325,7 @@ ICachedEntity entity
324325
}
325326

326327
public Animatable(
327-
Scene scene, object target, System.Nullable<decimal> fromFrame = null, System.Nullable<decimal> toFrame = null, System.Nullable<bool> loopAnimation = null, System.Nullable<decimal> speedRatio = null, ActionCallback onAnimationEnd = null, Animation[] animations = null, ActionCallback onAnimationLoop = null, System.Nullable<bool> isAdditive = null
328+
Scene scene, object target, System.Nullable<decimal> fromFrame = null, System.Nullable<decimal> toFrame = null, System.Nullable<bool> loopAnimation = null, System.Nullable<decimal> speedRatio = null, ActionResultCallback<ActionCallback> onAnimationEnd = null, Animation[] animations = null, ActionResultCallback<ActionCallback> onAnimationLoop = null, System.Nullable<bool> isAdditive = null
328329
)
329330
{
330331
var entity = EventHorizonBlazorInterop.New(
@@ -556,7 +557,7 @@ public void restart()
556557
);
557558
}
558559

559-
public void stop(string animationName = null, ActionCallback<object> targetMask = null)
560+
public void stop(string animationName = null, ActionResultCallback<object, bool> targetMask = null)
560561
{
561562
EventHorizonBlazorInterop.Func<CachedEntity>(
562563
new object[]

‎Sample/_generated/EventHorizon.Blazor.BabylonJS.WASM/Animation.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ namespace BABYLON
77
using System.Threading.Tasks;
88
using EventHorizon.Blazor.Interop;
99
using EventHorizon.Blazor.Interop.Callbacks;
10+
using EventHorizon.Blazor.Interop.ResultCallbacks;
1011
using Microsoft.JSInterop;
1112

1213

0 commit comments

Comments
 (0)