Add an in-game editor

Content/Shaders/EditorEdge.glsl

@@ -0,0 +1,57 @@
+VERTEX:
+#version 330
+
+layout(location=0) in vec2 a_pos;
+layout(location=1) in vec2 a_tex;
+
+
+out vec2 v_tex;
+
+void main(void)
+{
+    gl_Position = vec4(a_pos, 0, 1);
+    v_tex = a_tex;
+
+}
+
+FRAGMENT:
+#version 330
+#include Partials/Methods.gl
+
+uniform sampler2D u_objectID;
+uniform float     u_selectedID;
+
+uniform vec2 u_pixel;
+uniform vec4 u_edge;
+
+in vec2 v_tex;
+out vec4 o_color;
+
+float objectID(vec2 uv)
+{
+    const float Eps = 0.0001;
+	return texture(u_objectID, clamp(uv, vec2(Eps), vec2(1.0 - Eps))).r;
+}
+
+void main(void)
+{
+    float a = objectID(v_tex + vec2(u_pixel.x, 0));
+    float b = objectID(v_tex + vec2(-u_pixel.x, 0));
+    float c = objectID(v_tex + vec2(0, u_pixel.y));
+    float d = objectID(v_tex + vec2(0, -u_pixel.y));
+
+    float it = objectID(v_tex);
+    float other =
+        a * 0.25 +
+        b * 0.25 +
+        c * 0.25 +
+        d * 0.25;
+
+    float edge = step(0.0001, other - it);
+
+    if (u_selectedID == 0 || edge == 0 || !(a == u_selectedID || b == u_selectedID || c == u_selectedID || d == u_selectedID || it == u_selectedID))
+        discard;
+
+    o_color = vec4(vec3(u_edge), 1);
+}
+

Content/Shaders/EditorWorld.glsl

@@ -0,0 +1,70 @@
+VERTEX:
+#version 330
+#include Partials/Methods.gl
+
+uniform mat4 u_mvp;
+uniform mat4 u_model;
+uniform mat4 u_view;
+
+layout(location=0) in vec3 a_position;
+layout(location=1) in vec2 a_tex;
+layout(location=2) in vec3 a_color;
+layout(location=3) in vec3 a_normal;
+
+out vec2 v_tex;
+out vec3 v_color;
+out vec3 v_normal;
+out vec3 v_world;
+
+void main(void)
+{
+    gl_Position = u_mvp * vec4(a_position, 1.0);
+
+    v_tex = a_tex;
+    v_color = a_color;
+    v_normal = TransformNormal(a_normal, u_view * u_model);
+    v_world = vec3(u_model * vec4(a_position, 1.0));
+}
+
+FRAGMENT:
+#version 330
+#include Partials/Methods.gl
+
+uniform sampler2D u_texture;
+uniform vec4      u_color;
+uniform float     u_near;
+uniform float     u_far;
+uniform vec3      u_sun;
+//uniform float     u_cutout;
+uniform float u_objectID;
+
+in vec2 v_tex;
+in vec3 v_normal;
+in vec3 v_color;
+in vec3 v_world;
+
+layout(location = 0) out vec4 o_color;
+layout(location = 1) out vec4 o_objectID;
+
+void main(void)
+{
+    // Get texture color
+    vec4 src = texture(u_texture, v_tex) * u_color * vec4(v_color, 1);
+
+    // TODO: only enable if you want ModelFlags.Cutout types to work, didn't end up using
+//    if (src.a < u_cutout)
+//        discard;
+
+    // Apply depth values
+    float depth = LinearizeDepth(gl_FragCoord.z, u_near, u_far);
+    gl_FragDepth = depth;
+
+    // Apply shading based on normal relative to the camera
+    float shade = clamp(dot(v_normal, vec3(0, 0, 1)), 0.2, 1.0);
+    src.rgb *= vec3(shade);
+
+    o_color = vec4(src.rgb, 1);
+    // TODO: Support object IDs above 255, since its just 8bits
+    // NOTE: This is still only a float output, however we need to set alpha to avoid weird blending.
+    o_objectID = vec4(u_objectID / 255.0, 0, 0, 1);
+}

Source/Actors/Actor.cs

@@ -1,3 +1,5 @@
+using Celeste64.Mod.Editor;
+
 namespace Celeste64;
 
 public class Actor
@@ -12,6 +14,18 @@ public class Actor
 	protected BoundingBox worldBounds;
 	protected bool dirty = true;
 
+	public readonly Type? DefinitionType;
+	public readonly ActorDefinition? _Data;
+
+	protected Actor(Type? definitionType = null)
+	{
+		DefinitionType = definitionType;
+		if (DefinitionType != null)
+		{
+			_Data = Activator.CreateInstance(DefinitionType) as ActorDefinition;
+		}
+	}
+
 	/// <summary>
 	/// Optional GroupName, used by Strawberries to check what unlocks them. Can
 	/// be used by other stuff for whatever.

Source/Actors/Attacher.cs

@@ -1,6 +1,6 @@
 namespace Celeste64;
 
-public abstract class Attacher : Actor, IRidePlatforms
+public abstract class Attacher(Type? definitionType = null) : Actor(definitionType), IRidePlatforms
 {
 	public virtual Vec3 AttachNormal => -Vec3.UnitZ;
 	public virtual Vec3 AttachOrigin => Position;

Source/Actors/Solid.cs

@@ -1,7 +1,84 @@
+using Celeste64.Mod;
+using Celeste64.Mod.Editor;
+using ImGuiNET;
+using System.Runtime.InteropServices;
+
 namespace Celeste64;
 
 public class Solid : Actor, IHaveModels
 {
+	public class Definition : GeometryDefinition
+	{
+		protected override Matrix Transform => Matrix.CreateTranslation(Position);
+
+		[SpecialProperty(SpecialPropertyType.PositionXYZ)]
+		public Vec3 Position { get; set; }
+
+		public override Actor[] Load(World.WorldType type)
+		{
+			// Calculate bounds
+			var bounds = new BoundingBox();
+			foreach (var face in Faces)
+			{
+				var faceMin = face.Select(idx => Vertices[idx]).Aggregate(Vec3.Min);
+				var faceMax = face.Select(idx => Vertices[idx]).Aggregate(Vec3.Max);
+				bounds = new BoundingBox(Vec3.Min(bounds.Min, faceMin), Vec3.Max(bounds.Max, faceMax)); 
+			}
+
+			// Generate visual / collision mesh
+			var colliderVertices = new List<Vec3>();
+			var colliderFaces = new List<Face>();
+
+			var meshVertices = new List<Vertex>();
+			var meshIndices = new List<int>();
+
+			foreach (var face in Faces)
+			{
+				int vertexIndex = colliderVertices.Count;
+				var plane = Plane.CreateFromVertices(Vertices[face[0]], Vertices[face[1]], Vertices[face[2]]);
+
+				colliderFaces.Add(new Face
+				{
+					Plane = plane,
+					VertexStart = vertexIndex,
+					VertexCount = face.Count
+				});
+
+				// Triangulate the mesh
+				for (int i = 0; i < face.Count - 2; i++)
+				{
+					meshIndices.Add(vertexIndex + 0);
+					meshIndices.Add(vertexIndex + i + 1);
+					meshIndices.Add(vertexIndex + i + 2);
+				}
+
+				// The center of the bounding box should always be <0, 0, 0>
+				colliderVertices.AddRange(face.Select(idx => Vertices[idx] - bounds.Center));
+				meshVertices.AddRange(face.Select(idx => new Vertex(
+					position: Vertices[idx] - bounds.Center,
+					texcoord: Vec2.Zero,
+					color: Vec3.One,
+					normal: plane.Normal)));
+			}
+
+			var solid = new Solid();
+			solid.Model.Mesh.SetVertices<Vertex>(CollectionsMarshal.AsSpan(meshVertices));
+			solid.Model.Mesh.SetIndices<int>(CollectionsMarshal.AsSpan(meshIndices));
+			solid.Model.Materials.Add(new DefaultMaterial(Assets.Textures["wall"]));
+			solid.Model.Parts.Add(new SimpleModel.Part(0, 0, meshIndices.Count));
+
+			solid.LocalBounds = new BoundingBox(
+            	colliderVertices.Aggregate(Vec3.Min),
+            	colliderVertices.Aggregate(Vec3.Max)
+            );
+			solid.LocalVertices = colliderVertices.ToArray();
+			solid.LocalFaces =  colliderFaces.ToArray();
+			solid.Position = Position + bounds.Center;
+
+			return [solid];
+		}
+	}
+
 	/// <summary>
 	/// If we're currently solid
 	/// </summary>

Source/Actors/SpikeBlock.cs

@@ -1,7 +1,29 @@
-namespace Celeste64;
+using Celeste64.Mod.Editor;
 
-public class SpikeBlock : Attacher, IHaveModels
+namespace Celeste64;
+
+public class SpikeBlock() : Attacher(typeof(Definition)), IHaveModels
 {
+	public class Definition : ActorDefinition
+	{
+		[SpecialProperty(SpecialPropertyType.PositionXYZ)]
+		public Vec3 Position { get; set; } = Vec3.Zero;
+		public Vec3 Rotation { get; set; } = Vec3.Zero;
+		public Vec3 Size { get; set; } = new Vec3(50.0f, 10.0f, 100.0f);
+
+		public override Actor[] Load(World.WorldType type)
+		{
+			return [new SpikeBlock
+			{
+				Position = Position,
+				RotationXYZ = Rotation * Calc.DegToRad,
+				LocalBounds = new BoundingBox(-Size / 2.0f, Size / 2.0f)
+			}];
+		}
+	}
+
+	private Definition Data => (Definition)_Data!;
+
 	public SimpleModel? Model;
 	public Vec3 Direction;
 

Source/Data/Assets.cs

@@ -1,4 +1,5 @@
 using Celeste64.Mod;
+using Celeste64.Mod.Editor;
 using System.Collections.Concurrent;
 using System.Diagnostics;
 using System.Text;
@@ -12,7 +13,8 @@ public static class Assets
 	public const string AssetFolder = "Content";
 
 	public const string MapsFolder = "Maps";
-	public const string MapsExtension = "map";
+	public const string MapsExtensionSledge = "map";
+	public const string MapsExtensionFuji = "bin";
 
 	public const string TexturesFolder = "Textures";
 	public const string TexturesExtension = "png";
@@ -112,7 +114,7 @@ public static void Load()
 		Music.Clear();
 		Audio.Unload();
 
-		Map.ModActorFactories.Clear();
+		SledgeMap.ModActorFactories.Clear();
 		ModLoader.RegisterAllMods();
 
 		var maps = new ConcurrentBag<(Map, GameMod)>();
@@ -126,7 +128,7 @@ public static void Load()
 		// NOTE: Make sure to update ModManager.OnModFileChanged() as well, for hot-reloading to work!
 
 		var globalFs = ModManager.Instance.GlobalFilesystem;
-		foreach (var (file, mod) in globalFs.FindFilesInDirectoryRecursiveWithMod(MapsFolder, MapsExtension))
+		foreach (var (file, mod) in globalFs.FindFilesInDirectoryRecursiveWithMod(MapsFolder, MapsExtensionSledge))
 		{
 			// Skip the "autosave" folder
 			if (file.StartsWith($"{MapsFolder}/autosave", StringComparison.OrdinalIgnoreCase))
@@ -135,7 +137,23 @@ public static void Load()
 			tasks.Add(Task.Run(() =>
 			{
 				if (mod.Filesystem != null && mod.Filesystem.TryOpenFile(file,
-						stream => new Map(GetResourceNameFromVirt(file, MapsFolder), file, stream), out var map))
+						stream => new SledgeMap(GetResourceNameFromVirt(file, MapsFolder), file, stream), out var map))
+				{
+					maps.Add((map, mod));
+				}
+			}));
+		}
+		foreach (var (file, mod) in globalFs.FindFilesInDirectoryRecursiveWithMod(MapsFolder, MapsExtensionFuji))
+		{
+			// Skip the "autosave" folder
+			if (file.StartsWith($"{MapsFolder}/autosave", StringComparison.OrdinalIgnoreCase))
+				continue;
+
+			tasks.Add(Task.Run(() =>
+			{
+				var fullPath = mod.Filesystem is FolderModFilesystem fs ? fs.VirtToRealPath(file) : null;
+				if (mod.Filesystem != null && mod.Filesystem.TryOpenFile(file,
+						stream => new FujiMap(GetResourceNameFromVirt(file, MapsFolder), file, stream, fullPath), out var map))
 				{
 					maps.Add((map, mod));
 				}
@@ -251,8 +269,8 @@ public static void Load()
 				Levels.AddRange(levels);
 			}
 
-			// if (mod.Filesystem != null && mod.Filesystem.TryOpenFile("Dialog.json", 
-			// 	    stream => JsonSerializer.Deserialize(stream, DialogLineDictContext.Default.DictionaryStringListDialogLine) ?? [], 
+			// if (mod.Filesystem != null && mod.Filesystem.TryOpenFile("Dialog.json",
+			// 	    stream => JsonSerializer.Deserialize(stream, DialogLineDictContext.Default.DictionaryStringListDialogLine) ?? [],
 			// 	    out var dialog))
 			// {
 			// 	foreach (var (key, value) in dialog)