diff options
| -rw-r--r-- | brice.dat | 7 | ||||
| -rw-r--r-- | include/components.hpp | 14 | ||||
| -rw-r--r-- | include/world.hpp | 22 | ||||
| -rw-r--r-- | src/engine.cpp | 4 | ||||
| -rw-r--r-- | src/world.cpp | 526 | ||||
| -rw-r--r-- | xml/!town.xml | 4 |
6 files changed, 296 insertions, 281 deletions
diff --git a/brice.dat b/brice.dat deleted file mode 100644 index 308f5c8..0000000 --- a/brice.dat +++ /dev/null @@ -1,7 +0,0 @@ -3 -Slow -0 -canJump -1 -canSprint -1 diff --git a/include/components.hpp b/include/components.hpp index 34a1906..5a638de 100644 --- a/include/components.hpp +++ b/include/components.hpp @@ -60,6 +60,20 @@ struct Physics { }; /** + * @struct Health + * @brief Gives and entity health and stuff. + */ +struct Health { + /** + * Constructor that sets the variables, with 0 health as default. + */ + Health(int h = 0, int m = 0) : health(h), maxHealth(m) {} + + int health; + int maxHealth; +}; + +/** * @struct Solid * @brief Allows an entity to collide with other objects. * When an entity has this component it can collide with the world and other objects. diff --git a/include/world.hpp b/include/world.hpp index a99affa..a574401 100644 --- a/include/world.hpp +++ b/include/world.hpp @@ -175,6 +175,11 @@ public: { return weather; } void setWeather(const std::string &s); + + void singleDetect(Entity *e, entityx::TimeDelta dt); + void detect(entityx::TimeDelta dt); + + void detect2(entityx::TimeDelta dt); }; @@ -254,11 +259,6 @@ public: std::vector<Entity *> entityPending; /** - * Handles death, gravity, etc. for a single entity - */ - virtual void singleDetect(Entity *e); - - /** * Destroys entities and clears vectors that contain them. * This function is only called in the world destructor. */ @@ -307,18 +307,6 @@ public: virtual void draw(Player *p); /** - * Handles physics for all entities and the player. - * - * @see singleDetect() - */ - void detect(Player *p); - - /** - * Updates entity positions, time of day, and music. - */ - void update(Player *p, unsigned int delta); - - /** * Gets the width of the world, presumably in pixels. * TODO */ diff --git a/src/engine.cpp b/src/engine.cpp index b4677a9..9a362e1 100644 --- a/src/engine.cpp +++ b/src/engine.cpp @@ -37,9 +37,7 @@ void Engine::update(entityx::TimeDelta dt) systems.update<InputSystem>(dt); systems.update<InventorySystem>(dt); systems.update<PlayerSystem>(dt); - - currentWorld->update(player, dt); - currentWorld->detect(player); + systems.update<WorldSystem>(dt); } diff --git a/src/world.cpp b/src/world.cpp index 40edbb1..1290aa7 100644 --- a/src/world.cpp +++ b/src/world.cpp @@ -17,6 +17,7 @@ #include <render.hpp> #include <engine.hpp> +#include <components.hpp> // local library headers #include <tinyxml2.h> @@ -342,258 +343,6 @@ void World::draw(Player *p) } /** - * Handles physics and such for a single entity. - * This function is kept private, as World::detect() should be used instead to - * handle stuffs for all entities at once. - */ -void World:: -singleDetect(Entity *e) -{ - std::string killed; - unsigned int i; - int l; - - auto deltaTime = game::time::getDeltaTime(); - - if (e == nullptr) - return; - - // kill dead entities - if (!e->isAlive()) { - return; - } else if (e->health <= 0) { - // die - e->die(); - if (inBattle && e->type == MOBT) - Mobp(e)->onDeath(); - - // delete the entity - for (i = 0; i < entity.size(); i++) { - if (entity[i] == e) { - switch (e->type) { - case STRUCTURET: - killed = " structure"; - break; - case NPCT: - killed = "n NPC"; - break; - case MOBT: - killed = " mob"; - break; - case OBJECTT: - killed = "n object"; - break; - default: - break; - } - - std::cout << "Killed a" << killed << "...\n"; - entity.erase(entity.begin() + i); - return; - } - } - - // exit on player death - std::cout << "RIP " << e->name << ".\n"; - exit(0); - } - - // collision / gravity: handle only living entities - else { - - // forced movement gravity (sword hits) - e->handleHits(); - - // calculate the line that this entity is currently standing on - l = std::clamp(static_cast<int>((e->loc.x + e->width / 2 - worldStart) / game::HLINE), - 0, - static_cast<int>(lineCount)); - - // if the entity is under the world/line, pop it back to the surface - if (e->loc.y < worldData[l].groundHeight) { - int dir = e->vel.x < 0 ? -1 : 1; - if (l + (dir * 2) < static_cast<int>(worldData.size()) && - worldData[l + (dir * 2)].groundHeight - 30 > worldData[l + dir].groundHeight) { - e->loc.x -= (PLAYER_SPEED_CONSTANT + 2.7f) * e->speed * 2 * dir; - e->vel.x = 0; - } else { - e->loc.y = worldData[l].groundHeight - 0.001f * deltaTime; - e->ground = true; - e->vel.y = 0; - } - - } - - // handle gravity if the entity is above the line - else { - if (e->type == STRUCTURET) { - e->loc.y = worldData[l].groundHeight; - e->vel.y = 0; - e->ground = true; - return; - } else if (e->vel.y > -2) { - e->vel.y -= GRAVITY_CONSTANT * deltaTime; - } - } - - // insure that the entity doesn't fall off either edge of the world. - if (e->loc.x < worldStart) { - e->vel.x = 0; - e->loc.x = worldStart + HLINES(0.5f); - } else if (e->loc.x + e->width + game::HLINE > worldStart + worldStart * -2) { - e->vel.x = 0; - e->loc.x = worldStart + worldStart * -2 - e->width - game::HLINE; - } - } -} - -/** - * Handle entity logic for the world. - * - * This function runs World::singleDetect() for the player and every entity - * currently in a vector of this world. Particles and village entrance/exiting - * are also handled here. - */ -void World:: -detect(Player *p) -{ - int l; - - // handle the player - singleDetect(p); - //std::thread(&World::singleDetect, this, p).detach(); - - // handle other entities - for (auto &e : entity) - singleDetect(e); - //std::thread(&World::singleDetect, this, e).detach(); - - // qwertyuiop - partMutex.lock(); - // handle particles - for (auto &part : particles) { - // get particle's current world line - l = std::clamp(static_cast<int>((part.loc.x + part.width / 2 - worldStart) / game::HLINE), - 0, - static_cast<int>(lineCount - 1)); - part.update(GRAVITY_CONSTANT, worldData[l].groundHeight); - } - - // handle particle creation - for (auto &e : entity) { - if (e->type == STRUCTURET) { - auto b = dynamic_cast<Structures *>(e); - switch (b->bsubtype) { - case FOUNTAIN: - for (unsigned int r = (randGet() % 25) + 11; r--;) { - addParticle(randGet() % HLINES(3) + b->loc.x + b->width / 2, // x - b->loc.y + b->height, // y - HLINES(1.25), // width - HLINES(1.25), // height - randGet() % 7 * .01 * (randGet() % 2 == 0 ? -1 : 1), // vel.x - randGet() % 1 ? (8 + randGet() % 6) * .05 : (4 + randGet() % 6) * .05, // vel.y - { 0, 0, 255 }, // RGB color - 2500 // duration (ms) - ); - particles.back().fountain = true; - particles.back().stu = b; - } - break; - case FIRE_PIT: - for(unsigned int r = (randGet() % 20) + 11; r--;) { - addParticle(randGet() % (int)(b->width / 2) + b->loc.x + b->width / 4, // x - b->loc.y + HLINES(3), // y - game::HLINE, // width - game::HLINE, // height - randGet() % 3 * .01 * (randGet() % 2 == 0 ? -1 : 1), // vel.x - (4 + randGet() % 6) * .005, // vel.y - { 255, 0, 0 }, // RGB color - 400 // duration (ms) - ); - particles.back().gravity = false; - particles.back().behind = true; - particles.back().stu = b; - } - break; - default: - break; - } - } - } - partMutex.unlock(); - - // draws the village welcome message if the player enters the village bounds - for (auto &v : village) { - if (p->loc.x > v.start.x && p->loc.x < v.end.x) { - if (!v.in) { - ui::passiveImportantText(5000, "Welcome to %s", v.name.c_str()); - v.in = true; - } - } else { - v.in = false; - } - } -} - -/** - * Updates all entity and player coordinates with their velocities. - * Also handles music fading, although that could probably be placed elsewhere. - */ -void World:: -update(Player *p, unsigned int delta) -{ - // update player coords - p->loc.y += p->vel.y * delta; - p->loc.x +=(p->vel.x * p->speed) * delta; - - // handle high-ness - if (p->loc.y > 5000) - UserError("Too high for me m8."); - - // update entity coords - for (auto &e : entity) { - // dont let structures move? - if (e->type != STRUCTURET && e->canMove) { - e->loc.x += e->vel.x * delta; - e->loc.y += e->vel.y * delta; - - // update boolean directions - e->left = e->vel.x ? (e->vel.x < 0) : e->left; - } else if (e->vel.y < 0) { - e->loc.y += e->vel.y * delta; - } - } - - partMutex.lock(); - // iterate through particles - particles.remove_if([](const Particles &part) { - return part.duration <= 0; - }); - - for (auto &pa : particles) { - if (pa.canMove) { // causes overhead - pa.loc.y += pa.vel.y * game::time::getDeltaTime(); - pa.loc.x += pa.vel.x * game::time::getDeltaTime(); - - if (pa.stu != nullptr) { - if (pa.loc.x >= pa.stu->loc.x && pa.loc.x <= pa.stu->loc.x + pa.stu->width && - pa.loc.y <= pa.stu->loc.y + pa.stu->height * 0.25f) - pa.duration = 0; - } - } - } - partMutex.unlock(); - - // add entities if need be - if (!entityPending.empty()) { - while (entityPending.size() > 0) { - entity.push_back(entityPending.back()); - entityPending.pop_back(); - } - } -} - -/** * Get's the world's width in pixels. */ int World:: @@ -1669,6 +1418,57 @@ void WorldSystem::update(entityx::EntityManager &en, entityx::EventManager &ev, // fade in music if not playing if (bgmObj != nullptr && !Mix_PlayingMusic()) Mix_FadeInMusic(bgmObj, -1, 2000); + + // update player coords + player->loc.y += player->vel.y * dt; + player->loc.x += (player->vel.x * player->speed) * dt; + + // update entity coords + for (auto &e : world->entity) { + // dont let structures move? + if (e->type != STRUCTURET && e->canMove) { + e->loc.x += e->vel.x * dt; + e->loc.y += e->vel.y * dt; + + // update boolean directions + e->left = e->vel.x ? (e->vel.x < 0) : e->left; + } else if (e->vel.y < 0) { + e->loc.y += e->vel.y * dt; + } + } + + partMutex.lock(); + // iterate through particles + world->particles.remove_if([](const Particles &part) { + return part.duration <= 0; + }); + + for (auto &pa : world->particles) { + if (pa.canMove) { // causes overhead + pa.loc.y += pa.vel.y * dt; + pa.loc.x += pa.vel.x * dt; + + if (pa.stu != nullptr) { + if (pa.loc.x >= pa.stu->loc.x && pa.loc.x <= pa.stu->loc.x + pa.stu->width && + pa.loc.y <= pa.stu->loc.y + pa.stu->height * 0.25f) + pa.duration = 0; + } + } + } + partMutex.unlock(); + + // add entities if need be + auto& entityPending = world->entityPending; + + if (!entityPending.empty()) { + while (entityPending.size() > 0) { + world->entity.push_back(entityPending.back()); + entityPending.pop_back(); + } + } + + // run detect stuff + detect(dt); } void WorldSystem::render(void) @@ -2054,3 +1854,225 @@ void WorldSystem::setWeather(const std::string &s) weather = WorldWeather::None; } + +void WorldSystem::singleDetect(Entity *e, entityx::TimeDelta dt) +{ + std::string killed; + unsigned int i; + int l; + + auto& worldData = world->worldData; + + if (e == nullptr || !(e->isAlive())) + return; + + // kill dead entities + if (e->health <= 0) { + // die + e->die(); + if (inBattle && e->type == MOBT) + Mobp(e)->onDeath(); + + // delete the entity + for (i = 0; i < world->entity.size(); i++) { + if (world->entity[i] == e) { + switch (e->type) { + case STRUCTURET: + killed = " structure"; + break; + case NPCT: + killed = "n NPC"; + break; + case MOBT: + killed = " mob"; + break; + case OBJECTT: + killed = "n object"; + break; + default: + break; + } + + std::cout << "Killed a" << killed << "...\n"; + world->entity.erase(world->entity.begin() + i); + return; + } + } + + // exit on player death + std::cout << "RIP " << e->name << ".\n"; + exit(0); + } + + // collision / gravity: handle only living entities + else { + + // forced movement gravity (sword hits) + e->handleHits(); + + // calculate the line that this entity is currently standing on + l = std::clamp(static_cast<int>((e->loc.x + e->width / 2 - world->worldStart) / game::HLINE), + 0, + static_cast<int>(world->lineCount)); + + // if the entity is under the world/line, pop it back to the surface + if (e->loc.y < worldData[l].groundHeight) { + int dir = e->vel.x < 0 ? -1 : 1; + if (l + (dir * 2) < static_cast<int>(worldData.size()) && + worldData[l + (dir * 2)].groundHeight - 30 > worldData[l + dir].groundHeight) { + e->loc.x -= (PLAYER_SPEED_CONSTANT + 2.7f) * e->speed * 2 * dir; + e->vel.x = 0; + } else { + e->loc.y = worldData[l].groundHeight - 0.001f * dt; + e->ground = true; + e->vel.y = 0; + } + + } + + // handle gravity if the entity is above the line + else { + if (e->type == STRUCTURET) { + e->loc.y = worldData[l].groundHeight; + e->vel.y = 0; + e->ground = true; + return; + } else if (e->vel.y > -2) { + e->vel.y -= GRAVITY_CONSTANT * dt; + } + } + + // insure that the entity doesn't fall off either edge of the world. + if (e->loc.x < world->worldStart) { + e->vel.x = 0; + e->loc.x = world->worldStart + HLINES(0.5f); + } else if (e->loc.x + e->width + game::HLINE > -((int)world->worldStart)) { + e->vel.x = 0; + e->loc.x = -((int)world->worldStart) - e->width - game::HLINE; + } + } +} + +void WorldSystem::detect2(entityx::TimeDelta dt) +{ + game::entities.each<Position, Direction, Health, Solid>( + [&](entityx::Entity e, Position &loc, Direction &vel, Health &health, Solid &dim) { + + (void)e; + + if (health.health <= 0) + UserError("die mofo"); + + // get the line the entity is on + int line = std::clamp(static_cast<int>((loc.x + dim.width / 2 - world->worldStart) / game::HLINE), + 0, + static_cast<int>(world->lineCount)); + + // make sure entity is above ground + auto& data = world->worldData; + if (loc.y < data[line].groundHeight) { + int dir = vel.x < 0 ? -1 : 1; + if (line + dir * 2 < static_cast<int>(data.size()) && + data[line + dir * 2].groundHeight - 30 > data[line + dir].groundHeight) { + loc.x -= (PLAYER_SPEED_CONSTANT + 2.7f) * dir * 2; + vel.x = 0; + } else { + loc.y = data[line].groundHeight - 0.001f * dt; + vel.y = 0; + // TODO ground flag + } + } + + // handle gravity + else if (vel.y > -2.0f) { + vel.y -= GRAVITY_CONSTANT * dt; + } + + // insure that the entity doesn't fall off either edge of the world. + if (loc.x < world->worldStart) { + vel.x = 0; + loc.x = world->worldStart + HLINES(0.5f); + } else if (loc.x + dim.width + game::HLINE > -((int)world->worldStart)) { + vel.x = 0; + loc.x = -((int)world->worldStart) - dim.width - game::HLINE; + } + }); +} + +void WorldSystem::detect(entityx::TimeDelta dt) +{ + int l; + + // handle the player + singleDetect(player, dt); + + // handle other entities + for (auto &e : world->entity) + singleDetect(e, dt); + + partMutex.lock(); + // handle particles + for (auto &part : world->particles) { + // get particle's current world line + l = std::clamp(static_cast<int>((part.loc.x + part.width / 2 - world->worldStart) / game::HLINE), + 0, + static_cast<int>(world->lineCount - 1)); + part.update(GRAVITY_CONSTANT, world->worldData[l].groundHeight); + } + + // handle particle creation + for (auto &e : world->entity) { + if (e->type == STRUCTURET) { + auto b = dynamic_cast<Structures *>(e); + switch (b->bsubtype) { + case FOUNTAIN: + for (unsigned int r = (randGet() % 25) + 11; r--;) { + world->addParticle(randGet() % HLINES(3) + b->loc.x + b->width / 2, // x + b->loc.y + b->height, // y + HLINES(1.25), // width + HLINES(1.25), // height + randGet() % 7 * .01 * (randGet() % 2 == 0 ? -1 : 1), // vel.x + randGet() % 1 ? (8 + randGet() % 6) * .05 : (4 + randGet() % 6) * .05,// vel.y + { 0, 0, 255 }, // RGB color + 2500 // duration (ms) + ); + world->particles.back().fountain = true; + world->particles.back().stu = b; + } + break; + case FIRE_PIT: + for(unsigned int r = (randGet() % 20) + 11; r--;) { + world->addParticle(randGet() % (int)(b->width / 2) + b->loc.x + b->width / 4, // x + b->loc.y + HLINES(3), // y + game::HLINE, // width + game::HLINE, // height + randGet() % 3 * .01 * (randGet() % 2 == 0 ? -1 : 1), // vel.x + (4 + randGet() % 6) * .005, // vel.y + { 255, 0, 0 }, // RGB color + 400 // duration (ms) + ); + world->particles.back().gravity = false; + world->particles.back().behind = true; + world->particles.back().stu = b; + } + break; + default: + break; + } + } + } + partMutex.unlock(); + + // draws the village welcome message if the player enters the village bounds + for (auto &v : world->village) { + if (player->loc.x > v.start.x && player->loc.x < v.end.x) { + if (!v.in) { + ui::passiveImportantText(5000, "Welcome to %s", v.name.c_str()); + v.in = true; + } + } else { + v.in = false; + } + } +} + diff --git a/xml/!town.xml b/xml/!town.xml index 3ac9772..fd14db3 100644 --- a/xml/!town.xml +++ b/xml/!town.xml @@ -4,8 +4,8 @@ <generation type="Random" width="1600"/> <time>6000</time> <spawnx>-300</spawnx> - <npc name="Sanc" hasDialog="true" health="1" x="64.841042" y="68.19912" dindex="0"/> - <npc name="Bob" hasDialog="true" spawnx="30" health="1" x="94.841454" y="68.79911" dindex="0"/> + <npc name="Sanc" hasDialog="true" health="1" x="-46.236156" y="62.098995" dindex="9999"/> + <npc name="Bob" hasDialog="true" spawnx="30" health="1" x="271.72144" y="74.999023" dindex="0"/> <structure type="1" spawnx="300" alive="1"/> <structure inside="bobshouse.xml" type="1" spawnx="10" alive="1"/> <chest alive="1"/> |