Add world editor with unified entity pipeline by bryfur · Pull Request #39 · bryfur/mmo

bryfur · 2026-02-02T00:05:52Z

Summary

Add a full world editor (mmo_editor) with ImGui UI, terrain brush, entity select/placement tools, and procedural generation bake (town, environment, monsters)
Unify the editor → game pipeline: server now loads entities and terrain from data/editor_save/ instead of running hardcoded procedural generation
Add reverse-lookup functions in entity_config.hpp so the server can reconstruct ECS components from saved model names
Remove unused environment.json and its GameConfig loading code

Test plan

cmake --build build compiles all three targets (client, server, editor)
Editor: launch mmo_editor, place generation center, Generate All, Ctrl+S saves
Server: starts and loads data/editor_save/world_entities.json + heightmap.bin
Client: connects and sees buildings/trees/rocks/monsters at editor-placed positions
Editor: sculpt terrain → save → restart server → terrain matches
Editor: move entity → save → restart server → entity at new position

🤖 Generated with Claude Code

Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>

Copilot

Pull request overview

This PR introduces an editor application for visually editing the MMO world, allowing developers to view and potentially manipulate game entities loaded from configuration files.

Changes:

Added new editor application with free-flying camera controls (WASD + mouse look)
Implemented entity loading and rendering for buildings and town NPCs from game configuration
Integrated editor into build system with dependency on nlohmann/json library

Reviewed changes

Copilot reviewed 7 out of 7 changed files in this pull request and generated 10 comments.

Show a summary per file

File	Description
src/editor/main.cpp	Entry point for the editor application with basic initialization and error handling
src/editor/editor_camera.hpp	Header defining free-flying editor camera with WASD movement and mouse look controls
src/editor/editor_camera.cpp	Implementation of camera movement, rotation, and view/projection matrix generation
src/editor/editor_application.hpp	Header for editor application class extending engine::Application
src/editor/editor_application.cpp	Main editor implementation including entity loading, rendering, and input handling
src/editor/CMakeLists.txt	Build configuration for editor executable
CMakeLists.txt	Added nlohmann/json dependency and editor subdirectory to root build

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Copilot · 2026-02-02T00:13:22Z

+#include "protocol/protocol.hpp"
+#include "protocol/heightmap.hpp"
+#include "server/heightmap_generator.hpp"
+#include "engine/model_loader.hpp"


The include "engine/model_loader.hpp" is not used in this file and can be removed.

Copilot · 2026-02-02T00:13:22Z

+    registry_.emplace<Transform>(entity, world_x, world_y, world_z,
+                                 glm::radians(config.rotation));


The Transform struct is an aggregate type without a constructor. While C++20 allows aggregate initialization with parentheses, this pattern is inconsistent with how Transform is constructed elsewhere in the codebase (e.g., src/client/game.cpp:684 uses default construction). Consider following the established pattern: create with default constructor, then assign fields, or use brace initialization.

Copilot · 2026-02-02T00:13:22Z

+    registry_.emplace<EntityInfo>(entity, info);
+
+    // Name
+    registry_.emplace<Name>(entity, config.name);


The Name struct is an aggregate type without a constructor. While C++20 allows aggregate initialization with parentheses, this pattern is inconsistent with how Name is constructed elsewhere in the codebase (e.g., src/client/game.cpp:688 uses default construction then assigns the value field). Consider following the established pattern for consistency.

Copilot · 2026-02-02T00:13:23Z

+    registry_.emplace<EntityInfo>(entity, info);
+
+    // Name
+    registry_.emplace<Name>(entity, config.name);


The Name struct is an aggregate type without a constructor. While C++20 allows aggregate initialization with parentheses, this pattern is inconsistent with how Name is constructed elsewhere in the codebase (e.g., src/client/game.cpp:688 uses default construction then assigns the value field). Consider following the established pattern for consistency.

Copilot · 2026-02-02T00:13:23Z

+#include "editor_application.hpp"
+#include <iostream>
+
+int main(int argc, char* argv[]) {


The parameters argc and argv are unused. Consider adding (void)argc; (void)argv; to suppress compiler warnings, or remove the parameter names if they're not needed (e.g., int main(int, char*[])).

Suggested change

int main(int argc, char* argv[]) {

int main(int, char*[]) {

Copilot · 2026-02-02T00:13:23Z

+    float world_z = config.y + config_.world().height / 2.0f;
+    float world_y = get_terrain_height(world_x, world_z);
+
+    registry_.emplace<Transform>(entity, world_x, world_y, world_z, 0.0f);


The Transform struct is an aggregate type without a constructor. While C++20 allows aggregate initialization with parentheses, this pattern is inconsistent with how Transform is constructed elsewhere in the codebase (e.g., src/client/game.cpp:684 uses default construction). Consider following the established pattern: create with default constructor, then assign fields, or use brace initialization.

Copilot · 2026-02-02T00:13:23Z

+
+    // Mouse look using relative mouse mode
+    float mouse_dx = 0.0f, mouse_dy = 0.0f;
+    SDL_GetRelativeMouseState(&mouse_dx, &mouse_dy);


SDL_GetRelativeMouseState is called but SDL relative mouse mode is never enabled. You should call SDL_SetRelativeMouseMode(true) during initialization (e.g., in on_init) to enable mouse capture for camera control. Without this, mouse look will not work correctly.

Copilot · 2026-02-02T00:13:24Z

+target_link_libraries(mmo_editor PRIVATE
+    mmo_engine
+    mmo_protocol
+    mmo_server_lib


The target 'mmo_server_lib' does not exist. The server CMakeLists.txt (src/server/CMakeLists.txt) only creates an executable 'mmo_server', not a library. Either create a separate library target from the server code (excluding main.cpp), or remove this dependency. The editor needs access to server code like GameConfig and heightmap_generator, so a library target is the correct solution.

Suggested change

mmo_server_lib

Copilot · 2026-02-02T00:13:24Z

+# nlohmann/json (JSON parsing library)
+FetchContent_Declare(
+    json
+    GIT_REPOSITORY https://github.com/nlohmann/json.git
+    GIT_TAG v3.11.3
+)
+FetchContent_MakeAvailable(json)
+


This dependency declaration duplicates the one in src/server/CMakeLists.txt (lines 25-30). If mmo_server_lib is created as a library target, the nlohmann_json dependency should be transitively available and this duplication would be unnecessary. If the editor needs to use nlohmann_json directly (not through server code), this duplication could be avoided by declaring nlohmann_json once at the root level and having both server and editor link to it.

Suggested change

# nlohmann/json (JSON parsing library)

FetchContent_Declare(

json

GIT_REPOSITORY https://github.com/nlohmann/json.git

GIT_TAG v3.11.3

)

FetchContent_MakeAvailable(json)

Copilot · 2026-02-02T00:13:24Z

+    json
+    GIT_REPOSITORY https://github.com/nlohmann/json.git
+    GIT_TAG v3.11.3


The FetchContent_Declare for nlohmann/json pulls source code directly from a third-party Git repository and pins it only to a Git tag (GIT_TAG v3.11.3), which is a mutable reference and can be retargeted, enabling a supply-chain compromise if the upstream repo or tag is hijacked. An attacker who controls that tag could inject malicious code into your build and gain the same privileges as the built binaries. To reduce this risk, pin the dependency to an immutable identifier (such as a specific commit SHA or verified archive hash) or vendor the library internally so that build inputs cannot be silently replaced upstream.

Editor is now the single source of truth for world data. The server loads entities and terrain from editor save files instead of running its own procedural generation. - Add editor tools: select, terrain brush, object placement with ImGui UI, raycasting, and world save/load (JSON + binary heightmap) - Add procedural generation bake to editor (town, environment, monsters) with click-to-place center, tunable parameters, and undo support - Add reverse-lookup functions in entity_config.hpp (model → enum) - Server spawn_from_world_data() reads editor save, replaces hardcoded spawn_town/spawn_environment/spawn_npcs - Server loads editor heightmap.bin, no procedural fallback - Engine: add ImGui integration, editor CMake target, input handler improvements, scene renderer line/circle drawing Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

environment.json was loaded by GameConfig but never consumed — the editor and server both use entity_config.hpp enums directly. Removed the file, load_environment(), get_env_type(), EnvironmentTypeConfig, and related members. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

ImGui is only used by the editor, not engine/client/server. Also fix inverted horizontal camera rotation in editor. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

find_package imported targets are directory-scoped, so SDL3::SDL3 created in src/engine/ is not visible in src/editor/. When using system SDL (CI), call find_package again in the editor directory. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

bryfur and others added 2 commits February 1, 2026 14:38

Add editor application with camera controls and scene rendering

cabd45b

Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>

Add editor to CMake build

a4e80c1

Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>

Copilot AI review requested due to automatic review settings February 2, 2026 00:05

Copilot started reviewing on behalf of bryfur February 2, 2026 00:06 View session

Copilot AI reviewed Feb 2, 2026

View reviewed changes

bryfur and others added 4 commits February 1, 2026 19:19

Merge branch 'main' into editor-application

07d5dc6

Merge branch 'main' into editor-application

9510c5b

bryfur changed the title ~~Editor application~~ Add world editor with unified entity pipeline Feb 7, 2026

bryfur and others added 3 commits February 7, 2026 18:30

Move ImGui dependency from engine to editor and fix camera yaw

885ae6b

ImGui is only used by the editor, not engine/client/server. Also fix inverted horizontal camera rotation in editor. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

Update CMakeLists.txt to cache VENDORED_SDL option with description

ccbaa06

bryfur merged commit 3f66212 into main Feb 8, 2026
1 of 2 checks passed

Navigation Menu

Add world editor with unified entity pipeline - #39

Add world editor with unified entity pipeline#39
bryfur merged 9 commits into
mainfrom
editor-application

bryfur commented Feb 2, 2026 •

edited

Loading

Uh oh!

Copilot AI left a comment

Uh oh!

Copilot AI Feb 2, 2026

Uh oh!

Copilot AI Feb 2, 2026

Uh oh!

Copilot AI Feb 2, 2026

Uh oh!

Copilot AI Feb 2, 2026

Uh oh!

Copilot AI Feb 2, 2026

Uh oh!

Copilot AI Feb 2, 2026

Uh oh!

Copilot AI Feb 2, 2026

Uh oh!

Copilot AI Feb 2, 2026

Uh oh!

Copilot AI Feb 2, 2026

Uh oh!

Copilot AI Feb 2, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

		registry_.emplace<Transform>(entity, world_x, world_y, world_z,
		glm::radians(config.rotation));

Conversation

bryfur commented Feb 2, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Summary

Test plan

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Copilot AI Feb 2, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Feb 2, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Feb 2, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Feb 2, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Feb 2, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Feb 2, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Feb 2, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Feb 2, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Feb 2, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Feb 2, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

bryfur commented Feb 2, 2026 •

edited

Loading