games/raycaster
1
0
Fork 0
Code Issues 30 Pull requests Projects Releases 2 Packages Wiki Activity Actions

Basic simple animations where the enemies just move forward.

Browse source
This commit is contained in:
Zed A. Shaw 2025-02-22 01:36:31 -05:00
parent 947ccbe180
commit 80a0f2ba75
9 changed files with 92 additions and 80 deletions
Download patch file Download diff file Expand all files Collapse all files

4
assets/devices.json
View file

@ -34,8 +34,8 @@
{"_type": "Sprite", "name": "rope_vines_up"}
]
},
"TRIPEWIRE_TRAP": {
"id": "TRIPEWIRE_TRAP",
"TRIPWIRE_TRAP": {
"id": "TRIPWIRE_TRAP",
"name": "Tripwire Trap",
"description": "Watch where you're going.",
"inventory_count": 0,

13
assets/enemies.json
View file

@ -10,7 +10,7 @@
{"_type": "Motion", "dx": 0, "dy": 0, "random": false},
{"_type": "LightSource", "strength": 60, "radius": 1.8},
{"_type": "EnemyConfig", "hearing_distance": 5},
{"_type": "Sprite", "name": "peasant_girl"}
{"_type": "Animation", "scale": 0.2, "simple": true, "frames": 10}
]
},
"KNIGHT": {
@ -22,6 +22,7 @@
{"_type": "Combat", "hp": 20, "max_hp": 20, "damage": 1, "dead": false},
{"_type": "Motion", "dx": 0, "dy": 0, "random": false},
{"_type": "EnemyConfig", "hearing_distance": 5},
{"_type": "Animation", "scale": 0.2, "simple": true, "frames": 10},
{"_type": "Sprite", "name": "armored_knight"}
]
},
@ -31,11 +32,12 @@
"foreground": [156, 172, 197],
"background": [30, 20, 75]
},
{"_type": "LightSource", "strength": 80, "radius": 2.8},
{"_type": "LightSource", "strength": 60, "radius": 1.8},
{"_type": "Combat", "hp": 40, "max_hp": 40, "damage": 10, "dead": false},
{"_type": "Motion", "dx": 0, "dy": 0, "random": true},
{"_type": "EnemyConfig", "hearing_distance": 5},
{"_type": "Sprite", "name": "axe_ranger"}
{"_type": "Sprite", "name": "axe_ranger"},
{"_type": "Animation", "scale": 0.2, "simple": true, "frames": 10}
]
},
"EVIL_EYE": {
@ -47,7 +49,8 @@
{"_type": "Combat", "hp": 50, "max_hp": 50, "damage": 50, "dead": false},
{"_type": "Motion", "dx": 0, "dy": 0, "random": false},
{"_type": "EnemyConfig", "hearing_distance": 5},
{"_type": "Sprite", "name": "evil_eye"}
{"_type": "Sprite", "name": "evil_eye"},
{"_type": "Animation", "scale": 0.2, "simple": true, "frames": 10}
]
},
"RAT_GIANT": {
@ -59,6 +62,7 @@
{"_type": "Combat", "hp": 20, "max_hp": 20, "damage": 20, "dead": false},
{"_type": "Motion", "dx": 0, "dy": 0, "random": false},
{"_type": "EnemyConfig", "hearing_distance": 10},
{"_type": "Animation", "scale": 0.2, "simple": true, "frames": 10},
{"_type": "Sprite", "name": "rat_with_sword"}
]
},
@ -71,6 +75,7 @@
{"_type": "Combat", "hp": 20, "max_hp": 20, "damage": 20, "dead": false},
{"_type": "Motion", "dx": 0, "dy": 0, "random": false},
{"_type": "EnemyConfig", "hearing_distance": 10},
{"_type": "Animation", "scale": 0.2, "simple": true, "frames": 10},
{"_type": "Sprite", "name": "hairy_spider"}
]
}

2
components.cpp
View file

@ -12,6 +12,7 @@ namespace components {
ENROLL_COMPONENT(LightSource, strength, radius);
ENROLL_COMPONENT(Device, config, events);
ENROLL_COMPONENT(Sprite, name);
ENROLL_COMPONENT(Animation, scale, simple, frames);
void configure_entity(const ComponentMap& component_map, DinkyECS::World& world, DinkyECS::Entity ent, json& data) {
for (auto &i : data) {
@ -33,5 +34,6 @@ namespace components {
components::enroll<LightSource>(component_map);
components::enroll<Device>(component_map);
components::enroll<Sprite>(component_map);
components::enroll<Animation>(component_map);
}
}

19
components.hpp
View file

@ -4,6 +4,8 @@
#include "config.hpp"
#include "dinky_components.hpp"
#include "point.hpp"
#include <SFML/System/Vector2.hpp>
#include <SFML/Graphics/Rect.hpp>
namespace components {
struct Player {
@ -83,6 +85,23 @@ namespace components {
string name;
};
struct Animation {
float scale = 0.0f;
bool simple = true;
int frames = 10;
int current = 0;
void step(sf::Vector2f& scale_out, sf::IntRect& rect_out) {
if(current < frames) {
scale_out.x += scale;
scale_out.y += scale;
current++;
}
(void) rect_out;
}
};
void configure(ComponentMap& component_map);
// these need to be here if you're using components::convert outside of components.cpp

2
constants.hpp
View file

@ -11,7 +11,7 @@ constexpr const int SCREEN_WIDTH=1280;
constexpr const int SCREEN_HEIGHT=720;
constexpr const int RAY_VIEW_X=(SCREEN_WIDTH - RAY_VIEW_WIDTH);
constexpr const int RAY_VIEW_Y=0;
constexpr const bool VSYNC=false;
constexpr const bool VSYNC=true;
constexpr const int FRAME_LIMIT=60;
constexpr const int NUM_SPRITES=1;
constexpr const int MAX_LOG_MESSAGES=17;

104
dinkyecs.hpp
View file

@ -8,6 +8,7 @@
#include <typeindex>
#include <typeinfo>
#include <unordered_map>
#include <optional>
namespace DinkyECS
{
@ -16,14 +17,12 @@ namespace DinkyECS
using EntityMap = std::unordered_map<Entity, size_t>;
template <typename T>
struct ComponentStorage
{
struct ComponentStorage {
std::vector<T> data;
std::queue<size_t> free_indices;
};
struct Event
{
struct Event {
int event = 0;
Entity entity = 0;
std::any data;
@ -31,8 +30,7 @@ namespace DinkyECS
typedef std::queue<Event> EventQueue;
struct World
{
struct World {
unsigned long entity_count = 0;
std::unordered_map<std::type_index, EntityMap> $components;
std::unordered_map<std::type_index, std::any> $facts;
@ -42,44 +40,35 @@ namespace DinkyECS
Entity entity() { return ++entity_count; }
void clone_into(DinkyECS::World &to_world)
{
void clone_into(DinkyECS::World &to_world) {
to_world.$constants = $constants;
to_world.$facts = $facts;
to_world.entity_count = entity_count;
to_world.$component_storages = $component_storages;
for (auto eid : $constants)
{
for (const auto &[tid, eid_map] : $components)
{
for(auto eid : $constants) {
for(const auto &[tid, eid_map] : $components) {
auto &their_map = to_world.$components[tid];
if (eid_map.contains(eid))
{
if(eid_map.contains(eid)) {
their_map.insert_or_assign(eid, eid_map.at(eid));
}
}
}
}
void make_constant(DinkyECS::Entity entity)
{
void make_constant(DinkyECS::Entity entity) {
$constants.push_back(entity);
}
template <typename Comp>
size_t make_component()
{
size_t make_component() {
auto &storage = component_storage_for<Comp>();
size_t index;
if (!storage.free_indices.empty())
{
if(!storage.free_indices.empty()) {
index = storage.free_indices.front();
storage.free_indices.pop();
}
else
{
} else {
storage.data.emplace_back();
index = storage.data.size() - 1;
}
@ -88,8 +77,7 @@ namespace DinkyECS
}
template <typename Comp>
ComponentStorage<Comp> &component_storage_for()
{
ComponentStorage<Comp> &component_storage_for() {
auto type_index = std::type_index(typeid(Comp));
$component_storages.try_emplace(type_index, ComponentStorage<Comp>{});
return std::any_cast<ComponentStorage<Comp> &>(
@ -97,24 +85,20 @@ namespace DinkyECS
}
template <typename Comp>
EntityMap &entity_map_for()
{
EntityMap &entity_map_for() {
return $components[std::type_index(typeid(Comp))];
}
template <typename Comp>
EventQueue &queue_map_for()
{
EventQueue &queue_map_for() {
return $events[std::type_index(typeid(Comp))];
}
template <typename Comp>
void remove(Entity ent)
{
void remove(Entity ent) {
EntityMap &map = entity_map_for<Comp>();
if (map.contains(ent))
{
if(map.contains(ent)) {
size_t index = map.at(ent);
component_storage_for<Comp>().free_indices.push(index);
}
@ -123,14 +107,12 @@ namespace DinkyECS
}
template <typename Comp>
void set_the(Comp val)
{
void set_the(Comp val) {
$facts.insert_or_assign(std::type_index(typeid(Comp)), val);
}
template <typename Comp>
Comp &get_the()
{
Comp &get_the() {
auto comp_id = std::type_index(typeid(Comp));
dbc::check($facts.contains(comp_id),
fmt::format("!!!! ATTEMPT to access world fact that hasn't "
@ -143,19 +125,16 @@ namespace DinkyECS
}
template <typename Comp>
bool has_the()
{
bool has_the() {
auto comp_id = std::type_index(typeid(Comp));
return $facts.contains(comp_id);
}
template <typename Comp>
void set(Entity ent, Comp val)
{
void set(Entity ent, Comp val) {
EntityMap &map = entity_map_for<Comp>();
if (has<Comp>(ent))
{
if(has<Comp>(ent)) {
get<Comp>(ent) = val;
return;
}
@ -165,8 +144,7 @@ namespace DinkyECS
}
template <typename Comp>
Comp &get(Entity ent)
{
Comp &get(Entity ent) {
EntityMap &map = entity_map_for<Comp>();
auto &storage = component_storage_for<Comp>();
auto index = map.at(ent);
@ -174,48 +152,40 @@ namespace DinkyECS
}
template <typename Comp>
bool has(Entity ent)
{
bool has(Entity ent) {
EntityMap &map = entity_map_for<Comp>();
return map.contains(ent);
}
template <typename Comp>
void query(std::function<void(Entity, Comp &)> cb)
{
void query(std::function<void(Entity, Comp &)> cb) {
EntityMap &map = entity_map_for<Comp>();
for (auto &[entity, index] : map)
{
for(auto &[entity, index] : map) {
cb(entity, get<Comp>(entity));
}
}
template <typename CompA, typename CompB>
void query(std::function<void(Entity, CompA &, CompB &)> cb)
{
void query(std::function<void(Entity, CompA &, CompB &)> cb) {
EntityMap &map_a = entity_map_for<CompA>();
EntityMap &map_b = entity_map_for<CompB>();
for (auto &[entity, index_a] : map_a)
{
if (map_b.contains(entity))
{
for(auto &[entity, index_a] : map_a) {
if(map_b.contains(entity)) {
cb(entity, get<CompA>(entity), get<CompB>(entity));
}
}
}
template <typename Comp>
void send(Comp event, Entity entity, std::any data)
{
void send(Comp event, Entity entity, std::any data) {
EventQueue &queue = queue_map_for<Comp>();
queue.push({event, entity, data});
}
template <typename Comp>
Event recv()
{
Event recv() {
EventQueue &queue = queue_map_for<Comp>();
Event evt = queue.front();
queue.pop();
@ -223,10 +193,18 @@ namespace DinkyECS
}
template <typename Comp>
bool has_event()
{
bool has_event() {
EventQueue &queue = queue_map_for<Comp>();
return !queue.empty();
}
template <typename Comp>
std::optional<Comp> get_if(DinkyECS::Entity entity) {
if(has<Comp>(entity)) {
return std::make_optional<Comp>(get<Comp>(entity));
} else {
return std::nullopt;
}
}
};
} // namespace DinkyECS

6
guecs.hpp
View file

@ -165,11 +165,7 @@ namespace guecs {
template <typename Comp>
std::optional<Comp> get_if(DinkyECS::Entity entity) {
if($world.has<Comp>(entity)) {
return std::make_optional<Comp>($world.get<Comp>(entity));
} else {
return std::nullopt;
}
return $world.get_if<Comp>(entity);
}
template <typename Comp>

16
raycaster.cpp
View file

@ -80,6 +80,7 @@ void Raycaster::sprite_casting(sf::RenderTarget &target) {
// after sorting the sprites, do the projection
for(auto& rec : sprite_order) {
if(!$sprites.contains(rec.second)) continue;
// BUG: eventually this needs to go away too
auto& sf_sprite = $sprites.at(rec.second).sprite;
auto sprite_pos = $level.world->get<components::Position>(rec.second);
@ -145,12 +146,17 @@ void Raycaster::sprite_casting(sf::RenderTarget &target) {
int d = y * texture_height - $height * half_height + sprite_height * half_height;
int tex_y = ((d * texture_height) / sprite_height) / texture_height;
sf_sprite->setScale({sprite_scale_w, sprite_scale_h});
sf_sprite->setTextureRect(sf::IntRect({
{tex_x, tex_y},
{tex_render_width, texture_height}}));
sf_sprite->setPosition({x, y});
sf::Vector2f scale{sprite_scale_w, sprite_scale_h};
sf::IntRect in_texture{ {tex_x, tex_y}, {tex_render_width, texture_height}};
if($level.world->has<components::Animation>(rec.second)) {
auto& animation = $level.world->get<components::Animation>(rec.second);
animation.step(scale, in_texture);
}
sf_sprite->setScale(scale);
sf_sprite->setTextureRect(in_texture);
sf_sprite->setPosition({x, y});
$brightness.setUniform("offsetFactor", sf::Glsl::Vec2{0.0f, 0.0f});
// the SpatialMap.distance_sorted only calculates the

6
systems.cpp
View file

@ -131,6 +131,7 @@ void System::death(GameLevel &level, components::ComponentMap& components) {
world.remove<Motion>(ent);
world.remove<Combat>(ent);
world.remove<EnemyConfig>(ent);
world.remove<Animation>(ent);
auto entity_data = config.items["GRAVE_STONE"];
components::configure_entity(components, world, ent, entity_data["components"]);
@ -161,6 +162,11 @@ void System::combat(GameLevel &level) {
enemy_combat.attack(player_combat)
};
if(world.has<Animation>(entity)) {
auto& animation = world.get<Animation>(entity);
animation.current = 0;
}
world.send<Events::GUI>(Events::GUI::COMBAT, entity, result);
}
}