diff options
| author | Andy Belle-Isle <drumsetmonkey@gmail.com> | 2019-09-02 01:42:36 -0400 |
|---|---|---|
| committer | Andy Belle-Isle <drumsetmonkey@gmail.com> | 2019-09-02 01:42:36 -0400 |
| commit | b52920a35eb69d1a258c737e3114fbe5cfe9aca5 (patch) | |
| tree | b3a7363b6f4bae8cda513a54ef84069103e6388b /src/render.cpp | |
| parent | ea35ad60506407040f7b9fae65c5bdc18f9576bb (diff) | |
Changed Lua Idle function names
Diffstat (limited to 'src/render.cpp')
| -rw-r--r-- | src/render.cpp | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/src/render.cpp b/src/render.cpp index 4990955..65b8441 100644 --- a/src/render.cpp +++ b/src/render.cpp @@ -22,6 +22,7 @@ #include <components/Render.hpp> #include <components/Position.hpp> #include <components/Light.hpp> +#include <components/Script.hpp> void RenderSystem::configure([[maybe_unused]] entityx::EntityManager& entities, [[maybe_unused]] entityx::EventManager& events) @@ -84,8 +85,8 @@ void RenderSystem::update([[maybe_unused]] entityx::EntityManager& entities, glEnableVertexAttribArray(a); glEnableVertexAttribArray(t); + // Ambient light, for now this is static GLfloat amb[4] = {1.0f, 1.0f, 1.0f, 0.0f}; - glUniform4fv(b, 1, amb); /************** @@ -97,8 +98,7 @@ void RenderSystem::update([[maybe_unused]] entityx::EntityManager& entities, std::vector<glm::vec4> lightColor; int lightNum = 0; - entities.each<Light, Position>( - [&] + entities.each<Light, Position>([&] (entityx::Entity, Light &l, Position &p){ lightPos.push_back(glm::vec3(p.x, p.y,-10.0)); @@ -118,13 +118,18 @@ void RenderSystem::update([[maybe_unused]] entityx::EntityManager& entities, * DRAWING * *************/ - entities.each<Render, Position>( [this, a, q, t, n](entityx::Entity, Render &r, Position &p) { if (!r.visible) return; + // If our component was created via script, call the entity's + // RenderIdle function + //if (e.has_component<Scripted>()) { + // e.component<Scripted>()->updateRender(); + //} + float w = r.texture.width/2.0f; float h = r.texture.height; |