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 to entt master (v3.6.0-pre)

Browse Source
This commit is contained in:
Green Sky
2020-11-25 21:41:36 +01:00
parent 840b663d5e
commit 7cf434d877
8 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -79,7 +79,7 @@ void SimpleRect::render(Services::OpenGLRenderer& rs, Engine& engine) {
auto view = scene.view<MM::Components::Transform2D>();
for (auto& e : view) {
auto& t = view.get(e);
auto& t = view.get<Components::Transform2D>(e);
_shader->setUniformMat4f("_WVP", vp * t.getTransform4(t.position.y/10.f + 500.f));

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

@ -111,6 +111,7 @@ 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)) {