MadeOfJelly/MushMachine
2
2
Fork 0
mirror of https://github.com/MadeOfJelly/MushMachine.git synced 2025-06-18 18:56:36 +02:00
Code Issues Projects Releases Wiki Activity

fix entt update

Browse Source
This commit is contained in:
Green Sky
2020-12-12 18:21:45 +01:00
parent f62ed43209
commit 1d59003858
26 changed files with 91 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
framework/opengl_renderer/src/mm/services/opengl_renderer.cpp
View File

@ -33,6 +33,8 @@
namespace MM::Services {
using namespace entt::literals;
OpenGLRenderer::OpenGLRenderer(void) {
MM::Logger::initSectionLogger("OpenGL");
MM::Logger::initSectionLogger("OpenGLRenderer");
@ -71,8 +73,8 @@ bool OpenGLRenderer::enable(Engine& engine) {
_sdl_event_handle = sdl_s.addEventHandler([this, &engine](const SDL_Event& e) -> bool {
if (e.type == SDL_WINDOWEVENT) {
if (e.window.event == SDL_WINDOWEVENT_RESIZED || e.window.event == SDL_WINDOWEVENT_SIZE_CHANGED) {
auto& sdl_s = engine.getService<MM::Services::SDLService>();
auto new_window_size = sdl_s.getWindowSize();
auto& sdl = engine.getService<MM::Services::SDLService>();
auto new_window_size = sdl.getWindowSize();
glViewport(0, 0, new_window_size.first, new_window_size.second);
// TODO: recreate fbos, dirvers seem to have problems otherwise
@ -111,7 +113,6 @@ bool OpenGLRenderer::enable(Engine& engine) {
}
{ // default texures
using namespace entt::literals;
auto& rm_t = MM::ResourceManager<MM::OpenGL::Texture>::ref();
if (!rm_t.contains("default"_hs)) {
if (!rm_t.load<MM::OpenGL::TextureLoaderConstBuffer>("default", default_png, default_png_len)) {

2
framework/opengl_renderer/test/batched_spritesheet_render_task_test.cpp
View File

@ -20,6 +20,8 @@
#include <physfs.h>
#include "res/textures.zip.h"
using namespace entt::literals;
const char* argv0;
TEST(batched_spritesheet_render_task, it) {

2
framework/opengl_renderer/test/blur_render_task_test.cpp
View File

@ -28,6 +28,8 @@
#include <random>
using namespace entt::literals;
const char* argv0;
TEST(blur_render_task, it) {

2
framework/opengl_renderer/test/imgui_render_task_test.cpp
View File

@ -12,6 +12,8 @@
#include <imgui/imgui.h>
using namespace entt::literals;
TEST(imgui_render_task, demowindow) {
MM::Engine engine;

2
framework/opengl_renderer/test/simple_sprite_render_task_test.cpp
View File

@ -19,6 +19,8 @@
#include <random>
using namespace entt::literals;
const char* argv0;
TEST(simple_sprite_render_task, it) {

2
framework/opengl_renderer/test/simple_spritesheet_render_task_test.cpp
View File

@ -20,6 +20,8 @@
#include <physfs.h>
#include "res/textures.zip.h"
using namespace entt::literals;
TEST(simple_spritesheet_render_task, it) {
MM::Engine engine;

2
framework/opengl_renderer/test/tilemap_render_task_test.cpp
View File

@ -17,6 +17,8 @@
#include <mm/opengl/texture_loader.hpp>
using namespace entt::literals;
TEST(tilemap_render_task_test, it) {
MM::Engine engine;