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

Now loading the new animations out of assets/animate2.json

Browse source
This commit is contained in:
Zed A. Shaw 2026-02-03 00:30:49 -05:00
parent df730047ac
commit dea0607901
7 changed files with 108 additions and 137 deletions
Download patch file Download diff file Expand all files Collapse all files

74
animate2.cpp
View file

@ -3,20 +3,23 @@
#include <chrono>
#include "dbc.hpp"
#include "rand.hpp"
#include <iostream>
#include <fstream>
constexpr float SUB_FRAME_SENSITIVITY = 0.999f;
namespace animate2 {
std::vector<sf::IntRect> Animate2::calc_frames() {
dbc::check($sequence.frames.size() == $sequence.durations.size(), "$sequence.frames.size() != $sequence.durations.size()");
dbc::check(sequence.frames.size() == sequence.durations.size(), "sequence.frames.size() != sequence.durations.size()");
std::vector<sf::IntRect> frames;
for(int frame_i : $sequence.frames) {
for(int frame_i : sequence.frames) {
dbc::check(frame_i < sheet.frames, "frame index greater than sheet frames");
frames.emplace_back(
sf::Vector2i{$sheet.frame_width * frame_i, 0}, // NOTE: one row only for now
sf::Vector2i{$sheet.frame_width,
$sheet.frame_height});
sf::Vector2i{sheet.frame_width * frame_i, 0}, // NOTE: one row only for now
sf::Vector2i{sheet.frame_width,
sheet.frame_height});
}
return frames;
@ -24,56 +27,58 @@ namespace animate2 {
void Animate2::play() {
dbc::check(!playing, "can't call play while playing?");
$sequence.current = 0;
$sequence.subframe = 0.0f;
$sequence.loop_count = 0;
sequence.current = 0;
sequence.subframe = 0.0f;
sequence.loop_count = 0;
playing = true;
$sequence.timer.start();
sequence.timer.start();
sequence.frame_count = sequence.frames.size();
$frame_rects = calc_frames();
}
void Animate2::stop() {
playing = false;
$sequence.timer.reset();
sequence.timer.reset();
}
// need one for each kind of thing to animate
// NOTE: possibly find a way to only run apply on frame change?
void Animate2::apply(sf::Sprite& sprite) {
dbc::check(!$transform.simple, "can't call ::apply() on a simple animation, only ::motion()");
dbc::check(!transform.simple, "can't call ::apply() on a simple animation, only ::motion()");
dbc::check($sequence.current < $frame_rects.size(), "current frame past $frame_rects");
dbc::check(sequence.current < $frame_rects.size(), "current frame past $frame_rects");
// NOTE: pos is not updated yet
auto& rect = $frame_rects.at($sequence.current);
auto& rect = $frame_rects.at(sequence.current);
sprite.setTextureRect(rect);
}
// replaces step
void Animate2::update_frame() {
dbc::check(playing, "attempt to update animation that's not playing");
dbc::check($sequence.frame_count == $sequence.frames.size(), "frame_count doesn't match frame.size()");
dbc::check(sequence.frame_count == sequence.frames.size(), "frame_count doesn't match frame.size()");
auto duration = $sequence.durations.at($sequence.current);
auto duration = sequence.durations.at(sequence.current);
bool frame_change = false;
if($sequence.timer.getElapsedTime() >= duration) {
$sequence.timer.restart();
$sequence.current++;
if($sequence.subframe > SUB_FRAME_SENSITIVITY) $sequence.subframe = 0.0f;
if(sequence.timer.getElapsedTime() >= duration) {
sequence.timer.restart();
sequence.current++;
if(sequence.subframe > SUB_FRAME_SENSITIVITY) sequence.subframe = 0.0f;
frame_change = true;
} else {
$sequence.subframe = std::lerp($sequence.subframe, 1.0, $sequence.timer.DELTA * $transform.ease_rate);
sequence.subframe = std::lerp(sequence.subframe, 1.0, sequence.timer.DELTA * transform.ease_rate);
fmt::println("subframe: {}, alpha: {}", $sequence.subframe, $sequence.timer.alpha);
std::cout << "subframe: " << sequence.subframe << " duration: " << duration << std::endl;
}
if($sequence.current >= $sequence.frame_count) {
$sequence.loop_count++;
playing = onLoop($sequence, $transform);
if(sequence.current >= sequence.frame_count) {
sequence.loop_count++;
playing = onLoop(sequence, transform);
}
if(frame_change && onFrame != nullptr) onFrame();
dbc::check($sequence.current < $sequence.frame_count, "onLoop fail: current frame out of frames.size()");
dbc::check(sequence.current < sequence.frame_count, "onLoop fail: current frame out of frames.size()");
}
void Animate2::update() {
@ -81,21 +86,21 @@ namespace animate2 {
}
void Animate2::motion(sf::Sprite& sprite, sf::Vector2f pos, sf::Vector2f scale) {
$transform.lerp($sequence, pos, scale);
transform.lerp(sequence, pos, scale);
if($transform.flipped) {
if(transform.flipped) {
scale.x *= -1;
}
sprite.setPosition(pos);
if($transform.scaled) {
if(transform.scaled) {
sprite.setScale(scale);
}
}
std::pair<int, double> Animate2::commit() {
return $sequence.timer.commit();
return sequence.timer.commit();
}
void Timer::start() {
@ -151,4 +156,15 @@ namespace animate2 {
seq.subframe, tick, min_y, max_y, pos_out.x, pos_out.y,
scale_out.x, scale_out.y);
}
Animate2 load(const std::string &file, const std::string &anim_name) {
using nlohmann::json;
std::ifstream infile(file);
auto data = json::parse(infile);
Animate2 anim;
animate2::from_json(data[anim_name], anim);
return anim;
}
}