summaryrefslogtreecommitdiff
path: root/c2.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'c2.cpp')
-rw-r--r--c2.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/c2.cpp b/c2.cpp
index d686765..28e63b5 100644
--- a/c2.cpp
+++ b/c2.cpp
@@ -638,8 +638,10 @@ struct C2 : public App {
per_frame_memory_size
);
clamped_linear = create_clamped_linear(dev);
+ world = (World*)arena_alloc(arena, sizeof *world);
+ world->init(arena);
ui = UI::create(dev, this, &ui_arena, ui_shader->id);
- init_editor(ui);
+ init_editor(ui, world);
lr.init(dev, &assets);
assert(per_frame != 0);
vbo = upload_verts(dev);
@@ -649,8 +651,6 @@ struct C2 : public App {
sky.init(dev, &assets);
eprobe.init(dev, &assets, 256);
camera.init();
- world = (World*)arena_alloc(arena, sizeof *world);
- world->init(arena);
{
monkey = world->create_entity();
auto [_, mod] = world->add<Transform, C_Model>(monkey);
@@ -804,7 +804,7 @@ struct C2 : public App {
mx,
my
);
- editor_on_select(*world, a, b);
+ editor_on_select(a, b);
}
lr.colour(v3f(1.0f, 0.0f, 0.0f));