aboutsummaryrefslogtreecommitdiffstats
path: root/src/world.cpp
diff options
context:
space:
mode:
authorAndy Belle-Isle <drumsetmonkey@gmail.com>2019-09-18 14:40:23 -0400
committerAndy Belle-Isle <drumsetmonkey@gmail.com>2019-09-18 14:40:23 -0400
commit0869328b12ff9b77000915f37443dcf2468d881e (patch)
tree1e9e4d5ca43661a4aca8f5052f1ba67d23b9d955 /src/world.cpp
parent0e7f7791fd592f0240a30168a9a570c57b0f5880 (diff)
parent8b834d0440f85a452694fb5cbb2cd9f4dae07aa2 (diff)
Added UI rendering support to render loop, although fonts don't render yet
Diffstat (limited to 'src/world.cpp')
-rw-r--r--src/world.cpp7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/world.cpp b/src/world.cpp
index 93cf511..fb7870d 100644
--- a/src/world.cpp
+++ b/src/world.cpp
@@ -230,15 +230,14 @@ void WorldSystem::update([[maybe_unused]]entityx::EntityManager& entities,
if (currentWorld == nullptr) {
currentWorld = &(worlds.front());
events.emit<WorldChangeEvent>(currentWorld);
- std::cout << "Emitted" << std::endl;
}
if (currentWorld->meshUpdated) {
- events.emit<NewRenderEvent>(
+ events.emit<WorldMeshUpdateEvent>(
currentWorld->worldVBO,
+ currentWorld->mesh.size(),
currentWorld->getTexture(),
- currentWorld->getNormal(),
- currentWorld->mesh.size()
+ currentWorld->getNormal()
);
}
}