aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--include/common.hpp6
-rw-r--r--include/components.hpp21
-rw-r--r--src/components.cpp14
-rw-r--r--src/world.cpp29
-rw-r--r--xml/entities.xml30
5 files changed, 70 insertions, 30 deletions
diff --git a/include/common.hpp b/include/common.hpp
index 7b98ea9..3caa083 100644
--- a/include/common.hpp
+++ b/include/common.hpp
@@ -58,11 +58,7 @@ typedef unsigned int uint;
#define BREAKPOINT __asm__("int $3")
-template<typename T>
-inline const T * const& coalesce(const void * &p1, const void * &p2)
-{
- return ((p1 == nullptr) ? reinterpret_cast<T*>(p2) : p1);
-}
+#define coalesce(v1, v2) ((v1 != nullptr) ? v1 : v2)
/**
* Creates a coordinate of integers.
diff --git a/include/components.hpp b/include/components.hpp
index 4f8ef56..d630f83 100644
--- a/include/components.hpp
+++ b/include/components.hpp
@@ -216,21 +216,24 @@ struct Animate {
// COMMENT
std::vector<Frame> frame;
// COMMENT
- std::vector<Frame>::iterator currentFrame;
+ uint index;
Animate(){
- currentFrame = std::begin(frame);
+ index = 0;
}
// COMMENT
Frame nextFrame() {
- std::rotate(frame.begin(), frame.begin()+1, frame.end());
- return frame[0];
- /*if (currentFrame < std::end(frame))
- return (*currentFrame++);
- else
- currentFrame = std::begin(frame);
- return (*currentFrame);*/
+ if (index < frame.size() - 1) {
+ index++;
+ } else {
+ index = 0;
+ }
+ return frame.at(index);
+ }
+
+ Frame firstFrame() {
+ return frame.front();
}
};
diff --git a/src/components.cpp b/src/components.cpp
index a398bec..612e522 100644
--- a/src/components.cpp
+++ b/src/components.cpp
@@ -19,6 +19,13 @@ void MovementSystem::update(entityx::EntityManager &en, entityx::EventManager &e
position.x += direction.x * dt;
position.y += direction.y * dt;
+ if (entity.has_component<Animate>() && entity.has_component<Sprite>()) {
+ if (direction.x) {
+ entity.component<Sprite>().get()->sprite = entity.component<Animate>().get()->nextFrame();
+ } else {
+ entity.component<Sprite>().get()->sprite = entity.component<Animate>().get()->firstFrame();
+ }
+ }
if (entity.has_component<Dialog>() && entity.component<Dialog>()->talking) {
direction.x = 0;
} else {
@@ -73,6 +80,7 @@ void RenderSystem::update(entityx::EntityManager &en, entityx::EventManager &ev,
Render::worldShader.use();
en.each<Visible, Sprite, Position>([dt](entityx::Entity entity, Visible &visible, Sprite &sprite, Position &pos) {
+ (void)entity;
// Verticies and shit
GLfloat tex_coord[] = {0.0, 0.0,
1.0, 0.0,
@@ -90,9 +98,8 @@ void RenderSystem::update(entityx::EntityManager &en, entityx::EventManager &ev,
1.0, 1.0,
1.0, 0.0};
- if (entity.has_component<Animate>()) {
- sprite.sprite = entity.component<Animate>().get()->nextFrame();
- }
+ if (entity.has_component<Animate>())
+ sprite.sprite = entity.component<Animate>()->nextFrame();
for (auto &S : sprite.sprite) {
float width = HLINES(S.first.size.x);
@@ -270,7 +277,6 @@ std::vector<Frame> developFrame(XMLElement* xml)
std::string sname = sxml->Name();
if (sname == "src") {
tmpf.push_back(std::make_pair(SpriteData(sxml->GetText(), vec2(0,0)), vec2(0,0)));
- std::cout << tmpf.back().first.pic << std::endl;
}
sxml = sxml->NextSiblingElement();
}
diff --git a/src/world.cpp b/src/world.cpp
index 68b8f34..4a7e284 100644
--- a/src/world.cpp
+++ b/src/world.cpp
@@ -1043,19 +1043,22 @@ void WorldSystem::render(void)
static const auto blackTex = Texture::genColor(Color(0, 0, 0));
static const float sheight = static_cast<float>(SCREEN_HEIGHT);
+
if (offset.x + world.startX > s) {
glBindTexture(GL_TEXTURE_2D, blackTex);
glUniform1f(Render::worldShader.uniform[WU_light_impact], 0.0f);
+ auto off = offset.y - static_cast<float>(SCREEN_HEIGHT) / 2.0f;
+
GLfloat blackBarLeft[] = {
- s, 0.0f, -3.5f, 0.0f, 0.0f,
- world.startX, 0.0f, -3.5f, 1.0f, 0.0f,
- world.startX, sheight, -3.5f, 1.0f, 1.0f,
+ s, 0.0f + off, -3.5f, 0.0f, 0.0f,
+ world.startX, 0.0f + off, -3.5f, 1.0f, 0.0f,
+ world.startX, sheight + off, -3.5f, 1.0f, 1.0f,
- world.startX, sheight, -3.5f, 1.0f, 1.0f,
- s, sheight, -3.5f, 0.0f, 1.0f,
- s, 0.0f, -3.5f, 0.0f, 0.0f
+ world.startX, sheight + off, -3.5f, 1.0f, 1.0f,
+ s, sheight + off, -3.5f, 0.0f, 1.0f,
+ s, 0.0f + off, -3.5f, 0.0f, 0.0f
};
glVertexAttribPointer(Render::worldShader.coord, 3, GL_FLOAT, GL_FALSE, sizeof(GLfloat) * 5, &blackBarLeft[0]);
@@ -1066,15 +1069,17 @@ void WorldSystem::render(void)
if (offset.x - world.startX < e) {
glBindTexture(GL_TEXTURE_2D, blackTex);
glUniform1f(Render::worldShader.uniform[WU_light_impact], 0.0f);
+
+ auto off = offset.y - static_cast<float>(SCREEN_HEIGHT) / 2.0f;
GLfloat blackBarRight[] = {
- -(world.startX), 0.0f, -3.5f, 0.0f, 0.0f,
- e, 0.0f, -3.5f, 1.0f, 0.0f,
- e, sheight, -3.5f, 1.0f, 1.0f,
+ -(world.startX), 0.0f + off, -3.5f, 0.0f, 0.0f,
+ e, 0.0f + off, -3.5f, 1.0f, 0.0f,
+ e, sheight + off, -3.5f, 1.0f, 1.0f,
- e, sheight, -3.5f, 1.0f, 1.0f,
- -(world.startX), sheight, -3.5f, 0.0f, 1.0f,
- -(world.startX), 0.0f, -3.5f, 0.0f, 0.0f
+ e, sheight + off, -3.5f, 1.0f, 1.0f,
+ -(world.startX), sheight + off, -3.5f, 0.0f, 1.0f,
+ -(world.startX), 0.0f + off, -3.5f, 0.0f, 0.0f
};
glVertexAttribPointer(Render::worldShader.coord, 3, GL_FLOAT, GL_FALSE, sizeof(GLfloat) * 5, &blackBarRight[0]);
diff --git a/xml/entities.xml b/xml/entities.xml
index 0d2a519..b447dc3 100644
--- a/xml/entities.xml
+++ b/xml/entities.xml
@@ -39,6 +39,36 @@
<frame>
<src>assets/NPC_Walk0.png</src>
</frame>
+ <frame>
+ <src>assets/NPC_Walk9.png</src>
+ </frame>
+ <frame>
+ <src>assets/NPC_Walk8.png</src>
+ </frame>
+ <frame>
+ <src>assets/NPC_Walk7.png</src>
+ </frame>
+ <frame>
+ <src>assets/NPC_Walk6.png</src>
+ </frame>
+ <frame>
+ <src>assets/NPC_Walk5.png</src>
+ </frame>
+ <frame>
+ <src>assets/NPC_Walk4.png</src>
+ </frame>
+ <frame>
+ <src>assets/NPC_Walk3.png</src>
+ </frame>
+ <frame>
+ <src>assets/NPC_Walk2.png</src>
+ </frame>
+ <frame>
+ <src>assets/NPC_Walk.png</src>
+ </frame>
+ <frame>
+ <src>assets/NPC.png</src>
+ </frame>
</movement>
</Animation>
<Direction />
generated by cgit v1.2.3 (git 2.39.1) at 2025-04-06 01:09:30 +0000