aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/attack.cpp45
-rw-r--r--src/inventory.cpp2
-rw-r--r--src/player.cpp8
-rw-r--r--src/render.cpp1
-rw-r--r--src/texture.cpp43
5 files changed, 92 insertions, 7 deletions
diff --git a/src/attack.cpp b/src/attack.cpp
index f8a9033..f585a73 100644
--- a/src/attack.cpp
+++ b/src/attack.cpp
@@ -4,6 +4,7 @@
#include <engine.hpp>
#include <particle.hpp>
#include <player.hpp>
+#include <render.hpp>
#include <world.hpp>
// math helpers because we don't trust stdlib
@@ -25,6 +26,8 @@ bool inrange(float point, float left, float right)
return point > left && point < right;
}
+std::vector<AttackSystem::AttackAnimation> AttackSystem::effects;
+
void AttackSystem::receive(const AttackEvent& ae)
{
attacks.emplace_front(ae);
@@ -42,7 +45,10 @@ void AttackSystem::update(entityx::EntityManager& en, entityx::EventManager& ev,
en.each<Health, Position, Solid>([&](entityx::Entity e, Health& health, Position& pos, Solid& dim) {
if (!e.has_component<Player>() && inrange(ppos.x, pos.x, pos.x + dim.width) && inrange(ppos.y, pos.y - 2, pos.y + dim.height)) {
health.health -= hit.damage;
- e.replace<Flash>(Color(255, 0, 0));
+ if (hit.effect.size() == 0)
+ e.replace<Flash>(Color(255, 0, 0));
+ else
+ effects.emplace_back(vec2(ppos.x, ppos.y), hit.effect);
ParticleSystem::addMultiple(15, ParticleType::SmallBlast,
[&](){ return vec2(pos.x + dim.width / 2, pos.y + dim.height / 2); }, 300, 7);
die = !hit.pierce;
@@ -68,9 +74,13 @@ void AttackSystem::update(entityx::EntityManager& en, entityx::EventManager& ev,
if (inrange(point.x, pos.x, pos.x + dim.width, HLINES(size.x)) &&
inrange(point.y, pos.y, pos.y + dim.height, HLINES(size.y))) {
h.health -= a.attack.power;
- e.replace<Flash>(Color(255, 0, 0));
- ParticleSystem::addMultiple(15, ParticleType::DownSlash,
- [&](){ return vec2(pos.x + dim.width / 2, pos.y + dim.height / 2); }, 300, 7);
+
+ if (a.attack.effect.size() == 0)
+ e.replace<Flash>(Color(255, 0, 0));
+ else
+ effects.emplace_back(point, a.attack.effect);
+ //ParticleSystem::addMultiple(15, ParticleType::DownSlash,
+ // [&](){ return vec2(pos.x + dim.width / 2, pos.y + dim.height / 2); }, 300, 7);
}
}
);
@@ -79,3 +89,30 @@ void AttackSystem::update(entityx::EntityManager& en, entityx::EventManager& ev,
attacks.clear();
}
+#define RATE 3
+void AttackSystem::render(void)
+{
+ float z = -9.9f;
+ Render::worldShader.use();
+ Render::worldShader.enable();
+ for (auto& ae : effects) {
+ ae.effect(ae.counter / RATE); // bind current frame
+ auto dim = ae.effect.getTextureDim();
+ GLfloat verts[] = {
+ ae.pos.x, ae.pos.y, z, 0, 0,
+ ae.pos.x + dim.x, ae.pos.y, z, 1, 0,
+ ae.pos.x + dim.x, ae.pos.y + dim.y, z, 1, 1,
+ ae.pos.x + dim.x, ae.pos.y + dim.y, z, 1, 1,
+ ae.pos.x, ae.pos.y + dim.y, z, 0, 1,
+ ae.pos.x, ae.pos.y, z, 0, 0
+ };
+ glVertexAttribPointer(Render::worldShader.coord, 3, GL_FLOAT, GL_FALSE, 5 * sizeof(GLfloat), verts);
+ glVertexAttribPointer(Render::worldShader.tex, 2, GL_FLOAT, GL_FALSE, 5 * sizeof(GLfloat), verts + 3);
+ glDrawArrays(GL_TRIANGLES, 0, 6);
+ }
+ Render::worldShader.disable();
+ Render::worldShader.unuse();
+
+ effects.erase(std::remove_if(effects.begin(), effects.end(), [](auto& e) { return ++e.counter >= e.effect.size() * RATE; }),
+ effects.end());
+}
diff --git a/src/inventory.cpp b/src/inventory.cpp
index 495526a..95ab523 100644
--- a/src/inventory.cpp
+++ b/src/inventory.cpp
@@ -78,6 +78,8 @@ void InventorySystem::loadItems(void) {
attack.range = atk->StrAttribute("range");
attack.vel = atk->StrAttribute("velocity");
attack.accel = atk->StrAttribute("accel");
+ if (atk->Attribute("effect") != nullptr)
+ attack.effect.appendGIF(atk->StrAttribute("effect"));
attackList.emplace(item.name, attack);
}
diff --git a/src/player.cpp b/src/player.cpp
index 6674da0..3606bc7 100644
--- a/src/player.cpp
+++ b/src/player.cpp
@@ -227,7 +227,7 @@ void PlayerSystem::receive(const UseItemEvent& uie)
uie.attack->range.x *= -1;
game::events.emit<AttackEvent>(loc, *uie.attack, true);
} else if (uie.item->type == "Bow") {
- /*if (InventorySystem::take("Arrow", 1)) {
+ if (InventorySystem::take("Arrow", 1)) {
auto e = game::entities.create();
auto pos = getPosition();
e.assign<Position>(pos.x, pos.y + 10);
@@ -242,8 +242,10 @@ void PlayerSystem::receive(const UseItemEvent& uie)
sprite->addSpriteSegment(SpriteData(tex->sprite), 0);
auto dim = HLINES(sprite->getSpriteSize());
e.assign<Solid>(dim.x, dim.y);
- e.assign<Hit>(10, false);
- }*/
+ e.assign<Hit>(uie.attack->power, false);
+ if (uie.attack->effect.size() > 0)
+ e.component<Hit>()->effect = uie.attack->effect;
+ }
}
cool.store(false);
diff --git a/src/render.cpp b/src/render.cpp
index 58674a1..baa08ee 100644
--- a/src/render.cpp
+++ b/src/render.cpp
@@ -178,6 +178,7 @@ void render(const int& fps)
WorldSystem::render();
ParticleSystem::render();
+ AttackSystem::render();
RenderSystem::render();
InventorySystem::render();
diff --git a/src/texture.cpp b/src/texture.cpp
index 44e48a0..19aae3f 100644
--- a/src/texture.cpp
+++ b/src/texture.cpp
@@ -9,6 +9,7 @@
#include <config.hpp>
#include <debug.hpp>
#include <error.hpp>
+#include <gif_lib.h>
namespace Colors
{
@@ -149,6 +150,48 @@ void TextureIterator::operator()(const int &index)
position->use();
}
+void TextureIterator::appendGIF(const std::string& gif)
+{
+ int* error = nullptr;
+ auto handle = DGifOpenFileName(gif.c_str(), error);
+ UserAssert(handle != nullptr && error == nullptr, "Failed to load GIF: " + gif);
+ UserAssert(DGifSlurp(handle) == GIF_OK, "Failed to extract from GIF: " + gif);
+
+ for (int i = 0; i < handle->ImageCount; i++) {
+ vec2 dim (handle->SavedImages[i].ImageDesc.Width,
+ handle->SavedImages[i].ImageDesc.Height);
+ int pcount = dim.x * dim.y;
+ auto buf = new GLubyte[pcount * 4];
+ auto bits = handle->SavedImages[i].RasterBits;
+ auto map = handle->SColorMap->Colors;
+ for (int j = 0; j < pcount; j++) {
+ //if (bits[j * 4] == handle->SBackGroundColor) {
+ auto c = map[bits[j]];
+ if (c.Red == 0xFF && c.Green == 0xFF && c.Blue == 0xFF) {
+ buf[j * 4] = buf[j * 4 + 1] = buf[j * 4 + 2] = buf[j * 4 + 3] = 0;
+ } else {
+ buf[j * 4 + 0] = c.Red;
+ buf[j * 4 + 1] = c.Green;
+ buf[j * 4 + 2] = c.Blue;
+ buf[j * 4 + 3] = 0xFF;
+ }
+ }
+
+ GLuint object;
+ glGenTextures(1, &object);
+ glBindTexture(GL_TEXTURE_2D, object);
+ glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+ glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+ glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
+ glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
+ glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
+ glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, dim.x, dim.y, 0, GL_RGBA,
+ GL_UNSIGNED_BYTE, buf);
+
+ textures.emplace_back(gif, object, dim);
+ delete[] buf;
+ }
+}
void unloadTextures(void)
{
generated by cgit v1.2.3 (git 2.39.1) at 2025-04-05 07:36:23 +0000