Move some stuff aruond for my own sanity.

master
Zed A. Shaw 2 weeks ago
parent 13e072853f
commit cd234e695d
  1. 5
      TODO.md
  2. 2
      meson.build
  3. 4
      src/document.cpp
  4. 2
      src/engine.cpp
  5. 0
      src/engine.hpp
  6. 14
      src/main.cpp

@ -1,2 +1,5 @@
* Make the Deck::analyze do a more thorough analysis/check.
* Get the code online. * Get the code online.
* Make the Deck::analyze do a more thorough analysis/check.
* Character mapping for the fonts
* Checks for errors in analyzer
* Resource prep: images, fonts, font glyphs

@ -39,7 +39,7 @@ sources = [
'src/document.cpp', 'src/document.cpp',
'src/framebuffer.cpp', 'src/framebuffer.cpp',
'src/screen.cpp', 'src/screen.cpp',
'src/render.cpp', 'src/engine.cpp',
'src/image.cpp', 'src/image.cpp',
] ]

@ -2,10 +2,6 @@
#include <fmt/core.h> #include <fmt/core.h>
void Deck::analyze() { void Deck::analyze() {
// Needed work:
// * Character mapping for the fonts
// * Checks for errors
// * Resource prep: images, fonts, font glyphs
for(auto& slide : slides) { for(auto& slide : slides) {
for(auto& node : slide.content) { for(auto& node : slide.content) {
switch(node.type) { switch(node.type) {

@ -1,4 +1,4 @@
#include "render.hpp" #include "engine.hpp"
#include "config.hpp" #include "config.hpp"
#include <algorithm> #include <algorithm>
#include "dbc.hpp" #include "dbc.hpp"

@ -1,20 +1,20 @@
#define _USE_MATH_DEFINES #define _USE_MATH_DEFINES
#include <fmt/core.h> #include <fmt/core.h>
#include "config.hpp" #include "config.hpp"
#include "render.hpp" #include "engine.hpp"
#include "bezos.hpp" #include "bezos.hpp"
int main() { int main() {
Deck deck = Bezos::load("lua/builder_test.lua"); Deck deck = Bezos::load("lua/builder_test.lua");
Engine state{.deck=deck}; Engine engine{.deck=deck};
state.init(); engine.init();
while(state.active()) { while(engine.active()) {
state.update(); engine.update();
state.render(); engine.render();
} }
state.quit(); engine.quit();
return 0; return 0;
} }

Loading…
Cancel
Save