MadeOfJelly/MushMachine
MadeOfJelly/MushMachine
2
2
Fork 0
mirror of https://github.com/MadeOfJelly/MushMachine.git synced 2024-09-21 12:35:36 +02:00
Code Issues Projects Releases Wiki Activity

add color multiplier to tilemap render task

Browse Source
This commit is contained in:
Green Sky 2020-10-01 23:02:18 +02:00
parent 59355e26ed
commit 95d1530c6d
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
framework/opengl_renderer/src/mm/opengl/render_tasks/tilemap.cpp
View File

@ -84,6 +84,8 @@ void Tilemap::render(MM::Services::OpenGLRenderer& rs, MM::Engine& engine) {
MM::OpenGL::Camera3D& cam = scene.ctx<MM::OpenGL::Camera3D>(); MM::OpenGL::Camera3D& cam = scene.ctx<MM::OpenGL::Camera3D>();
auto vp = cam.getViewProjection(); auto vp = cam.getViewProjection();
_shader->setUniform3f("_ambient_color", ambient_color);
auto view = scene.view<MM::Components::Transform2D, OpenGL::TilemapRenderable>(); auto view = scene.view<MM::Components::Transform2D, OpenGL::TilemapRenderable>();
view.each([&](auto, MM::Components::Transform2D& t, OpenGL::TilemapRenderable& tilemap) { view.each([&](auto, MM::Components::Transform2D& t, OpenGL::TilemapRenderable& tilemap) {
_shader->setUniformMat4f("_WVP", vp * t.getTransform4(tilemap.z + 500.f)); _shader->setUniformMat4f("_WVP", vp * t.getTransform4(tilemap.z + 500.f));
@ -169,6 +171,7 @@ R"(
uniform sampler2D _tex0; uniform sampler2D _tex0;
//in vec4 _color; //in vec4 _color;
uniform vec3 _ambient_color;
in vec2 _tex_pos; in vec2 _tex_pos;
out vec4 _out_color; out vec4 _out_color;
@ -180,11 +183,8 @@ void main() {
discard; discard;
} }
//gl_FragColor = tmp_col; //_out_color = tmp_col;
_out_color = tmp_col; _out_color = vec4(tmp_col.rgb * _ambient_color, tmp_col.a);
//gl_FragColor = texture(_tex0, _tex_pos);
//gl_FragColor = texture(_tex0, _tex_pos) * _color;
//gl_FragColor = vec4(_tex_pos.x, _tex_pos.y, 0, 1);
} }
)") )")
} }

4
framework/opengl_renderer/src/mm/opengl/render_tasks/tilemap.hpp
View File

@ -4,7 +4,7 @@
#include <mm/services/opengl_renderer.hpp> #include <mm/services/opengl_renderer.hpp>
//#include <glm/fwd.hpp> //#include <glm/fwd.hpp>
#include <glm/vec4.hpp> #include <glm/vec3.hpp>
// fwd // fwd
namespace MM::OpenGL { namespace MM::OpenGL {
@ -33,6 +33,8 @@ namespace MM::OpenGL::RenderTasks {
std::string target_fbo = "display"; std::string target_fbo = "display";
glm::vec3 ambient_color {1.f, 1.f, 1.f};
private: private:
void setupShaderFiles(void); void setupShaderFiles(void);
}; };