[bfops/bump-versions]: Merge remote-tracking branch 'origin/master' into bfops/bump-versions

Author: bfops

.github/workflows/ci.yml

@@ -741,7 +741,7 @@ jobs:
 
       - name: Run .NET tests
         working-directory: sdks/csharp
-        run: dotnet test -warnaserror --no-restore
+        run: dotnet test -warnaserror --no-restore SpacetimeDB.ClientSDK.csproj
 
       - name: Verify C# formatting
         working-directory: sdks/csharp

crates/smoketests/tests/smoketests/quickstart.rs

@@ -133,14 +133,32 @@ fn create_nuget_config(sources: &[(String, PathBuf)], mappings: &[(String, Strin
 
 /// Override nuget config to use a local NuGet package on a .NET project.
 fn override_nuget_package(project_dir: &Path, package: &str, source_dir: &Path, build_subdir: &str) -> Result<()> {
+    override_nuget_package_from_project(project_dir, package, source_dir, None, build_subdir)
+}
+
+/// Override nuget config to use a local NuGet package built from a specific .NET project.
+fn override_nuget_package_from_project(
+    project_dir: &Path,
+    package: &str,
+    source_dir: &Path,
+    source_project: Option<&str>,
+    build_subdir: &str,
+) -> Result<()> {
     println!("Override {package}: {project_dir:?} with {source_dir:?}");
 
     // Make sure the local package is built
     let workspace = workspace_root();
     let repo_nuget_config = workspace.join("NuGet.Config");
+    let source_project_path = source_project.map(|project| source_dir.join(project));
     if repo_nuget_config.exists() {
-        let output = Command::new("dotnet")
-            .args(["restore", "--configfile", repo_nuget_config.to_str().unwrap()])
+        let mut command = Command::new("dotnet");
+        command.arg("restore");
+        if let Some(source_project_path) = &source_project_path {
+            command.arg(source_project_path);
+        }
+        let output = command
+            .arg("--configfile")
+            .arg(&repo_nuget_config)
             .current_dir(source_dir)
             .output()
             .context("Failed to run dotnet restore")?;
@@ -152,8 +170,13 @@ fn override_nuget_package(project_dir: &Path, package: &str, source_dir: &Path,
             );
         }
 
-        let output = Command::new("dotnet")
-            .args(["pack", "-c", "Release", "--no-restore"])
+        let mut command = Command::new("dotnet");
+        command.arg("pack");
+        if let Some(source_project_path) = &source_project_path {
+            command.arg(source_project_path);
+        }
+        let output = command
+            .args(["-c", "Release", "--no-restore"])
             .current_dir(source_dir)
             .output()
             .context("Failed to run dotnet pack")?;
@@ -165,8 +188,13 @@ fn override_nuget_package(project_dir: &Path, package: &str, source_dir: &Path,
             );
         }
     } else {
-        let output = Command::new("dotnet")
-            .args(["pack", "-c", "Release"])
+        let mut command = Command::new("dotnet");
+        command.arg("pack");
+        if let Some(source_project_path) = &source_project_path {
+            command.arg(source_project_path);
+        }
+        let output = command
+            .args(["-c", "Release"])
             .current_dir(source_dir)
             .output()
             .context("Failed to run dotnet pack")?;
@@ -637,10 +665,11 @@ log = "0.4"
                     &workspace.join("crates/bindings-csharp/BSATN.Runtime"),
                     "bin/Release",
                 )?;
-                override_nuget_package(
+                override_nuget_package_from_project(
                     client_path,
                     "SpacetimeDB.ClientSDK",
                     &workspace.join("sdks/csharp"),
+                    Some("SpacetimeDB.ClientSDK.csproj"),
                     "bin~/Release",
                 )?;
 

demo/Blackholio/client-godot/.editorconfig

@@ -0,0 +1,4 @@
+root = true
+
+[*]
+charset = utf-8

demo/Blackholio/client-godot/.gitattributes

@@ -0,0 +1,2 @@
+# Normalize EOL for all files that Git considers text files.
+* text=auto eol=lf

demo/Blackholio/client-godot/.gitignore

@@ -0,0 +1,3 @@
+# Godot 4+ specific ignores
+.godot/
+/android/

demo/Blackholio/client-godot/CameraController.cs

@@ -0,0 +1,49 @@
+using Godot;
+
+public partial class CameraController : Camera2D
+{
+    [Export]
+    public float BaseVisibleRadius { get; set; } = 50.0f;
+
+    [Export]
+    public float FollowLerpSpeed { get; set; } = 8.0f;
+
+    [Export]
+    public float ZoomLerpSpeed { get; set; } = 2.0f;
+	
+    private float WorldSize { get; }
+
+    public CameraController(float worldSize)
+    {
+        WorldSize = worldSize;
+    }
+
+    public override void _Process(double delta)
+    {
+        Vector2 targetPosition;
+        if (GameManager.IsConnected() && PlayerController.Local != null && PlayerController.Local.TryGetCenterOfMass(out var centerOfMass))
+        {
+            targetPosition = centerOfMass;
+        }
+        else
+        {
+            var hWorldSize = WorldSize * 0.5f;
+            targetPosition = new Vector2(hWorldSize, hWorldSize);
+        }
+
+        GlobalPosition = GlobalPosition.Lerp(targetPosition, (float)delta * FollowLerpSpeed);
+
+        if (PlayerController.Local == null)
+        {
+            return;
+        }
+
+        var targetCameraSize = CalculateCameraSize(PlayerController.Local);
+        var desiredZoom = Vector2.One * (BaseVisibleRadius / Mathf.Max(targetCameraSize, 1.0f));
+        Zoom = Zoom.Lerp(desiredZoom, (float)delta * ZoomLerpSpeed);
+    }
+
+    private static float CalculateCameraSize(PlayerController player) => 10.0f
+                                                                         + Mathf.Min(10.0f, player.TotalMass() / 5.0f)
+                                                                         + Mathf.Min(player.NumberOfOwnedCircles - 1, 1) * 30.0f;
+}

demo/Blackholio/client-godot/CameraController.cs.uid

@@ -0,0 +1 @@
+uid://c5uuweuf2vu0e

demo/Blackholio/client-godot/Circle2D.cs

@@ -0,0 +1,34 @@
+using Godot;
+
+public partial class Circle2D : Node2D
+{
+	private float _radius = 10.0f;
+	[Export]
+	public float Radius
+	{
+		get => _radius;
+		set
+		{
+			if (Mathf.IsEqualApprox(_radius, value)) return;
+
+			_radius = value;
+			QueueRedraw();
+		}
+	}
+
+	private Color _color = Colors.Brown;
+	[Export]
+	public Color Color
+	{
+		get => _color;
+		set
+		{
+			if (_color == value) return;
+
+			_color = value;
+			QueueRedraw();
+		}
+	}
+	
+	public override void _Draw() => DrawCircle(Vector2.Zero, Radius, Color);
+}

demo/Blackholio/client-godot/Circle2D.cs.uid

@@ -0,0 +1 @@
+uid://7lmrsq2i7mi1

demo/Blackholio/client-godot/CircleController.cs

@@ -0,0 +1,115 @@
+using Godot;
+using SpacetimeDB.Types;
+
+public partial class CircleController : EntityController
+{
+	private static readonly Color[] ColorPalette =
+	[
+		//Yellow
+		new(175 / 255.0f, 159 / 255.0f, 49 / 255.0f),
+		new(175 / 255.0f, 116 / 255.0f, 49 / 255.0f),
+		//Purple
+		new(112 / 255.0f, 47 / 255.0f, 252 / 255.0f),
+		new(51 / 255.0f, 91 / 255.0f, 252 / 255.0f),
+		//Red
+		new(176 / 255.0f, 54 / 255.0f, 54 / 255.0f),
+		new(176 / 255.0f, 109 / 255.0f, 54 / 255.0f),
+		new(141 / 255.0f, 43 / 255.0f, 99 / 255.0f),
+		//Blue
+		new(2 / 255.0f, 188 / 255.0f, 250 / 255.0f),
+		new(7 / 255.0f, 50 / 255.0f, 251 / 255.0f),
+		new(2 / 255.0f, 28 / 255.0f, 146 / 255.0f)
+	];
+
+	private static CanvasLayer _labelLayer;
+	private static CanvasLayer LabelLayer
+	{
+		get
+		{
+			if (_labelLayer == null)
+			{
+
+				if (Engine.GetMainLoop() is not SceneTree sceneTree) return null;
+				var root = sceneTree.Root;
+				if (root == null) return null;
+				_labelLayer = new CanvasLayer { Name = "CircleLabelLayer" };
+				root.AddChild(_labelLayer);
+			}
+			return _labelLayer;
+		}
+	}
+	private static Control _labelRoot;
+	private static Control LabelRoot
+	{
+		get
+		{
+			if (_labelRoot == null)
+			{
+				_labelRoot = new Control
+				{
+					Name = "CircleLabelRoot",
+					MouseFilter = Control.MouseFilterEnum.Ignore
+				};
+				_labelRoot.SetAnchorsPreset(Control.LayoutPreset.FullRect);
+
+				LabelLayer.AddChild(_labelRoot);
+			}
+			return _labelRoot;
+		}
+	}
+
+	private Label _label;
+	private Label Label
+	{
+		get
+		{
+			if (_label == null)
+			{
+				_label = new Label
+				{
+					Name = $"{Name}_Label",
+					TopLevel = false,
+					MouseFilter = Control.MouseFilterEnum.Ignore
+				};
+				LabelRoot.AddChild(_label);
+			}
+			return _label;
+		}
+	}
+
+	private PlayerController OwnerPlayer { get; set; }
+	
+	public CircleController(Circle circle, PlayerController ownerPlayer) : base(circle.EntityId, ColorPalette[circle.PlayerId % ColorPalette.Length])
+	{
+		OwnerPlayer = ownerPlayer;
+		Label.Text = ownerPlayer.Username;
+		
+		ownerPlayer.OnCircleSpawned(this);
+	}
+
+	public override void _Process(double delta)
+	{
+		base._Process(delta);
+		UpdateScreenLabelPosition();
+	}
+
+	public override void OnDelete()
+	{
+		base.OnDelete();
+
+		if (IsInstanceValid(Label))
+		{
+			Label.QueueFree();
+		}
+
+		OwnerPlayer?.OnCircleDeleted(this);
+	}
+
+	private void UpdateScreenLabelPosition()
+	{
+		Label.Size = Label.GetCombinedMinimumSize();
+		var screenPosition = GetGlobalTransformWithCanvas().Origin;
+		var offset = new Vector2(0.0f, Radius + 8.0f);
+		Label.Position = screenPosition + offset - (Label.Size / 2.0f);
+	}
+}