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

update entt to v3.7.1

Browse Source
This commit is contained in:
Green Sky
2021-04-14 15:48:56 +02:00
parent 4e2dd51ad1
commit 7e1137732b
7 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
framework/opengl_renderer/src/mm/opengl/render_tasks/batched_spritesheet.cpp
View File

@ -104,7 +104,7 @@ void BatchedSpriteSheet::render(Services::OpenGLRenderer& rs, Engine& engine) {
}
auto* tmp_col_ptr = &default_color;
if (scene.has<Components::Color>(e)) {
if (scene.all_of<Components::Color>(e)) {
tmp_col_ptr = &scene.get<Components::Color>(e).color;
}

2
framework/opengl_renderer/src/mm/opengl/render_tasks/simple_rect.cpp
View File

@ -83,7 +83,7 @@ void SimpleRect::render(Services::OpenGLRenderer& rs, Engine& engine) {
_shader->setUniformMat4f("_WVP", vp * t.getTransform4(t.position.y/10.f + 500.f));
if (scene.has<Components::Color>(e)) {
if (scene.all_of<Components::Color>(e)) {
_shader->setUniform4f("_color", scene.get<Components::Color>(e).color);
} else {
_shader->setUniform4f("_color", default_color);

2
framework/opengl_renderer/src/mm/opengl/render_tasks/simple_sprite.cpp
View File

@ -90,7 +90,7 @@ void SimpleSprite::render(Services::OpenGLRenderer& rs, Engine& engine) {
_shader->setUniformMat4f("_WVP", vp * t.getTransform4(t.position.y/10.f + 500.f));
if (scene.has<Components::Color>(e)) {
if (scene.all_of<Components::Color>(e)) {
_shader->setUniform4f("_color", scene.get<Components::Color>(e).color);
} else {
_shader->setUniform4f("_color", default_color);

2
framework/opengl_renderer/src/mm/opengl/render_tasks/simple_spritesheet.cpp
View File

@ -101,7 +101,7 @@ void SimpleSpriteSheet::render(Services::OpenGLRenderer& rs, Engine& engine) {
_shader->setUniform2ui("_tileCount", spr.sp.tile_count.x, spr.sp.tile_count.y);
_shader->setUniform1ui("_atlasIndex", spr.tile_index);
if (scene.has<Components::Color>(e)) {
if (scene.all_of<Components::Color>(e)) {
_shader->setUniform4f("_color", scene.get<Components::Color>(e).color);
} else {
_shader->setUniform4f("_color", default_color);