aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/components/Light.hpp54
-rw-r--r--src/components/Render.hpp11
-rw-r--r--src/components/Script.hpp15
-rw-r--r--src/engine.cpp13
-rw-r--r--src/render.cpp105
-rw-r--r--src/render.hpp4
-rw-r--r--src/script.cpp22
-rw-r--r--src/texture.cpp20
-rw-r--r--src/texture.hpp38
9 files changed, 261 insertions, 21 deletions
diff --git a/src/components/Light.hpp b/src/components/Light.hpp
new file mode 100644
index 0000000..ee215a6
--- /dev/null
+++ b/src/components/Light.hpp
@@ -0,0 +1,54 @@
+/**
+ * @file Light.hpp
+ *
+ * Copyright (C) 2019 Belle-Isle, Andrew <drumsetmonkey@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef COMPONENT_LIGHT_HPP_
+#define COMPONENT_LIGHT_HPP_
+
+#include "Component.hpp"
+
+struct Light : Component<Light>, entityx::Component<Light>
+{
+public:
+ float r, g, b;
+ float strength;
+
+ Light() {}
+ Light(float _r, float _g, float _z, float _s) :
+ r(_r), g(_g), b(_z), strength(_s) {}
+
+ Light FromLua(sol::object ref)
+ {
+ if (ref.get_type() == sol::type::table) {
+ sol::table tab = ref;
+ if (tab["r"] == sol::type::number)
+ this->r = tab["r"];
+ if (tab["g"] == sol::type::number)
+ this->g = tab["g"];
+ if (tab["b"] == sol::type::number)
+ this->b = tab["b"];
+ if (tab["strength"] == sol::type::number)
+ this->strength = tab["strength"];
+ } else {
+ throw std::string("Light component must be a table");
+ }
+ return *this;
+ }
+};
+
+#endif//COMPONENT_LIGHT_HPP_
diff --git a/src/components/Render.hpp b/src/components/Render.hpp
index 451f2d1..3f1750f 100644
--- a/src/components/Render.hpp
+++ b/src/components/Render.hpp
@@ -19,12 +19,15 @@
#define COMPONENT_RENDER_HPP_
#include "Component.hpp"
+#include "texture.hpp"
struct Render : Component<Render>, entityx::Component<Render>
{
public:
- std::string texture;
+ Texture texture;
+ Texture normal;
bool visible;
+ bool flipX = false;
Render(std::string _file) :
texture(_file), visible(true) {}
@@ -38,7 +41,11 @@ public:
if (tab["visible"].get_type() == sol::type::boolean)
this->visible = tab["visible"];
if (tab["texture"].get_type() == sol::type::string)
- this->texture = tab["texture"];
+ this->texture = Texture(static_cast<std::string>(tab["texture"]));
+ if (tab["normal"].get_type() == sol::type::string)
+ this->normal = Texture(static_cast<std::string>(tab["normal"]));
+ if (tab["flipx"].get_type() == sol::type::boolean)
+ this->flipX = tab["flipx"];
} else {
throw std::string(
"Render component table formatted incorrectly"
diff --git a/src/components/Script.hpp b/src/components/Script.hpp
index 66addc8..b3c89f3 100644
--- a/src/components/Script.hpp
+++ b/src/components/Script.hpp
@@ -42,11 +42,24 @@ public:
return *this;
}
- void exec(void) {
+ void exec(void)
+ {
if (caller["Idle"] == sol::type::function)
caller["Idle"](caller); // Call idle function and pass itself
// in or to fulfill the 'self' param
}
+
+ void updatePhysics(void)
+ {
+ if (caller["PhysicsIdle"] == sol::type::function)
+ caller["PhysicsIdle"](caller);
+ }
+
+ void updateRender(void)
+ {
+ if (caller["RenderIdle"] == sol::type::function)
+ caller["RenderIdle"](caller);
+ }
};
#endif // COMPONENT_SCRIPT_HPP_
diff --git a/src/engine.cpp b/src/engine.cpp
index f235651..2916a6e 100644
--- a/src/engine.cpp
+++ b/src/engine.cpp
@@ -30,6 +30,10 @@
#include "components/Position.hpp"
#include "components/Velocity.hpp"
+using namespace std::chrono_literals;
+namespace cr = std::chrono;
+typedef std::chrono::high_resolution_clock mc;
+
int Engine::init(void)
{
systems.add<GameRunSystem>();
@@ -46,10 +50,6 @@ int Engine::init(void)
void Engine::logicLoop(void)
{
- using namespace std::chrono_literals;
- namespace cr = std::chrono;
- typedef std::chrono::high_resolution_clock mc;
-
entityx::TimeDelta dt = 0; /**< Elapsed milliseconds since each loop */
double elapsed = 0;
@@ -67,6 +67,7 @@ void Engine::logicLoop(void)
});
systems.update<InputSystem>(dt);
+ systems.update<ScriptSystem>(dt);
/*******************
* LOGIC UPDATES *
@@ -97,9 +98,9 @@ void Engine::logicLoop(void)
void Engine::renderLoop(void)
{
+ entityx::TimeDelta dt = 0; /**< Elapsed milliseconds since each loop */
while (shouldRun()) {
- systems.update<RenderSystem>(0);
- std::this_thread::yield();
+ systems.update<RenderSystem>(dt);
}
}
diff --git a/src/render.cpp b/src/render.cpp
index 2771535..7ae2fd7 100644
--- a/src/render.cpp
+++ b/src/render.cpp
@@ -21,6 +21,8 @@
#include <render.hpp>
#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)
@@ -32,11 +34,18 @@ void RenderSystem::update([[maybe_unused]] entityx::EntityManager& entities,
[[maybe_unused]] entityx::EventManager& events,
[[maybe_unused]] entityx::TimeDelta dt)
{
+ // TODO move these to only happen once to speed up rendering
GLuint s = worldShader.getProgram();
GLuint v = worldShader.getUniform("view");
GLuint p = worldShader.getUniform("projection");
GLuint m = worldShader.getUniform("model");
GLuint a = worldShader.getAttribute("vertex");
+ GLuint t = worldShader.getAttribute("texc");
+
+ GLuint q = worldShader.getUniform("textu");
+ GLuint n = worldShader.getUniform("normu");
+ GLuint b = worldShader.getUniform("AmbientLight");
+ GLuint f = worldShader.getUniform("Flipped");
/***********
* SETUP *
@@ -60,6 +69,7 @@ void RenderSystem::update([[maybe_unused]] entityx::EntityManager& entities,
);
glm::mat4 model = glm::mat4(1.0f);
+ model = glm::scale(model, glm::vec3(2.0f));
glUseProgram(s);
@@ -74,31 +84,99 @@ void RenderSystem::update([[maybe_unused]] entityx::EntityManager& entities,
glEnable(GL_POLYGON_OFFSET_FILL);
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);
+
+ /**************
+ * LIGHTING *
+ **************/
+
+
+ std::vector<glm::vec3> lightPos;
+ std::vector<glm::vec4> lightColor;
+ int lightNum = 0;
+
+ entities.each<Light, Position>([&]
+ (entityx::Entity, Light &l, Position &p){
+
+ lightPos.push_back(glm::vec3(p.x, p.y,-10.0));
+ lightColor.push_back(glm::vec4(l.r, l.g, l.b, l.strength));
+ lightNum++;
+ });
+
+ glUniform1i(worldShader.getUniform("LightNum"), lightNum);
+ glUniform3fv(worldShader.getUniform("LightPos"),
+ lightPos.size(),
+ reinterpret_cast<GLfloat*>(lightPos.data()));
+ glUniform4fv(worldShader.getUniform("LightColor"),
+ lightColor.size(),
+ reinterpret_cast<GLfloat*>(lightColor.data()));
/*************
* DRAWING *
*************/
entities.each<Render, Position>(
- [this, a](entityx::Entity, Render &r, Position &p) {
+ [this, a, q, t, n, f](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;
+
GLuint tri_vbo;
GLfloat tri_data[] = {
- (float)p.x-10.0f, (float)p.y-10.0f, 00.0f,
- (float)p.x+10.0f, (float)p.y-10.0f, 00.0f,
- (float)p.x+00.0f, (float)p.y+10.0f, 00.0f,
+ (float)p.x-w, (float)p.y , 00.0f, 0.0f, 1.0f,
+ (float)p.x+w, (float)p.y , 00.0f, 1.0f, 1.0f,
+ (float)p.x-w, (float)p.y+h, 00.0f, 0.0f, 0.0f,
+
+ (float)p.x+w, (float)p.y , 00.0f, 1.0f, 1.0f,
+ (float)p.x+w, (float)p.y+h, 00.0f, 1.0f, 0.0f,
+ (float)p.x-w, (float)p.y+h, 00.0f, 0.0f, 0.0f,
};
+ bool flipped = false;
+
+ // TODO flip nicely (aka model transformations)
+ if (r.flipX) {
+ std::swap(tri_data[3], tri_data[8]);
+ tri_data[13] = tri_data[3];
+
+ std::swap(tri_data[23], tri_data[28]);
+ tri_data[18] = tri_data[23];
+
+ flipped = true;
+ }
+
+ glUniform1i(f, flipped ? 1 : 0);
+
+ glActiveTexture(GL_TEXTURE0);
+ glBindTexture(GL_TEXTURE_2D, r.texture.tex);
+ glUniform1i(q, 0);
+
+ glActiveTexture(GL_TEXTURE1);
+ glBindTexture(GL_TEXTURE_2D, r.normal.tex);
+ glUniform1i(n, 1);
+
glGenBuffers(1, &tri_vbo);
glBindBuffer(GL_ARRAY_BUFFER, tri_vbo);
glBufferData(GL_ARRAY_BUFFER, sizeof(tri_data), tri_data, GL_STREAM_DRAW);
- glVertexAttribPointer(a, 3, GL_FLOAT, GL_FALSE, 0, 0);
- glDrawArrays(GL_TRIANGLES, 0, 3);
-
+ glVertexAttribPointer(a, 3, GL_FLOAT, GL_FALSE,
+ 5*sizeof(float), 0);
+ glVertexAttribPointer(t, 2, GL_FLOAT, GL_FALSE,
+ 5*sizeof(float), (void*)(3*sizeof(float)));
+ glDrawArrays(GL_TRIANGLES, 0, 6);
});
@@ -106,6 +184,7 @@ void RenderSystem::update([[maybe_unused]] entityx::EntityManager& entities,
* CLEANUP *
*************/
glDisableVertexAttribArray(a);
+ glDisableVertexAttribArray(t);
glDisable(GL_POLYGON_OFFSET_FILL);
glDisable(GL_CULL_FACE);
@@ -163,6 +242,16 @@ int RenderSystem::init(void)
worldShader.addUniform("model");
worldShader.addAttribute("vertex");
+ worldShader.addAttribute("texc");
+
+ worldShader.addUniform("textu");
+ worldShader.addUniform("normu");
+
+ worldShader.addUniform("LightPos");
+ worldShader.addUniform("LightColor");
+ worldShader.addUniform("LightNum");
+ worldShader.addUniform("AmbientLight");
+ worldShader.addUniform("Flipped");
glEnableVertexAttribArray(worldShader.getAttribute("vertex"));
glUseProgram(worldShader.getProgram());
@@ -170,7 +259,7 @@ int RenderSystem::init(void)
// TODO
//glPolygonOffset(1.0, 1.0);
- glClearColor(0.6, 0.8, 1.0, 0.0);
+ //glClearColor(0.6, 0.8, 1.0, 0.0);
return 0;
}
diff --git a/src/render.hpp b/src/render.hpp
index 6362d63..5d3025c 100644
--- a/src/render.hpp
+++ b/src/render.hpp
@@ -38,8 +38,8 @@ class RenderSystem : public entityx::System<RenderSystem>
{
private:
constexpr static const char *title = "gamedev2";
- constexpr static int width = 640;
- constexpr static int height = 480;
+ constexpr static int width = 1280;
+ constexpr static int height = 720;
std::unique_ptr<SDL_Window, void (*)(SDL_Window *)> window;
SDL_GLContext context;
diff --git a/src/script.cpp b/src/script.cpp
index 80ac538..fa485bc 100644
--- a/src/script.cpp
+++ b/src/script.cpp
@@ -36,10 +36,14 @@ void ScriptSystem::configure(entityx::EntityManager& entities,
//init();
}
-void ScriptSystem::update([[maybe_unused]] entityx::EntityManager& entites,
+#include <components/Script.hpp>
+void ScriptSystem::update([[maybe_unused]] entityx::EntityManager& entities,
[[maybe_unused]] entityx::EventManager& events,
[[maybe_unused]] entityx::TimeDelta dt)
{
+ entities.each<Scripted>([](entityx::Entity, Scripted &s){
+ s.updatePhysics();
+ });
}
@@ -80,6 +84,7 @@ void ScriptSystem::doFile(void)
#include <components/Render.hpp>
#include <components/Script.hpp>
#include <components/Velocity.hpp>
+#include <components/Light.hpp>
void ScriptSystem::scriptExport(void)
{
@@ -98,7 +103,8 @@ void ScriptSystem::scriptExport(void)
lua.new_usertype<Render>("Render",
sol::constructors<Render(std::string), Render()>(),
"visible", &Render::visible,
- "texture", &Render::texture);
+ "texture", &Render::texture,
+ "flipx", &Render::flipX);
lua.new_usertype<Velocity>("Velocity",
sol::constructors<Velocity(double, double), Velocity()>(),
@@ -108,6 +114,13 @@ void ScriptSystem::scriptExport(void)
lua.new_usertype<Player>("Player",
sol::constructors<Player(void), Player()>());
+ lua.new_usertype<Light>("Light",
+ sol::constructors<Light(float, float, float, float)>(),
+ "r", &Light::r,
+ "g", &Light::g,
+ "b", &Light::b,
+ "strength", &Light::strength);
+
auto gamespace = lua["game"].get_or_create<sol::table>();
gamespace.set_function("spawn", func);
}
@@ -162,6 +175,11 @@ sol::table ScriptSystem::spawn(sol::object param)
(*toRet)["Player"] = e.assign<Player>().get();
}
+ if (tab["Light"] != nullptr) {
+ (*toRet)["Light"] =
+ e.assign<Light>(Light().FromLua(tab["Light"])).get();
+ }
+
} else {
// TODO better logging
std::cerr << "Parameter to spawn() must be a table!" << std::endl;
diff --git a/src/texture.cpp b/src/texture.cpp
new file mode 100644
index 0000000..5604812
--- /dev/null
+++ b/src/texture.cpp
@@ -0,0 +1,20 @@
+#include "texture.hpp"
+
+Texture::Texture(std::string filename)
+{
+ unsigned char* image = SOIL_load_image(filename.c_str(),
+ &width, &height, 0,
+ SOIL_LOAD_RGBA);
+
+ glGenTextures(1, &tex); // Turns "object" into a texture
+ glBindTexture(GL_TEXTURE_2D, tex); // Binds "object" to the top of the stack
+ glPixelStoref(GL_UNPACK_ALIGNMENT, 1);
+ glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); // Sets the "min" filter
+ glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); // The the "max" filter of the stack
+ glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE); // Wrap the texture to the matrix
+ glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); //
+ glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, width, height, 0,
+ GL_RGBA, GL_UNSIGNED_BYTE, image);
+
+ SOIL_free_image_data(image);
+}
diff --git a/src/texture.hpp b/src/texture.hpp
new file mode 100644
index 0000000..16987f8
--- /dev/null
+++ b/src/texture.hpp
@@ -0,0 +1,38 @@
+/**
+ * @file texture.hpp
+ *
+ * Copyright (C) 2019 Belle-Isle, Andrew <drumsetmonkey@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef TEXTURE_HPP_
+#define TEXTURE_HPP_
+
+#include <soil/SOIL.h>
+#include <SDL2/SDL_opengl.h>
+#include <string>
+
+class Texture
+{
+private:
+public:
+ GLuint tex;
+ int width;
+ int height;
+ Texture() {};
+ Texture(std::string);
+};
+
+#endif//TEXTURE_HPP_
generated by cgit v1.2.3 (git 2.39.1) at 2025-04-05 07:36:03 +0000