From 745406dc65aecc438a53f96badc387a32b7a338f Mon Sep 17 00:00:00 2001 From: Joel Stålnacke Date: Thu, 19 Mar 2026 22:30:56 +0200 Subject: Add Mibo project The Djup project is DesktopGL project --- Djup.Native/AddRuntimeTargetsToDepsJson.targets | 12 --- Djup.Native/Constants.cs | 7 -- Djup.Native/Djup.Native.csproj | 39 ---------- Djup.Native/LibDjup.cs | 54 ------------- Djup.Native/Program.cs | 3 - Djup.Native/Types.cs | 89 ---------------------- Djup.Native/patch-deps.sh | 4 - .../scripts/AddRuntimeTargetsToDepsJson.targets | 12 +++ Djup.Native/scripts/patch-deps.sh | 4 + Djup.Native/src/Constants.cs | 7 ++ Djup.Native/src/Djup.Native.csproj | 40 ++++++++++ Djup.Native/src/LibDjup.cs | 54 +++++++++++++ Djup.Native/src/Program.cs | 3 + Djup.Native/src/Types.cs | 89 ++++++++++++++++++++++ Djup.Native/src/packages.lock.json | 6 ++ 15 files changed, 215 insertions(+), 208 deletions(-) delete mode 100644 Djup.Native/AddRuntimeTargetsToDepsJson.targets delete mode 100644 Djup.Native/Constants.cs delete mode 100644 Djup.Native/Djup.Native.csproj delete mode 100644 Djup.Native/LibDjup.cs delete mode 100644 Djup.Native/Program.cs delete mode 100644 Djup.Native/Types.cs delete mode 100755 Djup.Native/patch-deps.sh create mode 100644 Djup.Native/scripts/AddRuntimeTargetsToDepsJson.targets create mode 100755 Djup.Native/scripts/patch-deps.sh create mode 100644 Djup.Native/src/Constants.cs create mode 100644 Djup.Native/src/Djup.Native.csproj create mode 100644 Djup.Native/src/LibDjup.cs create mode 100644 Djup.Native/src/Program.cs create mode 100644 Djup.Native/src/Types.cs create mode 100644 Djup.Native/src/packages.lock.json (limited to 'Djup.Native') diff --git a/Djup.Native/AddRuntimeTargetsToDepsJson.targets b/Djup.Native/AddRuntimeTargetsToDepsJson.targets deleted file mode 100644 index fbb4c43..0000000 --- a/Djup.Native/AddRuntimeTargetsToDepsJson.targets +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - diff --git a/Djup.Native/Constants.cs b/Djup.Native/Constants.cs deleted file mode 100644 index 90692be..0000000 --- a/Djup.Native/Constants.cs +++ /dev/null @@ -1,7 +0,0 @@ -namespace Djup.Native; - -public static class Constants -{ - public const int WorldMaxPlayers = 5; - public const int WorldMaxBullets = 5000; -} diff --git a/Djup.Native/Djup.Native.csproj b/Djup.Native/Djup.Native.csproj deleted file mode 100644 index f3c2781..0000000 --- a/Djup.Native/Djup.Native.csproj +++ /dev/null @@ -1,39 +0,0 @@ - - - - net10.0 - enable - enable - true - - - - $(MSBuildThisFileDirectory)../lib/build - - - - - runtimes/linux-x64/native/libdjup.so - Always - runtimes/linux-x64/native/ - true - - - - - - - $([System.Runtime.InteropServices.RuntimeInformation]::OSArchitecture) - true - - - - - runtimes/linux-x64/native/libdjup.so - Always - - - - - - diff --git a/Djup.Native/LibDjup.cs b/Djup.Native/LibDjup.cs deleted file mode 100644 index 15dcdad..0000000 --- a/Djup.Native/LibDjup.cs +++ /dev/null @@ -1,54 +0,0 @@ -using System.Runtime.InteropServices; - -namespace Djup.Native; - -public static partial class LibDjup -{ - const string LibraryName = "djup"; - const string Prefix = "dp_"; - - [LibraryImport(LibraryName, EntryPoint = Prefix + nameof(hello_world))] - public static partial void hello_world(); - - [LibraryImport(LibraryName, EntryPoint = Prefix + nameof(get_num))] - public static partial int get_num(); - - [LibraryImport(LibraryName, EntryPoint = Prefix + nameof(get_vec2))] - public static partial Vec2 get_vec2(); - - [LibraryImport(LibraryName, EntryPoint = Prefix + nameof(vec2_mul))] - public static partial Vec2 vec2_mul(Vec2 v, float scalar); - - [LibraryImport(LibraryName, EntryPoint = Prefix + nameof(vec2_normal))] - public static partial Vec2 vec2_normal(Vec2 v); - - [LibraryImport(LibraryName, EntryPoint = Prefix + nameof(vec2_length))] - public static partial float vec2_length(Vec2 v); - - [LibraryImport(LibraryName, EntryPoint = Prefix + nameof(log_set_output))] - public static partial Vec2 log_set_output([MarshalAs(UnmanagedType.FunctionPtr)] LoggerDelegate logger); - - [LibraryImport(LibraryName, EntryPoint = Prefix + nameof(log_set_level))] - public static partial Vec2 log_set_level(LogLevel minLevel); - - [LibraryImport(LibraryName, EntryPoint = Prefix + nameof(physics_context_create))] - public static partial IntPtr physics_context_create(uint snapshots); - - [LibraryImport(LibraryName, EntryPoint = Prefix + nameof(physics_context_free))] - public static partial void physics_context_free(IntPtr context); - - [LibraryImport(LibraryName, EntryPoint = Prefix + nameof(physics_context_get_snapshot))] - public static partial IntPtr physics_context_get_snapshot(IntPtr context); - - [LibraryImport(LibraryName, EntryPoint = Prefix + nameof(physics_context_return_snapshot))] - public static partial void physics_context_return_snapshot(IntPtr context, IntPtr snapshot); - - [LibraryImport(LibraryName, EntryPoint = Prefix + nameof(physics_tick))] - public static partial int physics_tick(IntPtr currentSnapshot, double delta, IntPtr nextSnapshot); - - [LibraryImport(LibraryName, EntryPoint = Prefix + nameof(snapshot_put_player))] - public static unsafe partial int snapshot_put_player(IntPtr snapshot, uint playerId, Player *player); - - [LibraryImport(LibraryName, EntryPoint = Prefix + nameof(snapshot_set_player_input))] - public static partial int snapshot_set_player_input(IntPtr snapshot, uint playerId, byte input); -} diff --git a/Djup.Native/Program.cs b/Djup.Native/Program.cs deleted file mode 100644 index 1b374b8..0000000 --- a/Djup.Native/Program.cs +++ /dev/null @@ -1,3 +0,0 @@ -/*using Djup.Native;*/ -/**/ -/*LibDjup.hello_world();*/ diff --git a/Djup.Native/Types.cs b/Djup.Native/Types.cs deleted file mode 100644 index 7d9c41e..0000000 --- a/Djup.Native/Types.cs +++ /dev/null @@ -1,89 +0,0 @@ -using System.Diagnostics; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -namespace Djup.Native; - -[StructLayout(LayoutKind.Sequential)] -public struct Vec2 -{ - public float X { get; } - public float Y { get; } - - public Vec2(float x, float y) - { - Debug.Assert(float.IsFinite(x)); - Debug.Assert(float.IsFinite(y)); - - X = x; - Y = y; - } - - public override string ToString() => $"({X}, {Y})"; -} - -public enum EntityState : byte -{ - Inactive = 0, - Active, - Removed, - Dead -} - -public enum PlayerInput : byte -{ - Up = 1 << 0, - Down = 1 << 1, - Left = 1 << 2, - Right = 1 << 3 -} - -[StructLayout(LayoutKind.Sequential)] -public struct Player -{ - public EntityState State { get; } - private byte input; - public Vec2 Position { get; set; } - public Vec2 Velocity { get; set; } -} - -[StructLayout(LayoutKind.Sequential)] -public struct Bullet -{ - public EntityState State { get; set; } - public Vec2 Position { get; set; } - public Vec2 Velocity { get; set; } -} - -[StructLayout(LayoutKind.Sequential)] -public struct Snapshot -{ - [InlineArray(Constants.WorldMaxPlayers)] - public struct PlayerArray - { - private Player _element0; - } - - [InlineArray(Constants.WorldMaxBullets)] - public struct BallArray - { - private Bullet _element0; - } - - private byte active; - public uint Tick { get; } - public PlayerArray Players { get; } - public BallArray Bullets { get; } -} - -public enum LogLevel -{ - Trace, - Debug, - Info, - Warn, - Error, - Fatal -} - -public delegate void LoggerDelegate(LogLevel level, string source, int line, string message); diff --git a/Djup.Native/patch-deps.sh b/Djup.Native/patch-deps.sh deleted file mode 100755 index 8015323..0000000 --- a/Djup.Native/patch-deps.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh -depsjson="$(find "$1" -name '*.deps.json')" -patched="$(jq '.targets.".NETCoreApp,Version=v10.0"."Djup.Native/1.0.0" += {"runtimeTargets": {"runtimes/linux-x64/native/libdjup.so": {"rid": "linux-x64", "assetType": "native"} }}' "$depsjson")" -echo -n "$patched" > "$depsjson" diff --git a/Djup.Native/scripts/AddRuntimeTargetsToDepsJson.targets b/Djup.Native/scripts/AddRuntimeTargetsToDepsJson.targets new file mode 100644 index 0000000..fbb4c43 --- /dev/null +++ b/Djup.Native/scripts/AddRuntimeTargetsToDepsJson.targets @@ -0,0 +1,12 @@ + + + + + + + diff --git a/Djup.Native/scripts/patch-deps.sh b/Djup.Native/scripts/patch-deps.sh new file mode 100755 index 0000000..8015323 --- /dev/null +++ b/Djup.Native/scripts/patch-deps.sh @@ -0,0 +1,4 @@ +#!/bin/sh +depsjson="$(find "$1" -name '*.deps.json')" +patched="$(jq '.targets.".NETCoreApp,Version=v10.0"."Djup.Native/1.0.0" += {"runtimeTargets": {"runtimes/linux-x64/native/libdjup.so": {"rid": "linux-x64", "assetType": "native"} }}' "$depsjson")" +echo -n "$patched" > "$depsjson" diff --git a/Djup.Native/src/Constants.cs b/Djup.Native/src/Constants.cs new file mode 100644 index 0000000..90692be --- /dev/null +++ b/Djup.Native/src/Constants.cs @@ -0,0 +1,7 @@ +namespace Djup.Native; + +public static class Constants +{ + public const int WorldMaxPlayers = 5; + public const int WorldMaxBullets = 5000; +} diff --git a/Djup.Native/src/Djup.Native.csproj b/Djup.Native/src/Djup.Native.csproj new file mode 100644 index 0000000..a581a58 --- /dev/null +++ b/Djup.Native/src/Djup.Native.csproj @@ -0,0 +1,40 @@ + + + + net10.0 + enable + enable + true + true + + + + $(MSBuildThisFileDirectory)../../lib/build + + + + + runtimes/linux-x64/native/libdjup.so + Always + runtimes/linux-x64/native/ + true + + + + + + + $([System.Runtime.InteropServices.RuntimeInformation]::OSArchitecture) + true + + + + + runtimes/linux-x64/native/libdjup.so + Always + + + + + + diff --git a/Djup.Native/src/LibDjup.cs b/Djup.Native/src/LibDjup.cs new file mode 100644 index 0000000..15dcdad --- /dev/null +++ b/Djup.Native/src/LibDjup.cs @@ -0,0 +1,54 @@ +using System.Runtime.InteropServices; + +namespace Djup.Native; + +public static partial class LibDjup +{ + const string LibraryName = "djup"; + const string Prefix = "dp_"; + + [LibraryImport(LibraryName, EntryPoint = Prefix + nameof(hello_world))] + public static partial void hello_world(); + + [LibraryImport(LibraryName, EntryPoint = Prefix + nameof(get_num))] + public static partial int get_num(); + + [LibraryImport(LibraryName, EntryPoint = Prefix + nameof(get_vec2))] + public static partial Vec2 get_vec2(); + + [LibraryImport(LibraryName, EntryPoint = Prefix + nameof(vec2_mul))] + public static partial Vec2 vec2_mul(Vec2 v, float scalar); + + [LibraryImport(LibraryName, EntryPoint = Prefix + nameof(vec2_normal))] + public static partial Vec2 vec2_normal(Vec2 v); + + [LibraryImport(LibraryName, EntryPoint = Prefix + nameof(vec2_length))] + public static partial float vec2_length(Vec2 v); + + [LibraryImport(LibraryName, EntryPoint = Prefix + nameof(log_set_output))] + public static partial Vec2 log_set_output([MarshalAs(UnmanagedType.FunctionPtr)] LoggerDelegate logger); + + [LibraryImport(LibraryName, EntryPoint = Prefix + nameof(log_set_level))] + public static partial Vec2 log_set_level(LogLevel minLevel); + + [LibraryImport(LibraryName, EntryPoint = Prefix + nameof(physics_context_create))] + public static partial IntPtr physics_context_create(uint snapshots); + + [LibraryImport(LibraryName, EntryPoint = Prefix + nameof(physics_context_free))] + public static partial void physics_context_free(IntPtr context); + + [LibraryImport(LibraryName, EntryPoint = Prefix + nameof(physics_context_get_snapshot))] + public static partial IntPtr physics_context_get_snapshot(IntPtr context); + + [LibraryImport(LibraryName, EntryPoint = Prefix + nameof(physics_context_return_snapshot))] + public static partial void physics_context_return_snapshot(IntPtr context, IntPtr snapshot); + + [LibraryImport(LibraryName, EntryPoint = Prefix + nameof(physics_tick))] + public static partial int physics_tick(IntPtr currentSnapshot, double delta, IntPtr nextSnapshot); + + [LibraryImport(LibraryName, EntryPoint = Prefix + nameof(snapshot_put_player))] + public static unsafe partial int snapshot_put_player(IntPtr snapshot, uint playerId, Player *player); + + [LibraryImport(LibraryName, EntryPoint = Prefix + nameof(snapshot_set_player_input))] + public static partial int snapshot_set_player_input(IntPtr snapshot, uint playerId, byte input); +} diff --git a/Djup.Native/src/Program.cs b/Djup.Native/src/Program.cs new file mode 100644 index 0000000..1b374b8 --- /dev/null +++ b/Djup.Native/src/Program.cs @@ -0,0 +1,3 @@ +/*using Djup.Native;*/ +/**/ +/*LibDjup.hello_world();*/ diff --git a/Djup.Native/src/Types.cs b/Djup.Native/src/Types.cs new file mode 100644 index 0000000..7d9c41e --- /dev/null +++ b/Djup.Native/src/Types.cs @@ -0,0 +1,89 @@ +using System.Diagnostics; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; + +namespace Djup.Native; + +[StructLayout(LayoutKind.Sequential)] +public struct Vec2 +{ + public float X { get; } + public float Y { get; } + + public Vec2(float x, float y) + { + Debug.Assert(float.IsFinite(x)); + Debug.Assert(float.IsFinite(y)); + + X = x; + Y = y; + } + + public override string ToString() => $"({X}, {Y})"; +} + +public enum EntityState : byte +{ + Inactive = 0, + Active, + Removed, + Dead +} + +public enum PlayerInput : byte +{ + Up = 1 << 0, + Down = 1 << 1, + Left = 1 << 2, + Right = 1 << 3 +} + +[StructLayout(LayoutKind.Sequential)] +public struct Player +{ + public EntityState State { get; } + private byte input; + public Vec2 Position { get; set; } + public Vec2 Velocity { get; set; } +} + +[StructLayout(LayoutKind.Sequential)] +public struct Bullet +{ + public EntityState State { get; set; } + public Vec2 Position { get; set; } + public Vec2 Velocity { get; set; } +} + +[StructLayout(LayoutKind.Sequential)] +public struct Snapshot +{ + [InlineArray(Constants.WorldMaxPlayers)] + public struct PlayerArray + { + private Player _element0; + } + + [InlineArray(Constants.WorldMaxBullets)] + public struct BallArray + { + private Bullet _element0; + } + + private byte active; + public uint Tick { get; } + public PlayerArray Players { get; } + public BallArray Bullets { get; } +} + +public enum LogLevel +{ + Trace, + Debug, + Info, + Warn, + Error, + Fatal +} + +public delegate void LoggerDelegate(LogLevel level, string source, int line, string message); diff --git a/Djup.Native/src/packages.lock.json b/Djup.Native/src/packages.lock.json new file mode 100644 index 0000000..4a91a8c --- /dev/null +++ b/Djup.Native/src/packages.lock.json @@ -0,0 +1,6 @@ +{ + "version": 1, + "dependencies": { + "net10.0": {} + } +} \ No newline at end of file -- cgit v1.2.3