diff options
32 files changed, 553 insertions, 371 deletions
diff --git a/Assets/world/world1/layers/0/forestTileBack.png b/Assets/world/world1/layers/0/forestTileBack.png Binary files differnew file mode 100644 index 0000000..f1c1a8b --- /dev/null +++ b/Assets/world/world1/layers/0/forestTileBack.png diff --git a/Assets/world/world1/layers/0/hitbox.png b/Assets/world/world1/layers/0/hitbox.png Binary files differnew file mode 100644 index 0000000..9ae9622 --- /dev/null +++ b/Assets/world/world1/layers/0/hitbox.png diff --git a/Assets/world/world1/layers/0/normal.png b/Assets/world/world1/layers/0/normal.png Binary files differnew file mode 100644 index 0000000..bc2ede6 --- /dev/null +++ b/Assets/world/world1/layers/0/normal.png diff --git a/Assets/world/world1/layers/0/texture.png b/Assets/world/world1/layers/0/texture.png Binary files differnew file mode 100644 index 0000000..429107e --- /dev/null +++ b/Assets/world/world1/layers/0/texture.png diff --git a/Assets/world/world1/layers/1/hitbox.png b/Assets/world/world1/layers/1/hitbox.png Binary files differnew file mode 100644 index 0000000..0a9a37e --- /dev/null +++ b/Assets/world/world1/layers/1/hitbox.png diff --git a/Assets/world/world1/layers/1/normal.png b/Assets/world/world1/layers/1/normal.png Binary files differnew file mode 100644 index 0000000..bc2ede6 --- /dev/null +++ b/Assets/world/world1/layers/1/normal.png diff --git a/Assets/world/world1/layers/1/texture.png b/Assets/world/world1/layers/1/texture.png Binary files differnew file mode 100644 index 0000000..149273f --- /dev/null +++ b/Assets/world/world1/layers/1/texture.png diff --git a/Assets/world/world1/layers/deco/forestTileBack.png b/Assets/world/world1/layers/deco/forestTileBack.png Binary files differnew file mode 100644 index 0000000..c5e9dac --- /dev/null +++ b/Assets/world/world1/layers/deco/forestTileBack.png diff --git a/Assets/world/world1/layers/deco/forestTileFront.png b/Assets/world/world1/layers/deco/forestTileFront.png Binary files differnew file mode 100644 index 0000000..234520c --- /dev/null +++ b/Assets/world/world1/layers/deco/forestTileFront.png diff --git a/Assets/world/world1/layers/deco/forestTileMid.png b/Assets/world/world1/layers/deco/forestTileMid.png Binary files differnew file mode 100644 index 0000000..b51d0bc --- /dev/null +++ b/Assets/world/world1/layers/deco/forestTileMid.png diff --git a/Assets/world/world1/layers/deco/normal.png b/Assets/world/world1/layers/deco/normal.png Binary files differnew file mode 100644 index 0000000..767f7e3 --- /dev/null +++ b/Assets/world/world1/layers/deco/normal.png diff --git a/Assets/world/world1/layers/deco/texture.png b/Assets/world/world1/layers/deco/texture.png Binary files differnew file mode 100644 index 0000000..ce37a03 --- /dev/null +++ b/Assets/world/world1/layers/deco/texture.png @@ -40,7 +40,7 @@ LIBS = -L$(LIBDIR) -lSDL2 -lpthread -lentityx -lluajit -ldl -lGLEW -lGL \ -lSDL2_image -lSOIL -lfreetype CXXFLAGS = -ggdb -std=c++17 -Wall -Wextra -Werror -pedantic \ - -Wno-class-memaccess -Wno-implicit-fallthrough -m64 + -Wno-class-memaccess -Wno-implicit-fallthrough -m64 -O1 CXXINCS = -Isrc -I$(LIBDIR)/LuaJIT/src -I$(LIBDIR)/entityx \ -I$(LIBDIR)/LuaBridge/Source -I$(LIBDIR)/sol2/include \ @@ -82,5 +82,7 @@ $(OUTDIR)/%.$(OBJEXT): $(SRCDIR)/%.$(SRCEXT) @sed -e 's/.*://' -e 's/\\$$//' < $(OUTDIR)/$*.$(DEPEXT).tmp | fmt -1 | sed -e 's/^ *//' -e 's/$$/:/' >> $(OUTDIR)/$*.$(DEPEXT) @rm -f $(OUTDIR)/$*.$(DEPEXT).tmp -.PHONY: all remake clean cleaner resources +mem: $(EXEC) + valgrind --leak-check=full --show-leak-kinds=all --track-origins=yes ./$(EXEC) +.PHONY: all remake clean cleaner resources mem diff --git a/Scripts/init.lua b/Scripts/init.lua index ec9e350..da2517f 100644 --- a/Scripts/init.lua +++ b/Scripts/init.lua @@ -28,20 +28,30 @@ player = { end }, Position = { - x = 15, - y = 75 + 15.0, 10.0 }, Velocity = { x = 0.0, y = 0.0 }, - Physics = 0, + Physics = { + hitbox = { + ll = {x = -0.5, y = -0.8}, + lr = {x = 0.5, y = -0.8}, + ul = {x = -0.5, y = 0.8}, + ur = {x = 0.5, y = 0.8}, + } + }, Name = "bord", - hellotrue = true, - hellofalse = false, Render = { texture = "Assets/player.png", - visible = true + visible = true, + offset = { + ll = {x = -0.5, y = -0.8}, + lr = {x = 0.5, y = -0.8}, + ul = {x = -0.5, y = 0.8}, + ur = {x = 0.5, y = 0.8}, + } }, Light = { r = 1.0, @@ -50,11 +60,6 @@ player = { strength = 1.0 }, Idle = function(self) - --if (self.visibleTick >= 20) then - -- self.Render.visible = not self.Render.visible - -- self.visibleTick = 0 - --end - --self.visibleTick = self.visibleTick + 1 end, visibleTick = 0 } diff --git a/Scripts/world.lua b/Scripts/world.lua index bb6c61e..1fb74d2 100644 --- a/Scripts/world.lua +++ b/Scripts/world.lua @@ -1,112 +1,31 @@ -world = { - Seed = 5345345, - Layers = 2, - - -- This is run when the world is registered and not after, - -- although it is possible to register materials later +newWorld = { Register = function(self) - - -- TODO make world have global textures to speed up rendering - - self:registerMaterial("grass", { - -- TODO combine both of these into 1 - texture = { - file = "Assets/world.png", - offset = { x = 0, y = 0 }, - size = { x = 64, y = 64 } - }, - normal = { - file = "Assets/world_normal.png", - offset = { x = 0, y = 0 }, - size = { x = 64, y = 64 } - } + self.unitSize = 8; + self:createLayer(0, { + texture = { file = "Assets/world/world1/layers/0/texture.png" }, + normal = { file = "Assets/world/world1/layers/0/normal.png" }, + hitbox = "Assets/world/world1/layers/0/hitbox.png" }); - self:registerMaterial("dirt", { - texture = { - file = "Assets/world.png", - offset = { x = 64, y = 0 }, - size = { x = 64, y = 64 } - }, - normal = { - file = "Assets/world_normal.png", - offset = { x = 64, y = 0 }, - size = { x = 64, y = 64 } - } + self:createLayer(1, { + texture = { file = "Assets/world/world1/layers/1/texture.png" }, + normal = { file = "Assets/world/world1/layers/1/normal.png" }, + hitbox = "Assets/world/world1/layers/1/hitbox.png" }); - self:registerMaterial("stone", { - texture = { - file = "Assets/world.png", - offset = { x = 128, y = 0 }, - size = { x = 64, y = 64 } - }, - normal = { - file = "Assets/world_normal.png", - offset = { x = 128, y = 0 }, - size = { x = 64, y = 64 } - } + self:createDecoLayer(7, { + texture = { file = "Assets/world/world1/layers/deco/forestTileBack.png" }, + normal = { file = "Assets/world/world1/layers/deco/normal.png" }, }); - self:registerMaterial("flower", { - texture = { - file = "Assets/world.png", - offset = { x = 192, y = 0 }, - size = { x = 64, y = 64 } - }, - normal = { - file = "Assets/world_normal.png", - offset = { x = 192, y = 0 }, - size = { x = 64, y = 64 } - }, - passable = true + self:createDecoLayer(5.5, { + texture = { file = "Assets/world/world1/layers/deco/forestTileMid.png" }, + normal = { file = "Assets/world/world1/layers/deco/normal.png" }, }); - self:registerMaterial("trunk", { - texture = { - file = "Assets/world.png", - offset = { x = 256, y = 0 }, - size = { x = 64, y = 64 } - }, - normal = { - file = "Assets/world_normal.png", - offset = { x = 256, y = 0 }, - size = { x = 64, y = 64 } - } + self:createDecoLayer(4, { + texture = { file = "Assets/world/world1/layers/deco/forestTileFront.png" }, + normal = { file = "Assets/world/world1/layers/deco/normal.png" }, }); end, - Generate = function(self) - math.randomseed(self.Seed) - xsize, ysize, zsize = self:setSize(250, 128, 3) - for Z = 0,zsize-1 do - for X = 0,xsize-1 do - if Z == 0 then - YGen = math.floor(6*math.sin(X/20)) + 64 - elseif Z == 1 then - YGen = math.floor(9*math.sin(X/20)) + 64 - else - YGen = math.floor(15*math.sin(X/20)) + 64 - end - YDepth = math.random(3,5) - for Y = 0,ysize-1 do - if Y == YGen then - self:setData(X, Y, Z, "grass"); - elseif Y < YGen and Y > (YGen - YDepth) then - self:setData(X, Y, Z, "dirt"); - elseif Y < YGen then - self:setData(X, Y, Z, "stone"); - elseif Y == YGen + 1 then - if math.random(0, 100) == 53 then - self:setData(X, Y, Z, "flower"); - elseif math.random(0, 100) == 45 then - self:setData(X, Y, Z, "trunk"); - end - end - --print(X..","..Y..","..Z); - end - end - end - --self:setData(1000, 1345, 5, "grass"); -- Test error checking - print("Done with world gen"); end } ---world:Generate() -game.worldRegister(world) +game.worldRegister(newWorld); diff --git a/src/components/Component.hpp b/src/components/Component.hpp index 2928366..5b0e3af 100644 --- a/src/components/Component.hpp +++ b/src/components/Component.hpp @@ -24,6 +24,10 @@ #include <entityx/entityx.h> #include <sol/sol.hpp> +#include <glm/glm.hpp> + +#include <script/vectors.hpp> + template<typename T> class Component : public entityx::Component<T> { diff --git a/src/components/Physics.hpp b/src/components/Physics.hpp index 378e87f..cb4d08a 100644 --- a/src/components/Physics.hpp +++ b/src/components/Physics.hpp @@ -25,8 +25,38 @@ struct Physics : Component<Physics> { public: bool standing = true; + bool gravity = true; + glm::vec2 corners[4] = { + glm::vec2(-0.5, -0.5), // lower left + glm::vec2( 0.5, -0.5), // lower right + glm::vec2(-0.5, 0.5), // upper left + glm::vec2( 0.5, 0.5) // upper right + }; + Physics FromLua([[maybe_unused]] sol::object ref) { + if (ref.get_type() == sol::type::table) { + sol::table tab = ref; + + if (tab["gravity"].get_type() == sol::type::boolean) + this->gravity = tab["gravity"]; + + if (tab["hitbox"].get_type() == sol::type::table) { + sol::table hitbox = tab["hitbox"]; + if (hitbox["ll"] == sol::type::table) + corners[0] = Script::to<glm::vec2>(hitbox["ll"]); + if (hitbox["lr"] == sol::type::table) + corners[1] = Script::to<glm::vec2>(hitbox["lr"]); + if (hitbox["ul"] == sol::type::table) + corners[2] = Script::to<glm::vec2>(hitbox["ul"]); + if (hitbox["ur"] == sol::type::table) + corners[3] = Script::to<glm::vec2>(hitbox["ur"]); + } + } else { + throw std::string( + "Physics component table formatted incorrectly" + ); + } return *this; } diff --git a/src/components/Position.hpp b/src/components/Position.hpp index 56e8707..bfa4b41 100644 --- a/src/components/Position.hpp +++ b/src/components/Position.hpp @@ -24,25 +24,26 @@ struct Position : Component<Position> { public: - double x, y; + float x, y, z; - Position(double _x = 0, double _y = 0) : - x(_x), y(_y) {} + Position(float _x = 0, float _y = 0, float _z = 0) : + x(_x), y(_y), z(_z) {} Position FromLua(sol::object ref) { - if (ref.get_type() == sol::type::table) { - sol::table tab = ref; - if (tab["x"] != nullptr) - this->x = tab["x"]; - if (tab["y"] != nullptr) - this->y = tab["y"]; - } else { - throw std::string("Position table not formatted properly"); - } + glm::vec3 vec = Script::to<glm::vec3>(ref); + this->x = vec.x; + this->y = vec.y; + this->z = vec.z; + return *this; } + glm::vec3 vec() + { + return glm::vec3(x, y, z); + } + void serialize(cereal::JSONOutputArchive& ar) final { ar(CEREAL_NVP(x), CEREAL_NVP(y)); } diff --git a/src/components/Render.hpp b/src/components/Render.hpp index 81ca591..a9af51a 100644 --- a/src/components/Render.hpp +++ b/src/components/Render.hpp @@ -28,6 +28,12 @@ public: Texture normal; bool visible; bool flipX = false; + glm::vec2 corners[4] = { + glm::vec2(-0.5, -0.5), // lower left + glm::vec2( 0.5, -0.5), // lower right + glm::vec2(-0.5, 0.5), // upper left + glm::vec2( 0.5, 0.5) // upper right + }; Render(std::string _file) : texture(_file), visible(true) {} @@ -46,6 +52,19 @@ public: this->normal = Texture(tab.get<std::string>("normal")); if (tab["flipx"].get_type() == sol::type::boolean) this->flipX = tab["flipx"]; + + if (tab["offset"].get_type() == sol::type::table) { + sol::table offset = tab["offset"]; + if (offset["ll"] == sol::type::table) + corners[0] = Script::to<glm::vec2>(offset["ll"]); + if (offset["lr"] == sol::type::table) + corners[1] = Script::to<glm::vec2>(offset["lr"]); + if (offset["ul"] == sol::type::table) + corners[2] = Script::to<glm::vec2>(offset["ul"]); + if (offset["ur"] == sol::type::table) + corners[3] = Script::to<glm::vec2>(offset["ur"]); + } + } else { throw std::string( "Render component table formatted incorrectly" diff --git a/src/components/Velocity.hpp b/src/components/Velocity.hpp index 776c1dd..888cbb5 100644 --- a/src/components/Velocity.hpp +++ b/src/components/Velocity.hpp @@ -25,25 +25,24 @@ struct Velocity : Component<Velocity> { public: - double x, y; + float x, y; - Velocity(double _x = 0, double _y = 0) : + Velocity(float _x = 0, float _y = 0) : x(_x), y(_y) {} Velocity FromLua(sol::object ref) { - if (ref.get_type() == sol::type::table) { - sol::table tab = ref; - if (tab["x"] != nullptr) - this->x = tab["x"]; - if (tab["y"] != nullptr) - this->y = tab["y"]; - } else { - throw std::string("Velocity table not formatted properly"); - } + glm::vec2 vel = Script::to<glm::vec2>(ref); + this->x = vel.x; + this->y = vel.y; return *this; } + glm::vec2 vec() + { + return glm::vec2(x, y); + } + void serialize(cereal::JSONOutputArchive& ar) final { ar(CEREAL_NVP(x), CEREAL_NVP(y)); } diff --git a/src/events/render.hpp b/src/events/render.hpp index bcecac6..a3eb7d6 100644 --- a/src/events/render.hpp +++ b/src/events/render.hpp @@ -1,3 +1,20 @@ +/* + * 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 EVENTS_RENDER_HPP_ #define EVENTS_RENDER_HPP_ @@ -8,9 +25,24 @@ struct NewRenderEvent GLuint normal; unsigned int vertex; - NewRenderEvent(GLuint _vbo, GLuint _tex, GLuint _normal, unsigned int _vertex) : + NewRenderEvent(GLuint _vbo, GLuint _tex, + GLuint _normal, unsigned int _vertex) : vbo(_vbo), tex(_tex), normal(_normal), vertex(_vertex) {} }; +struct WorldMeshUpdateEvent +{ + GLuint worldVBO; + GLuint worldTexture; + GLuint worldNormal; + unsigned int numVertex; + + WorldMeshUpdateEvent(GLuint v, GLuint t, + GLuint n, unsigned int p) : + worldVBO(v), worldTexture(t), worldNormal(n), numVertex(p) {} + + WorldMeshUpdateEvent() {}; +}; + #endif // EVENTS_RENDER_HPP_ diff --git a/src/events/world.hpp b/src/events/world.hpp index e5969c0..e6f6d79 100644 --- a/src/events/world.hpp +++ b/src/events/world.hpp @@ -28,16 +28,4 @@ struct WorldChangeEvent newWorld(w) {} }; -struct WorldMeshUpdateEvent -{ - GLuint worldVBO; - unsigned int numVertex; - GLuint worldTexture; - GLuint worldNormal; - - WorldMeshUpdateEvent(GLuint v, unsigned int p, - GLuint t, GLuint n) : - worldVBO(v), numVertex(p), worldTexture(t), worldNormal(n) {} -}; - #endif//EVENTS_WORLD_HPP diff --git a/src/physics.cpp b/src/physics.cpp index 1f70ecc..85b929c 100644 --- a/src/physics.cpp +++ b/src/physics.cpp @@ -41,10 +41,10 @@ void PhysicsSystem::update([[maybe_unused]]entityx::EntityManager& entities, pos.x += (vel.x * dt/1000.0); pos.y += (vel.y * dt/1000.0); - // TODO make this intersect world instead of 0 y + // If the entity has physics if (has_phys) { - double fallPosition = currentWorld->getHeight(pos.x, pos.y, 0.0); + float fallPosition = currentWorld->getHeight(pos.x, pos.y, 0.0); Physics *p = e.component<Physics>().get(); // TODO only make this occur when the entity has a hitbox diff --git a/src/render.cpp b/src/render.cpp index 0f0b138..9362134 100644 --- a/src/render.cpp +++ b/src/render.cpp @@ -167,19 +167,18 @@ void RenderSystem::update([[maybe_unused]] entityx::EntityManager& entities, //if (e.has_component<Scripted>()) { // e.component<Scripted>()->updateRender(); //} - - float w = 0.5f; - float h = (float)rend.texture.height/rend.texture.width; + + auto& c = rend.corners; GLuint tri_vbo; GLfloat tri_data[] = { - (float)p.x-w, (float)p.y , 0.0f, 0.0f, 1.0f, 1.0f, - (float)p.x+w, (float)p.y , 0.0f, 1.0f, 1.0f, 1.0f, - (float)p.x-w, (float)p.y+h, 0.0f, 0.0f, 0.0f, 1.0f, - - (float)p.x+w, (float)p.y , 0.0f, 1.0f, 1.0f, 1.0f, - (float)p.x+w, (float)p.y+h, 0.0f, 1.0f, 0.0f, 1.0f, - (float)p.x-w, (float)p.y+h, 0.0f, 0.0f, 0.0f, 1.0f, + p.x+c[0].x, p.y+c[0].y, 0.0f, 0.0f, 1.0f, 1.0f, + p.x+c[1].x, p.y+c[1].y, 0.0f, 1.0f, 1.0f, 1.0f, + p.x+c[2].x, p.y+c[2].y, 0.0f, 0.0f, 0.0f, 1.0f, + + p.x+c[1].x, p.y+c[1].y, 0.0f, 1.0f, 1.0f, 1.0f, + p.x+c[3].x, p.y+c[3].y, 0.0f, 1.0f, 0.0f, 1.0f, + p.x+c[2].x, p.y+c[2].y, 0.0f, 0.0f, 0.0f, 1.0f, }; bool flipped = false; @@ -219,24 +218,25 @@ void RenderSystem::update([[maybe_unused]] entityx::EntityManager& entities, }); glUniform1i(f, 0); - // If we were given a world VBO render it - if (worldVBO) { + for (auto& w : worldRenders) { + auto& layer = w.second; + glActiveTexture(GL_TEXTURE0); - glBindTexture(GL_TEXTURE_2D, worldTexture); + glBindTexture(GL_TEXTURE_2D, layer.tex); glUniform1i(q, 0); glActiveTexture(GL_TEXTURE1); - glBindTexture(GL_TEXTURE_2D, worldNormal); + glBindTexture(GL_TEXTURE_2D, layer.normal); glUniform1i(n, 1); - glBindBuffer(GL_ARRAY_BUFFER, worldVBO); + glBindBuffer(GL_ARRAY_BUFFER, w.first); glVertexAttribPointer(a, 3, GL_FLOAT, GL_FALSE, 6*sizeof(float), 0); glVertexAttribPointer(t, 2, GL_FLOAT, GL_FALSE, 6*sizeof(float), (void*)(3*sizeof(float))); glVertexAttribPointer(r, 1, GL_FLOAT, GL_FALSE, 6*sizeof(float), (void*)(5*sizeof(float))); - glDrawArrays(GL_TRIANGLES, 0, worldVertex); + glDrawArrays(GL_TRIANGLES, 0, layer.vertex); } glDisableVertexAttribArray(a); @@ -407,10 +407,12 @@ void RenderSystem::receive(const NewRenderEvent &nre) void RenderSystem::receive(const WorldMeshUpdateEvent &wmu) { - worldVBO = wmu.worldVBO; - worldVertex = wmu.numVertex; - worldTexture = wmu.worldTexture; - worldNormal = wmu.worldNormal; + worldRenders.insert_or_assign( + wmu.worldVBO, + WorldRenderData(wmu.worldTexture, + wmu.worldNormal, + wmu.numVertex) + ); } void RenderSystem::receive(const entityx::ComponentAddedEvent<Player> &cae) diff --git a/src/render.hpp b/src/render.hpp index c4456cf..45fb548 100644 --- a/src/render.hpp +++ b/src/render.hpp @@ -37,8 +37,8 @@ #include "shader.hpp" #include "world.hpp" #include "components/Player.hpp" + #include "events/render.hpp" -#include "events/world.hpp" #include <map> @@ -52,6 +52,16 @@ struct UIRenderData tex(_tex), normal(_normal), vertex(_vertex) {} }; +struct WorldRenderData +{ + GLuint tex; + GLuint normal; + unsigned int vertex; + + WorldRenderData(GLuint _tex, GLuint _normal, unsigned int _vertex) : + tex(_tex), normal(_normal), vertex(_vertex) {} +}; + class RenderSystem : public entityx::System<RenderSystem>, public entityx::Receiver<RenderSystem> { @@ -69,11 +79,8 @@ private: // Map of VBOs and their render data std::map<GLuint, UIRenderData> uiRenders; + std::map<GLuint, WorldRenderData> worldRenders; - GLuint worldVBO = 0; - unsigned int worldVertex = 0; - GLuint worldTexture = 0; - GLuint worldNormal = 0; entityx::Entity player; // Save the player so we can track the camera public: RenderSystem() : diff --git a/src/script.cpp b/src/script.cpp index 0f940d3..4fda543 100644 --- a/src/script.cpp +++ b/src/script.cpp @@ -88,9 +88,10 @@ void ScriptSystem::doFile(void) void ScriptSystem::scriptExport(void) { lua.new_usertype<Position>("Position", - sol::constructors<Position(double x, double y), Position()>(), + sol::constructors<Position(float x, float y, float z), Position()>(), "x", &Position::x, - "y", &Position::y); + "y", &Position::y, + "z", &Position::z); lua.new_usertype<Name>("Name", sol::constructors<Name(std::string), Name()>(), @@ -103,7 +104,7 @@ void ScriptSystem::scriptExport(void) "flipx", &Render::flipX); lua.new_usertype<Velocity>("Velocity", - sol::constructors<Velocity(double, double), Velocity()>(), + sol::constructors<Velocity(float, float), Velocity()>(), "x", &Velocity::x, "y", &Velocity::y); @@ -119,16 +120,19 @@ void ScriptSystem::scriptExport(void) lua.new_usertype<Physics>("Physics", sol::constructors<Physics(void), Physics()>(), - "standing", &Physics::standing); + "standing", &Physics::standing, + "gravity", &Physics::gravity); lua.new_usertype<World>("World", sol::constructors<World(sol::object), World(void)>(), "Generate", &World::generate, "Seed", sol::property(&World::setSeed, &World::getSeed), - "setData", &World::setData, - "registerMaterial", &World::registerMaterial, - "setSize", &World::setSize, - "getSize", &World::getSize); + "getSize", &World::getSize, + + // New stuff + "unitSize", sol::property(&World::setUnitSize, &World::getUnitSize), + "createLayer", &World::registerLayer, + "createDecoLayer", &World::registerDecoLayer); game = lua["game"].get_or_create<sol::table>(); game.set_function("spawn", bindInstance(&ScriptSystem::spawn, this)); @@ -138,7 +142,7 @@ void ScriptSystem::scriptExport(void) sol::table ScriptSystem::spawn(sol::object param) { - sol::table* toRet; // "Entitiy" table to be returned + sol::table* toRet = NULL; // "Entitiy" table to be returned if (param.get_type() == sol::type::table) { sol::table tab = param; // Cast the generic parameter to a table diff --git a/src/script/vectors.cpp b/src/script/vectors.cpp new file mode 100644 index 0000000..4f8b344 --- /dev/null +++ b/src/script/vectors.cpp @@ -0,0 +1,108 @@ +/* + * 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/>. + */ + +#include "vectors.hpp" + +#include <glm/glm.hpp> + +#include <iostream> + +namespace Script +{ + template<class T> + T to(sol::object obj) + { + (void)obj; + T fake; + return fake; + } + + template<> + glm::vec2 to<glm::vec2>(sol::object obj) + { + glm::vec2 toReturn; + + if (obj.get_type() == sol::type::table) { + sol::table table = obj; + // X + if (table["x"] == sol::type::number) { + toReturn.x = table["x"]; + } else if (table[1] == sol::type::number) { + toReturn.x = table[1]; + } + // Y + if (table["y"] == sol::type::number) { + toReturn.y = table["y"]; + } else if (table[2] == sol::type::number) { + toReturn.y = table[2]; + } + } else { + std::cerr << "Vectors must be in table form" << std::endl; + } + + return toReturn; + } + + template<> + glm::vec3 to<glm::vec3>(sol::object obj) + { + glm::vec3 toReturn; + + if (obj.get_type() == sol::type::table) { + sol::table table = obj; + glm::vec2 base = to<glm::vec2>(table); + toReturn.x = base.x; + toReturn.y = base.y; + + // Z + if (table["z"] == sol::type::number) { + toReturn.z = table["z"]; + } else if (table[3] == sol::type::number) { + toReturn.z = table[3]; + } + } else { + std::cerr << "Vectors must be in table form" << std::endl; + } + + return toReturn; + } + + template<> + glm::vec4 to<glm::vec4>(sol::object obj) + { + glm::vec4 toReturn; + + if (obj.get_type() == sol::type::table) { + sol::table table = obj; + glm::vec3 base = to<glm::vec3>(table); + toReturn.x = base.x; + toReturn.y = base.y; + toReturn.z = base.z; + + // W + if (table["w"] == sol::type::number) { + toReturn.w = table["w"]; + } else if (table[4] == sol::type::number) { + toReturn.w = table[4]; + } + } else { + std::cerr << "Vectors must be in table form" << std::endl; + } + + return toReturn; + } +} diff --git a/src/script/vectors.hpp b/src/script/vectors.hpp new file mode 100644 index 0000000..9ee0b31 --- /dev/null +++ b/src/script/vectors.hpp @@ -0,0 +1,31 @@ +/** + * @file vectors.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 SCRIPT_VECTORS_HPP_ +#define SCRIPT_VECTORS_HPP_ + +#include <sol/sol.hpp> + +namespace Script +{ + template<class T> + T to(sol::object obj); +} + +#endif//SCRIPT_VECTORS_HPP_ diff --git a/src/texture.cpp b/src/texture.cpp index 2870b9f..331413b 100644 --- a/src/texture.cpp +++ b/src/texture.cpp @@ -21,9 +21,13 @@ #include "texture.hpp" +#include <soil/SOIL.h> + #include <unordered_map> #include <iostream> +#include <script/vectors.hpp> + struct TextureData { GLuint tex = 0; @@ -99,20 +103,10 @@ Texture::Texture(sol::object param) else return; // If we don't have image data just return a null image - if (tab["offset"] == sol::type::table) { - sol::table off = tab["offset"]; - if (off["x"] == sol::type::number) - offset.x = off.get<float>("x")/width; - if (off["y"] == sol::type::number) - offset.y = off.get<float>("y")/height; - } - - if (tab["size"] == sol::type::table) { - sol::table siz = tab["size"]; - if (siz["x"] == sol::type::number) - size.x = siz.get<float>("x")/width; - if (siz["y"] == sol::type::number) - size.y = siz.get<float>("y")/height; - } + if (tab["offset"].get_type() == sol::type::table) + offset = Script::to<glm::vec2>(tab["offset"]); + + if (tab["size"].get_type() == sol::type::table) + size = Script::to<glm::vec2>(tab["size"]); } } diff --git a/src/texture.hpp b/src/texture.hpp index 3daebbd..b03d649 100644 --- a/src/texture.hpp +++ b/src/texture.hpp @@ -20,8 +20,6 @@ #ifndef TEXTURE_HPP_ #define TEXTURE_HPP_ -#include <soil/SOIL.h> - #include <sol/sol.hpp> #include <GL/glew.h> diff --git a/src/world.cpp b/src/world.cpp index cd89a22..8987eac 100644 --- a/src/world.cpp +++ b/src/world.cpp @@ -18,7 +18,7 @@ */ #include "world.hpp" -#include "events/render.hpp" + #include "events/world.hpp" /***************** @@ -55,131 +55,50 @@ World::World(sol::object param) // If a generate function is defined, call it if (generate != sol::nil) generate(this); - - // Create our world VBO - glGenBuffers(1, &worldVBO); - // Generate our mesh - generateMesh(); -} - -/* REGISTRY */ -void World::registerMaterial(std::string name, sol::object data) -{ - if (data.get_type() == sol::type::table) { - sol::table tab = data; - - // Make sure this material has not been registered before - auto it = string_registry.find(name); - if (it == string_registry.end()) { - string_registry.emplace(name, registry.size()); - registry.push_back(WorldMaterial(tab)); - } else { - std::cerr << "Material: " << name - << " was already registered" << std::endl; - } - } else { - // TODO better logging - std::cerr << "Material registration must have a table" << std::endl; - } -} - -/* DATA */ -void World::setData(unsigned int x, - unsigned int y, - unsigned int z, - std::string d) -{ - unsigned int discovered = -1; - - auto found = string_registry.find(d); - if (found != string_registry.end()) - discovered = found->second; - - try { - data.at(z).at(x).at(y) = discovered; - } catch (std::out_of_range &oor) { - // Make sure any assignments that are outsize specified world size are - // caught to avoid any seg faults - std::cerr << "Unable to set data at: " - << x << "," << y << "," << z - << " Exception: " << oor.what() << std::endl; - } -} - -/* SIZE */ -std::tuple<unsigned int, unsigned int, unsigned int> -World::setSize(unsigned int x, unsigned int y, unsigned int z) -{ - width = x; - height = y; - layers = z; - - data = std::vector<std::vector<std::vector<int>>> - (z, std::vector<std::vector<int>> - (x,std::vector<int> - (y, -1) - ) - ); - - return {width, height, layers}; } +// TODO std::tuple<unsigned int, unsigned int, unsigned int> World::getSize() { - return {width, height, layers}; + //return {width, height, layers}; + return {0, 0, 0}; } /* RENDERING */ void World::generateMesh() { - //const unsigned int voxelLength = 6; // 2 triangles @ 3 points each - - // Preallocate size of vertexes - mesh = std::basic_string<WorldMeshData>(); - for (float Z = data.size() - 1; Z >= 0; Z--) { - for (float X = 0; X < data.at(Z).size(); X++) { - for (float Y = 0; Y < data.at(Z).at(X).size(); Y++) { - int d = data.at(Z).at(X).at(Y); - - if (d == -1) // Don't make a mesh for air of course - continue; - - Texture &t = registry.at(d).texture; - glm::vec2& to = t.offset; - glm::vec2& ts = t.size; - - float tr = 1.0f; - - // TODO play with this a bit so it only goes trans - // if player is behind the front layer - try { - if (Z < data.size() - 1 && Z >= 0) { - if (data.at(Z+1).at(X).at(Y) == -1) - tr = 1.0f; - } - } catch (...) { - tr = 1.0f; - } - - mesh += {X , Y , Z, to.x , to.y+ts.y, tr}; - mesh += {X+1, Y , Z, to.x+ts.x, to.y+ts.y, tr}; - mesh += {X , Y+1, Z, to.x , to.y , tr}; - - mesh += {X+1, Y , Z, to.x+ts.x, to.y+ts.y, tr}; - mesh += {X+1, Y+1, Z, to.x+ts.x, to.y , tr}; - mesh += {X , Y+1, Z, to.x , to.y , tr}; - } - } + for (auto &l : drawLayers) { + + // Preallocate size of vertexes + + float Z = l->drawLayer; + auto to = l->texture.offset; + auto ts = l->texture.size; + float tr = 1.0f; + + float w = l->texture.width/unitSize; + float h = l->texture.height/unitSize; + + GLfloat mesh[36] = {0 , 0 , Z, to.x , to.y+ts.y, tr, + 0+w, 0 , Z, to.x+ts.x, to.y+ts.y, tr, + 0 , 0+h, Z, to.x , to.y , tr, + + 0+w, 0 , Z, to.x+ts.x, to.y+ts.y, tr, + 0+w, 0+h, Z, to.x+ts.x, to.y , tr, + 0 , 0+h, Z, to.x , to.y , tr}; + + glBindBuffer(GL_ARRAY_BUFFER, l->layerVBO); + glBufferData(GL_ARRAY_BUFFER, + 36 * sizeof(GLfloat), + mesh, + GL_STATIC_DRAW); + + meshAdd.push_back(WorldMeshUpdateEvent(l->layerVBO, + l->texture.tex, + l->normal.tex, + 36)); } - - glBindBuffer(GL_ARRAY_BUFFER, worldVBO); - glBufferData(GL_ARRAY_BUFFER, - mesh.size() * sizeof(WorldMeshData), - mesh.data(), - GL_STATIC_DRAW); - - meshUpdated = true; } /* SEED */ @@ -197,28 +116,101 @@ unsigned int World::setSeed(unsigned int s) /* PHYSICS */ double World::getHeight(double x, double y, double z) { - unsigned int X = static_cast<unsigned int>(x); - unsigned int Z = static_cast<unsigned int>(z); - - double Y = 0.0; - try { - auto &d = data.at(Z).at(X); - for (int yi = d.size()-1; yi >= 0; yi--) { - if (d.at(yi) >= 0) { - if (!registry.at(d.at(yi)).passable) { - Y = static_cast<double>(yi); - Y += 1; - break; + (void)y; + double Y = 0.0f; + for (auto &l : solidLayers) { + if (z == l->drawLayer) { + int wx = x*unitSize; + + int h = 0.0; + for (auto b : l->hitbox[wx]) { + if (b == true) + Y = h; + h++; + } + return ((Y+1)/unitSize); + } + } + return 0; +} + +std::vector<std::pair<glm::vec2, glm::vec2>> +World::getIntersectingPlanes(glm::vec2 origin, glm::vec2 dest) +{ + (void)origin; + (void)dest; + //glm::ivec2 worldOrigin = origin*unitSize; + //glm::ivec2 worldDest = dest*unitSize; + + return std::vector<std::pair<glm::vec2, glm::vec2>>(); +} + +glm::vec3 World::collide(glm::vec3 &start, glm::vec3 &end, Physics &phys) +{ + (void)start; + (void)end; + (void)phys; + for (auto &l : solidLayers) { + if (end.z == l->drawLayer) { + glm::vec2 len = end-start; + glm::vec2 dir = glm::normalize(len); + float step = 1.0f/unitSize; + + // TODO move this + glm::vec2 pos = start; + + for (float i = 0; i < len.length(); i+=step) { + pos += dir; + + if (dir.x > 0.0f) { + // Moving to the right + //glm::vec2 origin = pos + phys.corners[1]; // bottom right + //glm::vec2 orDir = glm::vec2(0, 1); + + } else if (dir.x < 0.0f) { + // Moving to the left + + } + + if (dir.y > 0.0f) { + // Moving upwards + + } else if (dir.y < 0.0f) { + // Moving downwards + } } } - } catch (...) { // If we get any errors, just let the character - //return y; - (void)y; - return 0.0; } + return glm::vec3(0); +} + + +/********* +* NEW * +*********/ +void World::registerLayer(float z, sol::object obj) +{ + if (obj.get_type() == sol::type::table) { + sol::table tab = obj; + SolidLayer s(z, tab); + solidLayers.push_back(std::make_shared<SolidLayer>(s)); + drawLayers.push_back(std::make_shared<Layer>(s)); + } else { + throw std::string("Layer must receive a table"); + } + generateMesh(); +} - return Y; +void World::registerDecoLayer(float z, sol::object obj) +{ + if (obj.get_type() == sol::type::table) { + sol::table tab = obj; + drawLayers.push_back(std::make_shared<Layer>(Layer(z, tab))); + } else { + throw std::string("Layer must receive a table"); + } + generateMesh(); } @@ -247,12 +239,8 @@ void WorldSystem::update([[maybe_unused]]entityx::EntityManager& entities, events.emit<WorldChangeEvent>(currentWorld); } - if (currentWorld->meshUpdated) { - events.emit<WorldMeshUpdateEvent>( - currentWorld->worldVBO, - currentWorld->mesh.size(), - currentWorld->getTexture(), - currentWorld->getNormal() - ); + for (auto &ma : currentWorld->meshAdd) { + events.emit<WorldMeshUpdateEvent>(ma); } + currentWorld->meshAdd.clear(); } diff --git a/src/world.hpp b/src/world.hpp index 9314fa6..0c1275e 100644 --- a/src/world.hpp +++ b/src/world.hpp @@ -26,14 +26,15 @@ #include <entityx/entityx.h> #include <sol/sol.hpp> +#include <soil/SOIL.h> + #include "texture.hpp" +#include "events/render.hpp" + +#include <components/Position.hpp> // For entity position +#include <components/Velocity.hpp> // For entity velocity +#include <components/Physics.hpp> // For entity hitbox(es) -struct WorldMeshData -{ - float posX, posY, posZ; - float texX, texY; - float transparency; -}__attribute__((packed)); struct WorldMaterial { @@ -57,6 +58,65 @@ struct WorldMaterial } }; +class Layer +{ + friend class World; +private: + Texture texture; + Texture normal; + + float drawLayer = 0.0f; + + GLuint layerVBO; +public: + + Layer(float z, sol::table tab) { + drawLayer = z; + if (tab["texture"] != nullptr) { + sol::object t = tab["texture"]; + texture = Texture(t); + } + if (tab["normal"] != nullptr) { + sol::object n = tab["normal"]; + normal = Texture(n); + } + + glGenBuffers(1, &layerVBO); + } +}; + +class SolidLayer : public Layer +{ + friend class World; +private: + std::vector<std::vector<bool>> hitbox; +public: + SolidLayer(float z, sol::table tab) : Layer(z, tab) { + if (tab["hitbox"] != nullptr) { + int width, height, channels; + unsigned char* box = + SOIL_load_image(std::string(tab["hitbox"]).c_str(), + &width, &height, &channels, + SOIL_LOAD_RGBA); + + for (int w = 0; w < width*channels; w+=channels) { + hitbox.push_back(std::vector<bool>(height)); + for (int h = 0; h < height; h++) { + unsigned char* c = &box[(w) + (width*h*channels)]; + // we want to read the last channel (alpha) + if (c[channels-1]) { + hitbox[w/channels][height-h] = true; + } + else + hitbox[w/channels][height-h] = false; + } + } + + SOIL_free_image_data(box); + } + } +}; + class World { friend class WorldSystem; @@ -64,19 +124,17 @@ private: unsigned int seed; unsigned int layers; - unsigned int height; - unsigned int width; - - std::vector<std::vector<std::vector<int>>> data; + unsigned int unitSize; + std::vector<std::shared_ptr<SolidLayer>> solidLayers; + std::vector<std::shared_ptr<Layer>> drawLayers; - std::unordered_map<std::string, int> string_registry; - std::vector<WorldMaterial> registry; + std::vector<std::pair<glm::vec2, glm::vec2>> + getIntersectingPlanes(glm::vec2 origin, glm::vec2 dir); protected: // RENDER - std::basic_string<WorldMeshData> mesh; + std::vector<WorldMeshUpdateEvent> meshAdd; GLuint worldVBO; - bool meshUpdated = false; public: /* VARS */ sol::function generate; @@ -87,27 +145,12 @@ public: ~World() { registerMat = sol::nil; generate = sol::nil; - registry.clear(); - data.clear(); } - /* REGISTRY */ - void registerMaterial(std::string, sol::object); - - /* DATA */ - void setData(unsigned int, unsigned int, unsigned int, std::string); - - /* SIZE */ - std::tuple<unsigned int, unsigned int, unsigned int> setSize(unsigned int, - unsigned int, - unsigned int); std::tuple<unsigned int, unsigned int, unsigned int> getSize(); /* RENDERING */ void generateMesh(); - std::basic_string<WorldMeshData>& getMesh() {return mesh;} - GLuint getTexture() {return registry.at(0).texture.tex;} - GLuint getNormal() {return registry.at(0).normal.tex;}; /* SEED */ unsigned int getSeed(); @@ -115,6 +158,14 @@ public: /* PHYSICS */ double getHeight(double x, double y, double z); + glm::vec3 collide(glm::vec3 &start, glm::vec3 &end, Physics &phys); + + // NEW + unsigned int getUnitSize() {return unitSize;} + void setUnitSize(unsigned int u) {unitSize = u;} + + void registerLayer(float, sol::object); + void registerDecoLayer(float, sol::object); }; /** |
