aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/physics.cpp17
-rw-r--r--src/physics.hpp9
-rw-r--r--src/render.cpp88
-rw-r--r--src/render.hpp17
-rw-r--r--src/script.cpp8
-rw-r--r--src/world.cpp27
-rw-r--r--src/world.hpp3
7 files changed, 136 insertions, 33 deletions
diff --git a/src/physics.cpp b/src/physics.cpp
index 31569ab..1f70ecc 100644
--- a/src/physics.cpp
+++ b/src/physics.cpp
@@ -18,6 +18,7 @@
*/
#include "physics.hpp"
+
#include "components/Physics.hpp"
#include "components/Position.hpp"
#include "components/Velocity.hpp"
@@ -25,7 +26,7 @@
void PhysicsSystem::configure([[maybe_unused]]entityx::EntityManager& entities,
[[maybe_unused]]entityx::EventManager& events)
{
-
+ events.subscribe<WorldChangeEvent>(*this);
}
void PhysicsSystem::update([[maybe_unused]]entityx::EntityManager& entities,
@@ -33,17 +34,18 @@ void PhysicsSystem::update([[maybe_unused]]entityx::EntityManager& entities,
[[maybe_unused]]entityx::TimeDelta dt)
{
entities.each<Position, Velocity>
- ([dt](entityx::Entity e, Position &pos, Velocity &vel){
+ ([this, dt](entityx::Entity e, Position &pos, Velocity &vel){
bool has_phys = e.has_component<Physics>();
pos.x += (vel.x * dt/1000.0);
pos.y += (vel.y * dt/1000.0);
- double fallPosition = 0;
-
// TODO make this intersect world instead of 0 y
if (has_phys) {
+
+ double 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
if (pos.y == fallPosition) {
@@ -57,8 +59,13 @@ void PhysicsSystem::update([[maybe_unused]]entityx::EntityManager& entities,
p->standing = true;
} else {
p->standing = false;
- vel.y -= 920 * (dt/1000.0f);
+ vel.y -= 32.2 * (dt/1000.0f);
}
}
});
}
+
+void PhysicsSystem::receive(const WorldChangeEvent& wce)
+{
+ currentWorld = wce.newWorld;
+}
diff --git a/src/physics.hpp b/src/physics.hpp
index 8231d6d..db93999 100644
--- a/src/physics.hpp
+++ b/src/physics.hpp
@@ -24,13 +24,18 @@
#include <entityx/entityx.h>
#include <sol/sol.hpp>
+#include "world.hpp"
+#include "events/world.hpp"
+
/**
* @class PhysicsSystem
* Handles the position and velocity updating of all entities
*/
-class PhysicsSystem : public entityx::System<PhysicsSystem>
+class PhysicsSystem : public entityx::System<PhysicsSystem>,
+ public entityx::Receiver<PhysicsSystem>
{
private:
+ World* currentWorld;
public:
PhysicsSystem(void) {}
@@ -49,6 +54,8 @@ public:
void update(entityx::EntityManager& entites,
entityx::EventManager& events,
entityx::TimeDelta dt) final;
+
+ void receive(const WorldChangeEvent& wce);
};
#endif // SYSTEM_PHYSICS_HPP_
diff --git a/src/render.cpp b/src/render.cpp
index 2a51b70..3eea57b 100644
--- a/src/render.cpp
+++ b/src/render.cpp
@@ -28,6 +28,9 @@ void RenderSystem::configure([[maybe_unused]] entityx::EntityManager& entities,
[[maybe_unused]] entityx::EventManager& events)
{
events.subscribe<NewRenderEvent>(*this);
+ events.subscribe<WorldMeshUpdateEvent>(*this);
+ events.subscribe<entityx::ComponentAddedEvent<Player>>(*this);
+
init();
}
@@ -53,7 +56,7 @@ void RenderSystem::update([[maybe_unused]] entityx::EntityManager& entities,
***********/
glm::mat4 view = glm::lookAt(camPos, // Pos
- glm::vec3(0.0f, 0.0f, 0.0f), // Facing
+ glm::vec3(camPos.x, camPos.y, 0.0f), // Facing
glm::vec3(0.0f, 1.0f, 0.0f)); // Up
//glm::mat4 projection = glm::perspective(45.0f,
@@ -61,16 +64,19 @@ void RenderSystem::update([[maybe_unused]] entityx::EntityManager& entities,
// 0.01f,
// 2048.0f);
- glm::mat4 projection = glm::ortho(-((float)width/2), // Left
- ((float)width/2), // Right
- -((float)height/2), // Bottom
- ((float)height/2), // Top
- -10.0f, // zNear
- 10.0f // zFar
+ float scale = 40.0f;
+ float scaleWidth = static_cast<float>(width) / scale;
+ float scaleHeight = static_cast<float>(height) / scale;
+
+ glm::mat4 projection = glm::ortho(-(scaleWidth/2), // Left
+ (scaleWidth/2), // Right
+ -(scaleHeight/2), // Bottom
+ (scaleHeight/2), // Top
+ 10.0f, // zFar
+ -10.0f // zNear
);
glm::mat4 model = glm::mat4(1.0f);
- model = glm::scale(model, glm::vec3(20.0f, 20.0f, 1.0f));
glUseProgram(s);
@@ -91,10 +97,23 @@ void RenderSystem::update([[maybe_unused]] entityx::EntityManager& entities,
GLfloat amb[4] = {1.0f, 1.0f, 1.0f, 0.0f};
glUniform4fv(b, 1, amb);
+ /************
+ * CAMERA *
+ ************/
+ try {
+ if (player.has_component<Position>()) {
+ Position *pos = player.component<Position>().get();
+ camPos.y = pos->y;
+ camPos.x = pos->x;
+ }
+ } catch (...) { // If the player doesn't exist or anything goes wrong
+ camPos.y = 0.0f;
+ camPos.x = 0.0f;
+ }
+
/**************
* LIGHTING *
**************/
-
std::vector<glm::vec3> lightPos;
std::vector<glm::vec4> lightColor;
@@ -103,7 +122,7 @@ void RenderSystem::update([[maybe_unused]] entityx::EntityManager& entities,
entities.each<Light, Position>([&]
(entityx::Entity, Light &l, Position &p){
- lightPos.push_back(glm::vec3(p.x, p.y,-10.0));
+ lightPos.push_back(glm::vec3(p.x, p.y, 1.0));
lightColor.push_back(glm::vec4(l.r, l.g, l.b, l.strength));
lightNum++;
});
@@ -132,8 +151,8 @@ void RenderSystem::update([[maybe_unused]] entityx::EntityManager& entities,
// e.component<Scripted>()->updateRender();
//}
- float w = r.texture.width/2.0f;
- float h = r.texture.height;
+ float w = 0.5f;
+ float h = (float)r.texture.height/r.texture.width;
GLuint tri_vbo;
GLfloat tri_data[] = {
@@ -179,9 +198,33 @@ void RenderSystem::update([[maybe_unused]] entityx::EntityManager& entities,
5*sizeof(float), (void*)(3*sizeof(float)));
glDrawArrays(GL_TRIANGLES, 0, 6);
});
+ glUniform1i(f, 0);
+
+ // If we were given a world VBO render it
+ if (worldVBO) {
+ glActiveTexture(GL_TEXTURE0);
+ glBindTexture(GL_TEXTURE_2D, worldTexture);
+ glUniform1i(q, 0);
+
+ glActiveTexture(GL_TEXTURE1);
+ glBindTexture(GL_TEXTURE_2D, worldNormal);
+ glUniform1i(n, 1);
+
+ glBindBuffer(GL_ARRAY_BUFFER, worldVBO);
+ //glBufferData(GL_ARRAY_BUFFER,
+ // wm.size() * sizeof(WorldMeshData),
+ // &wm.front(),
+ // GL_STREAM_DRAW);
- // Update all given VBOs
- for (auto& r : renders) {
+ 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)));
+ glDrawArrays(GL_TRIANGLES, 0, worldVertex);
+ }
+
+ // Update all UI VBOs
+ for (auto& r : uiRenders) {
auto& render = r.second;
glActiveTexture(GL_TEXTURE0);
@@ -293,7 +336,20 @@ int RenderSystem::init(void)
void RenderSystem::receive(const NewRenderEvent &nre)
{
- renders.insert_or_assign(nre.vbo,
- RenderData(nre.tex, nre.normal, nre.vertex));
+ uiRenders.insert_or_assign(nre.vbo,
+ UIRenderData(nre.tex, nre.normal, nre.vertex));
+}
+
+void RenderSystem::receive(const WorldMeshUpdateEvent &wmu)
+{
+ worldVBO = wmu.worldVBO;
+ worldVertex = wmu.numVertex;
+ worldTexture = wmu.worldTexture;
+ worldNormal = wmu.worldNormal;
+}
+
+void RenderSystem::receive(const entityx::ComponentAddedEvent<Player> &cae)
+{
+ player = cae.entity;
}
diff --git a/src/render.hpp b/src/render.hpp
index 3f632f1..eabf4be 100644
--- a/src/render.hpp
+++ b/src/render.hpp
@@ -36,18 +36,19 @@
#include "shader.hpp"
#include "world.hpp"
+#include "components/Player.hpp"
#include "events/render.hpp"
#include "events/world.hpp"
#include <map>
-struct RenderData
+struct UIRenderData
{
GLuint tex;
GLuint normal;
unsigned int vertex;
- RenderData(GLuint _tex, GLuint _normal, unsigned int _vertex) :
+ UIRenderData(GLuint _tex, GLuint _normal, unsigned int _vertex) :
tex(_tex), normal(_normal), vertex(_vertex) {}
};
@@ -66,7 +67,13 @@ private:
glm::vec3 camPos;
// Map of VBOs and their render data
- std::map<GLuint, RenderData> renders;
+ std::map<GLuint, UIRenderData> uiRenders;
+
+ 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() :
@@ -100,9 +107,9 @@ public:
/************
* EVENTS *
************/
- //void receive(const WorldMeshUpdateEvent &wmu);
-
+ void receive(const WorldMeshUpdateEvent &wmu);
void receive(const NewRenderEvent &nre);
+ void receive(const entityx::ComponentAddedEvent<Player> &cae);
};
#endif // SYSTEM_RENDER_HPP_
diff --git a/src/script.cpp b/src/script.cpp
index ec8f5c7..6cda627 100644
--- a/src/script.cpp
+++ b/src/script.cpp
@@ -187,10 +187,6 @@ sol::table ScriptSystem::spawn(sol::object param)
e.assign<Velocity>(Velocity().FromLua(tab["Velocity"])).get();
}
- if (tab["Player"] != nullptr) {
- (*toRet)["Player"] = e.assign<Player>().get();
- }
-
if (tab["Physics"] != nullptr) {
if (!e.has_component<Position>()) // Position must exist for phys.
(*toRet)["Position"] = e.assign<Position>().get();
@@ -213,6 +209,10 @@ sol::table ScriptSystem::spawn(sol::object param)
e.assign<EventListener>(listeners);
}
+ if (tab["Player"] != nullptr) {
+ (*toRet)["Player"] = e.assign<Player>().get();
+ }
+
} else {
// TODO better logging
std::cerr << "Parameter to spawn() must be a table!" << std::endl;
diff --git a/src/world.cpp b/src/world.cpp
index 9f69c45..93cf511 100644
--- a/src/world.cpp
+++ b/src/world.cpp
@@ -181,6 +181,31 @@ unsigned int World::setSeed(unsigned int s)
return seed;
}
+/* 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;
+ }
+ }
+ }
+ } catch (...) { // If we get any errors, just let the character
+ return y;
+ }
+
+ return Y;
+}
+
/******************
* WORLD SYSTEM *
@@ -189,8 +214,6 @@ unsigned int World::setSeed(unsigned int s)
World* WorldSystem::addWorld(sol::object t)
{
worlds.push_back(World(t));
- if (currentWorld == nullptr)
- currentWorld = &(worlds.back());
return &(worlds.back());
}
diff --git a/src/world.hpp b/src/world.hpp
index 696f0aa..9314fa6 100644
--- a/src/world.hpp
+++ b/src/world.hpp
@@ -112,6 +112,9 @@ public:
/* SEED */
unsigned int getSeed();
unsigned int setSeed(unsigned int);
+
+ /* PHYSICS */
+ double getHeight(double x, double y, double z);
};
/**
generated by cgit v1.2.3 (git 2.39.1) at 2025-04-04 23:05:55 +0000