From 077f6692116c74cad5d2e6d735262748bf0386c2 Mon Sep 17 00:00:00 2001 From: BlackMATov Date: Fri, 9 Nov 2018 16:43:43 +0700 Subject: [PATCH 1/3] update modules --- modules/enduro2d | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/enduro2d b/modules/enduro2d index 1efe30e..8e269e1 160000 --- a/modules/enduro2d +++ b/modules/enduro2d @@ -1 +1 @@ -Subproject commit 1efe30ec162d8cef3b6b606b260e9b8fb509825c +Subproject commit 8e269e10b67d18c3d3d47dc2cf926235349c4a97 From a949e803284e1549a2ededf1f8ed285fbb65cc99 Mon Sep 17 00:00:00 2001 From: BlackMATov Date: Fri, 9 Nov 2018 16:48:22 +0700 Subject: [PATCH 2/3] fix code after engine update --- sources/main.cpp | 35 ++++++++++++++++++----------------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/sources/main.cpp b/sources/main.cpp index 8621151..8018caf 100644 --- a/sources/main.cpp +++ b/sources/main.cpp @@ -7,27 +7,28 @@ #include using namespace e2d; -int e2d_main() { - { - modules::initialize() - .register_scheme("file"); - modules::initialize() - .register_sink(); - modules::initialize(); - modules::initialize(v2u{640, 480}, "Enduro2D", false) - .register_event_listener(the()); - modules::initialize(the(), the()); - } - { - const keyboard& k = the().keyboard(); - while ( !the().should_close() && !k.is_key_just_released(keyboard_key::escape) ) { +namespace +{ + class game final : public application { + public: + bool frame_tick() final { + const keyboard& k = the().keyboard(); + while ( the().should_close() || k.is_key_just_released(keyboard_key::escape) ) { + return false; + } the().execute(render::command_block<64>() .add_command(render::clear_command() .color_value({1.f, 0.4f, 0.f, 1.f})) .add_command(render::swap_command(true))); - the().frame_tick(); - window::poll_events(); + return true; } - } + }; +} + +int e2d_main(int argc, char *argv[]) { + auto params = engine::parameters("bootstrap", "enduro2d") + .timer_params(engine::timer_parameters() + .maximal_framerate(100)); + modules::initialize(argc, argv, params).start(); return 0; } From 78d2263ead34bf09cd42782481cdd913ad06ddb8 Mon Sep 17 00:00:00 2001 From: BlackMATov Date: Fri, 9 Nov 2018 16:49:43 +0700 Subject: [PATCH 3/3] remove clang 3.6 and 3.7 from travis CI --- .travis.yml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index b16ae35..d55f308 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,14 +21,6 @@ matrix: dist: trusty addons: { apt: { sources: ubuntu-toolchain-r-test, packages: ["xorg-dev", "g++-8"] } } env: MATRIX_EVAL="CC=gcc-8 && CXX=g++-8" - - os: linux - dist: trusty - addons: { apt: { sources: ["ubuntu-toolchain-r-test", "llvm-toolchain-precise-3.6"], packages: ["xorg-dev", "clang-3.6", "g++-5"] } } - env: MATRIX_EVAL="CC=clang-3.6 && CXX=clang++-3.6" - - os: linux - dist: trusty - addons: { apt: { sources: ["ubuntu-toolchain-r-test", "llvm-toolchain-precise-3.7"], packages: ["xorg-dev", "clang-3.7", "g++-5"] } } - env: MATRIX_EVAL="CC=clang-3.7 && CXX=clang++-3.7" - os: linux dist: trusty addons: { apt: { sources: ["ubuntu-toolchain-r-test", "llvm-toolchain-precise-3.8"], packages: ["xorg-dev", "clang-3.8", "g++-5"] } }