Revert "Start moving world objects to C# and call them Actors"

This reverts commit 35f73bb.

# Conflicts:
#	Source/Mocha.Hotload/Main.cs

Author: xezno

Samples/mocha-minimal/code/BaseController.cs

@@ -1,19 +1,31 @@
 global using Mocha;
 global using Mocha.Common;
-using Mocha.Glue;
 
 namespace Minimal;
 
 public class Game : BaseGame
 {
+	[HotloadSkip] private UIManager Hud { get; set; }
+
+	public string NetworkedString { get; set; }
+
 	public override void OnStartup()
 	{
 		// Spawn a model to walk around in
-		var map = new StaticMeshActor( "models/dev/dev_map.mmdl" );
-		// map.SetMeshPhysics( "models/dev/dev_map.mmdl" );
+		var map = new ModelEntity( "models/dev/dev_map.mmdl" );
+		map.SetMeshPhysics( "models/dev/dev_map.mmdl" );
 
 		// Spawn a player
 		var player = new Player();
 		player.Position = new Vector3( 0, 5, 10 );
+
+		Hud = new UIManager();
+		Hud.SetTemplate( "ui/Game.html" );
+	}
+
+	[Event.Tick]
+	public void Tick()
+	{
+		DebugOverlay.ScreenText( $"Tick... ({GetType().Assembly.GetHashCode()})" );
 	}
 }

Samples/mocha-minimal/code/Game.cs

@@ -2,7 +2,7 @@
 
 public class Player : Mocha.Player
 {
-	public BaseController WalkController { get; private set; }
+	public WalkController WalkController { get; private set; }
 
 	public float Health { get; set; }
 
@@ -12,7 +12,7 @@ protected override void Spawn()
 		base.Spawn();
 
 		PlayerBounds = new( 0.5f, 0.5f, 1.8f ); // Metres
-		// SetCubePhysics( PlayerBounds, false );
+		SetCubePhysics( PlayerBounds, false );
 	}
 
 	private void UpdateEyeTransform()
@@ -25,32 +25,18 @@ public override void Respawn()
 	{
 		base.Respawn();
 
-		WalkController = new NoClipController( this );
-		// Velocity = Vector3.Zero;
+		WalkController = new( this );
+		Velocity = Vector3.Zero;
 		Position = new Vector3( 0.0f, 4.0f, 5.0f );
 	}
 
-	[Event.Tick]
 	public void PredictedUpdate()
 	{
 		UpdateEyeTransform();
-		WalkController.PredictedUpdate();
 	}
 
-	bool wasCrouch = false;
-
 	public override void FrameUpdate()
 	{
-		if ( Input.Crouch && !wasCrouch )
-		{
-			if ( WalkController is WalkController )
-				WalkController = new NoClipController( this );
-			else
-				WalkController = new WalkController( this );
-		}
-
-		wasCrouch = Input.Crouch;
-
 		UpdateCamera();
 		UpdateEyeTransform();
 

Samples/mocha-minimal/code/Player.cs

@@ -7,7 +7,7 @@ namespace Minimal;
  * once it's done
  */
 
-public class WalkController : BaseController
+public class WalkController
 {
 	public float Friction => 12.0f;
 	public float GroundAccelerate => 50.0f;
@@ -19,7 +19,7 @@ public class WalkController : BaseController
 	public float MaxAngle => 60.0f;
 
 	private bool IsGrounded => GroundEntity != null;
-	private Actor GroundEntity;
+	private BaseEntity GroundEntity;
 
 	private Player Player { get; set; }
 
@@ -28,12 +28,15 @@ public class WalkController : BaseController
 	public WalkController( Player player )
 	{
 		Player = player;
-		// Player.IgnoreRigidbodyRotation = true;
+		Player.IgnoreRigidbodyRotation = true;
 
 		Event.Register( this );
+
+		Player.Position = new Vector3( 0, 5, 10 );
 	}
 
-	public override void PredictedUpdate()
+	[Event.Tick]
+	public void PredictedUpdate()
 	{
 		DebugOverlay.ScreenText( $"--------------------------------------------------------------------------------" );
 		DebugOverlay.ScreenText( $"{(Core.IsClient ? "Client" : "Server")}" );
@@ -66,17 +69,12 @@ public override void PredictedUpdate()
 			Velocity.Z -= 9.8f * Time.Delta;
 		}
 
-//		Player.Velocity = Velocity * 10f;
+		Player.Velocity = Velocity * 10f;
 		Move();
 
 		DebugOverlay.ScreenText( $"--------------------------------------------------------------------------------" );
 	}
 
-	~WalkController()
-	{
-		Event.Unregister( this );
-	}
-
 	private Vector3 GetWishDir()
 	{
 		var eulerRotation = Input.Rotation.ToEulerAngles();
@@ -118,7 +116,7 @@ private Vector3 MoveAir( Vector3 accelDir, Vector3 prevVelocity )
 
 	public Mocha.TraceResult TraceBBox( Vector3 start, Vector3 end )
 	{
-		return Cast.Ray( start, end ).WithHalfExtents( Player.PlayerBounds ).Run();//.Ignore( Player ).Run();
+		return Cast.Ray( start, end ).WithHalfExtents( Player.PlayerBounds ).Ignore( Player ).Run();
 	}
 
 	private void CheckGrounded()
@@ -128,9 +126,9 @@ private void CheckGrounded()
 		// Grounded only counts if the normal is facing upwards
 		var angle = Vector3.GetAngle( tr.Normal, Vector3.Up );
 
-		//if ( tr.Hit && angle < MaxAngle )
-		//	GroundEntity = tr.Entity;
-		//else
+		if ( tr.Hit && angle < MaxAngle )
+			GroundEntity = tr.Entity;
+		else
 			GroundEntity = null;
 	}
 

Samples/mocha-minimal/code/WalkController.cs

@@ -2,7 +2,7 @@
 
 namespace Mocha.Common;
 
-public sealed class EntityRegistry : IEnumerable<IActor>
+public sealed class EntityRegistry : IEnumerable<IEntity>
 {
 	private static EntityRegistry? s_instance;
 	public static EntityRegistry Instance
@@ -14,9 +14,9 @@ public static EntityRegistry Instance
 		}
 	}
 
-	private readonly List<IActor> _entities = new();
+	private readonly List<IEntity> _entities = new();
 
-	public void RegisterEntity( IActor entity )
+	public void RegisterEntity( IEntity entity )
 	{
 		// Don't add duplicates
 		if ( _entities.Contains( entity ) )
@@ -25,15 +25,15 @@ public void RegisterEntity( IActor entity )
 		_entities.Add( entity );
 	}
 
-	public void UnregisterEntity( IActor entity )
+	public void UnregisterEntity( IEntity entity )
 	{
 		_entities.Remove( entity );
 	}
 
-	public IEnumerator<IActor> GetEnumerator() => _entities.GetEnumerator();
+	public IEnumerator<IEntity> GetEnumerator() => _entities.GetEnumerator();
 	IEnumerator IEnumerable.GetEnumerator() => _entities.GetEnumerator();
 
-	public IActor this[int index]
+	public IEntity this[int index]
 	{
 		get => _entities.ElementAt( index );
 		set => _entities[index] = value;

Source/Mocha.Common/Entities/EntityRegistry.cs

@@ -0,0 +1,16 @@
+namespace Mocha.Common;
+
+public interface IEntity
+{
+	string Name { get; set; }
+	uint NativeHandle { get; }
+
+	Vector3 Position { get; set; }
+	Rotation Rotation { get; set; }
+	Vector3 Scale { get; set; }
+
+	void Delete();
+	void Delete( bool immediate );
+	bool IsValid();
+	void Update();
+}

Source/Mocha.Common/Entities/IActor.cs

@@ -19,47 +19,4 @@ public Transform( Transform other )
 		Rotation = other.Rotation;
 		Scale = other.Scale;
 	}
-
-	public Transform WithPosition( Vector3 position )
-	{
-		var tx = new Transform
-		{
-			Position = position,
-			Rotation = Rotation,
-			Scale = Scale
-		};
-
-		return tx;
-	}
-
-	public Transform WithRotation( Rotation rotation )
-	{
-		var tx = new Transform
-		{
-			Position = Position,
-			Rotation = rotation,
-			Scale = Scale
-		};
-
-		return tx;
-	}
-
-	public Transform WithScale( Vector3 scale )
-	{
-		var tx = new Transform
-		{
-			Position = Position,
-			Rotation = Rotation,
-			Scale = scale
-		};
-
-		return tx;
-	}
-
-	public static Transform Default => new Transform()
-	{
-		Position = Vector3.Zero,
-		Rotation = Rotation.Identity,
-		Scale = Vector3.One
-	};
 }

Source/Mocha.Common/Entities/IEntity.cs

@@ -97,10 +97,10 @@ private void DrawEntityList()
 	{
 		if ( ImGui.BeginTabItem( $"{FontAwesome.Ghost}" ) )
 		{
-			foreach ( var actor in Actor.All )
+			foreach ( var entity in BaseEntity.All )
 			{
-				if ( ImGui.Selectable( actor.Name ) )
-					InspectorWindow.SetSelectedObject( actor );
+				if ( ImGui.Selectable( entity.Name ) )
+					InspectorWindow.SetSelectedObject( entity );
 			}
 
 			ImGui.EndTabItem();
@@ -134,6 +134,8 @@ void ShowNode( LayoutNode node )
 				}
 			}
 
+			ShowNode( UIManager.Instance.RootPanel );
+
 			ImGui.EndTabItem();
 		}
 	}

Source/Mocha.Common/Types/Transform.cs

@@ -21,7 +21,7 @@ public BaseGame()
 
 	private void TryCallMethodOnEntity( string methodName )
 	{
-		Actor.All.ToList().ForEach( entity =>
+		BaseEntity.All.ToList().ForEach( entity =>
 		{
 			var method = entity.GetType().GetMethod( methodName )!;
 			var methodHash = HashCode.Combine( method, entity );
@@ -50,6 +50,8 @@ private void TryCallMethodOnEntity( string methodName )
 
 	public void FrameUpdate()
 	{
+		UIManager.Instance.Render();
+
 		TryCallMethodOnEntity( "FrameUpdate" );
 	}