animations
This commit is contained in:
parent
721ff8f42f
commit
e4dda0861c
8 changed files with 161 additions and 4 deletions
45
examples/HelloAnimation/main.cpp
Normal file
45
examples/HelloAnimation/main.cpp
Normal file
|
|
@ -0,0 +1,45 @@
|
||||||
|
import Crafter.Event;
|
||||||
|
import Crafter.Graphics;
|
||||||
|
import std;
|
||||||
|
using namespace Crafter;
|
||||||
|
|
||||||
|
int main() {
|
||||||
|
WindowWayland window(1280, 720, "Hello Input!");
|
||||||
|
|
||||||
|
UiElementBufferBuffer* element = new UiElementBufferBuffer(
|
||||||
|
2, //bufferWidth: the width of this elements pixel buffer
|
||||||
|
1, //bufferHeight: the height of this elements pixel buffer
|
||||||
|
FractionalToMapped(0.5), //anchorX: relative position where this elements x anchor (top-left) is placed to its parent x anchor
|
||||||
|
FractionalToMapped(0.5), //anchorY: relative position where this elements y anchor (top-left) is placed to its parent y anchor
|
||||||
|
FractionalToMapped(0.5), //relativeSizeX: the relative x size this element should be scaled to compared to its parent
|
||||||
|
FractionalToMapped(0.5), //relativeSizeY: the relative y size this element should be scaled to compared to its parent
|
||||||
|
FractionalToMapped(0.5), //anchorOffsetX: the amount this element's anchor should be offset from the top left corner (0.5 to in the middle)
|
||||||
|
FractionalToMapped(0.5), //anchorOffsetY: the amount this element's anchor should be offset from the top left corner (0.5 to place it in the middle)
|
||||||
|
0, //z: this elements Z position
|
||||||
|
false //ignoreScaling: wether this element ignores the scaling of the window, if true its size will be scaled according to the window scale
|
||||||
|
);
|
||||||
|
|
||||||
|
window.elements.push_back(element);
|
||||||
|
|
||||||
|
element->UpdatePosition(window);
|
||||||
|
|
||||||
|
Animation<std::tuple<std::int_fast32_t>> anim({
|
||||||
|
{std::chrono::seconds(0), FractionalToMapped(-0.5)},
|
||||||
|
{std::chrono::seconds(5), FractionalToMapped(1.5)}
|
||||||
|
});
|
||||||
|
|
||||||
|
anim.Start(std::chrono::high_resolution_clock::now());
|
||||||
|
|
||||||
|
EventListener<FrameTime> updateListener(&window.onUpdate, [&](FrameTime time){
|
||||||
|
std::tuple<std::int_fast32_t> value = anim.Play(time.now);
|
||||||
|
element->transform.anchorX = std::get<0>(value);
|
||||||
|
element->UpdatePosition(window);
|
||||||
|
if(anim.currentFrame == anim.keyframes.size()-1) {
|
||||||
|
anim.Start(time.now);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
element->buffer = {{255, 0, 0 ,255}, {0, 255, 0 ,255}};
|
||||||
|
window.StartUpdate();
|
||||||
|
window.StartSync();
|
||||||
|
}
|
||||||
15
examples/HelloAnimation/project.json
Normal file
15
examples/HelloAnimation/project.json
Normal file
|
|
@ -0,0 +1,15 @@
|
||||||
|
{
|
||||||
|
"name": "crafter-graphics",
|
||||||
|
"configurations": [
|
||||||
|
{
|
||||||
|
"name": "executable",
|
||||||
|
"implementations": ["main"],
|
||||||
|
"dependencies": [
|
||||||
|
{
|
||||||
|
"path":"../../project.json",
|
||||||
|
"configuration":"lib-wayland"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
|
@ -163,8 +163,8 @@ void RenderElement(UiElementBufferBuffer* element, WindowWayland* window) {
|
||||||
std::vector<Pixel_BU8_GU8_RU8_AU8> scaled(element->transform.scaled.width*element->transform.scaled.height);
|
std::vector<Pixel_BU8_GU8_RU8_AU8> scaled(element->transform.scaled.width*element->transform.scaled.height);
|
||||||
element->CopyNearestNeighbour(scaled.data(), element->transform.scaled.width, element->transform.scaled.height);
|
element->CopyNearestNeighbour(scaled.data(), element->transform.scaled.width, element->transform.scaled.height);
|
||||||
|
|
||||||
for (std::int32_t x = element->transform.scaled.x; x - element->transform.scaled.x < element->transform.scaled.width; x++) {
|
for (std::int_fast32_t x = element->transform.scaled.x; x - element->transform.scaled.x < element->transform.scaled.width; x++) {
|
||||||
for (std::int32_t y = element->transform.scaled.y; y - element->transform.scaled.y < element->transform.scaled.height; y++) {
|
for (std::int_fast32_t y = element->transform.scaled.y; y - element->transform.scaled.y < element->transform.scaled.height; y++) {
|
||||||
if (x >= 0 && x < window->width && y >= 0 && y < window->height) {
|
if (x >= 0 && x < window->width && y >= 0 && y < window->height) {
|
||||||
Pixel_BU8_GU8_RU8_AU8& dst = window->framebuffer[y * window->width + x];
|
Pixel_BU8_GU8_RU8_AU8& dst = window->framebuffer[y * window->width + x];
|
||||||
const Pixel_BU8_GU8_RU8_AU8& src = scaled[(y - element->transform.scaled.y) * element->transform.scaled.width + (x - element->transform.scaled.x)];
|
const Pixel_BU8_GU8_RU8_AU8& src = scaled[(y - element->transform.scaled.y) * element->transform.scaled.width + (x - element->transform.scaled.x)];
|
||||||
|
|
@ -191,6 +191,12 @@ void RenderElement(UiElementBufferBuffer* element, WindowWayland* window) {
|
||||||
void WindowWayland::Render() {
|
void WindowWayland::Render() {
|
||||||
std::sort(elements.begin(), elements.end(), [](UiElementBufferBuffer* a, UiElementBufferBuffer* b){ return a->transform.z < b->transform.z; });
|
std::sort(elements.begin(), elements.end(), [](UiElementBufferBuffer* a, UiElementBufferBuffer* b){ return a->transform.z < b->transform.z; });
|
||||||
|
|
||||||
|
for (std::int_fast32_t x = 0; x < width; x++) {
|
||||||
|
for (std::int_fast32_t y = 0; y - height; y++) {
|
||||||
|
framebuffer[y * width + x] = {0,0,0,0};
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
for(UiElementBufferBuffer* element : elements) {
|
for(UiElementBufferBuffer* element : elements) {
|
||||||
RenderElement(element, this);
|
RenderElement(element, this);
|
||||||
}
|
}
|
||||||
|
|
@ -251,12 +257,17 @@ void WindowWayland::wl_surface_frame_done(void* data, struct wl_callback *cb, ui
|
||||||
wl_callback_destroy(cb);
|
wl_callback_destroy(cb);
|
||||||
WindowWayland* window = reinterpret_cast<WindowWayland*>(data);
|
WindowWayland* window = reinterpret_cast<WindowWayland*>(data);
|
||||||
|
|
||||||
|
auto start = std::chrono::high_resolution_clock::now();
|
||||||
|
|
||||||
if(window->updating) {
|
if(window->updating) {
|
||||||
cb = wl_surface_frame(window->surface);
|
cb = wl_surface_frame(window->surface);
|
||||||
wl_callback_add_listener(cb, &WindowWayland::wl_callback_listener, window);
|
wl_callback_add_listener(cb, &WindowWayland::wl_callback_listener, window);
|
||||||
|
window->onUpdate.Invoke({start, start-window->lastFrameEnd});
|
||||||
}
|
}
|
||||||
|
|
||||||
window->Render();
|
window->Render();
|
||||||
|
|
||||||
|
window->lastFrameEnd = start;
|
||||||
}
|
}
|
||||||
|
|
||||||
void WindowWayland::pointer_handle_button(void* data, wl_pointer* pointer, std::uint32_t serial, std::uint32_t time, std::uint32_t button, std::uint32_t state) {
|
void WindowWayland::pointer_handle_button(void* data, wl_pointer* pointer, std::uint32_t serial, std::uint32_t time, std::uint32_t button, std::uint32_t state) {
|
||||||
|
|
|
||||||
80
interfaces/Crafter.Graphics-Animation.cppm
Normal file
80
interfaces/Crafter.Graphics-Animation.cppm
Normal file
|
|
@ -0,0 +1,80 @@
|
||||||
|
/*
|
||||||
|
Crafter®.Graphics
|
||||||
|
Copyright (C) 2025 Catcrafts®
|
||||||
|
Catcrafts.net
|
||||||
|
|
||||||
|
This library is free software; you can redistribute it and/or
|
||||||
|
modify it under the terms of the GNU Lesser General Public
|
||||||
|
License as published by the Free Software Foundation; either
|
||||||
|
version 3.0 of the License, or (at your option) any later version.
|
||||||
|
|
||||||
|
This library is distributed in the hope that it will be useful,
|
||||||
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||||
|
Lesser General Public License for more details.
|
||||||
|
|
||||||
|
You should have received a copy of the GNU Lesser General Public
|
||||||
|
License along with this library; if not, write to the Free Software
|
||||||
|
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||||||
|
*/
|
||||||
|
|
||||||
|
export module Crafter.Graphics:Animation;
|
||||||
|
import std;
|
||||||
|
|
||||||
|
namespace Crafter {
|
||||||
|
template <typename T>
|
||||||
|
constexpr T Lerp(T a, T b, double elapsed) {
|
||||||
|
return a + static_cast<T>(elapsed * (b - a));
|
||||||
|
}
|
||||||
|
|
||||||
|
template <typename Tuple, std::size_t... Is>
|
||||||
|
constexpr auto LerpTupleImpl(const Tuple& a, const Tuple& b, double elapsed, std::index_sequence<Is...>) {
|
||||||
|
return std::make_tuple(Lerp(std::get<Is>(a), std::get<Is>(b), elapsed)...);
|
||||||
|
}
|
||||||
|
|
||||||
|
template <typename Tuple>
|
||||||
|
constexpr auto LerpTuple(const Tuple& a, const Tuple& b, double elapsed) {
|
||||||
|
return LerpTupleImpl(a, b, elapsed, std::make_index_sequence<std::tuple_size_v<Tuple>>{});
|
||||||
|
}
|
||||||
|
|
||||||
|
export template <typename T>
|
||||||
|
struct Keyframe{
|
||||||
|
std::chrono::duration<double> duration;
|
||||||
|
T values;
|
||||||
|
};
|
||||||
|
|
||||||
|
export template <typename T>
|
||||||
|
struct Animation {
|
||||||
|
std::vector<Keyframe<T>> keyframes;
|
||||||
|
std::uint_fast32_t currentFrame;
|
||||||
|
std::chrono::time_point<std::chrono::high_resolution_clock> startedAt;
|
||||||
|
Animation(std::vector<Keyframe<T>>&& keyframes) : keyframes(std::move(keyframes)) {}
|
||||||
|
void Start(std::chrono::time_point<std::chrono::high_resolution_clock> time) {
|
||||||
|
currentFrame = 0;
|
||||||
|
startedAt = time;
|
||||||
|
}
|
||||||
|
T Play(std::chrono::time_point<std::chrono::high_resolution_clock> time) {
|
||||||
|
std::chrono::duration<double> elapsed = time - startedAt; // elapsed time since animation started
|
||||||
|
std::chrono::duration<double> accumulated(0);
|
||||||
|
|
||||||
|
for (std::uint_fast32_t i = currentFrame; i < keyframes.size() - 1; ++i) {
|
||||||
|
accumulated += keyframes[i+1].duration;
|
||||||
|
if (elapsed < accumulated) {
|
||||||
|
std::chrono::duration<double> frameStartTime = accumulated - keyframes[i+1].duration;
|
||||||
|
auto t = (elapsed - frameStartTime) / keyframes[i+1].duration.count();
|
||||||
|
|
||||||
|
currentFrame = i;
|
||||||
|
return LerpTuple(
|
||||||
|
keyframes[i].values,
|
||||||
|
keyframes[i + 1].values,
|
||||||
|
t.count()
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// If we get here, we're past the last keyframe
|
||||||
|
currentFrame = keyframes.size() - 1;
|
||||||
|
return keyframes.back().values;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
@ -95,6 +95,10 @@ namespace Crafter {
|
||||||
float a;
|
float a;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
export struct FrameTime {
|
||||||
|
std::chrono::time_point<std::chrono::high_resolution_clock> now;
|
||||||
|
std::chrono::duration<double> delta;
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
export constexpr std::int_fast32_t BOUND = 9;
|
export constexpr std::int_fast32_t BOUND = 9;
|
||||||
|
|
|
||||||
|
|
@ -47,8 +47,9 @@ export namespace Crafter {
|
||||||
class UiElement;
|
class UiElement;
|
||||||
class Window {
|
class Window {
|
||||||
public:
|
public:
|
||||||
|
std::chrono::time_point<std::chrono::high_resolution_clock> lastFrameEnd;
|
||||||
Event<void> onClose;
|
Event<void> onClose;
|
||||||
Event<std::chrono::time_point<std::chrono::high_resolution_clock>> onUpdate;
|
Event<FrameTime> onUpdate;
|
||||||
bool open = true;
|
bool open = true;
|
||||||
bool updating = false;
|
bool updating = false;
|
||||||
Window() = default;
|
Window() = default;
|
||||||
|
|
|
||||||
|
|
@ -25,6 +25,7 @@ export import :UiElement;
|
||||||
export import :Types;
|
export import :Types;
|
||||||
export import :Font;
|
export import :Font;
|
||||||
export import :Shm;
|
export import :Shm;
|
||||||
|
export import :Animation;
|
||||||
|
|
||||||
// export import :WindowWaylandVulkan;
|
// export import :WindowWaylandVulkan;
|
||||||
// export import :VulkanBuffer;
|
// export import :VulkanBuffer;
|
||||||
|
|
|
||||||
|
|
@ -4,7 +4,7 @@
|
||||||
{
|
{
|
||||||
"name": "base",
|
"name": "base",
|
||||||
"implementations": ["implementations/Crafter.Graphics-Font", "implementations/Crafter.Graphics-Shm", "implementations/Crafter.Graphics-UiElement", "implementations/Crafter.Graphics-UiElementBufferBuffer", "implementations/Crafter.Graphics-UiElementBufferBufferBase", "implementations/Crafter.Graphics-UiElementBufferMouseBuffer"],
|
"implementations": ["implementations/Crafter.Graphics-Font", "implementations/Crafter.Graphics-Shm", "implementations/Crafter.Graphics-UiElement", "implementations/Crafter.Graphics-UiElementBufferBuffer", "implementations/Crafter.Graphics-UiElementBufferBufferBase", "implementations/Crafter.Graphics-UiElementBufferMouseBuffer"],
|
||||||
"interfaces": ["interfaces/Crafter.Graphics-Window", "interfaces/Crafter.Graphics", "interfaces/Crafter.Graphics-Types", "interfaces/Crafter.Graphics-Font", "interfaces/Crafter.Graphics-Shm", "interfaces/Crafter.Graphics-UiElement"],
|
"interfaces": ["interfaces/Crafter.Graphics-Window", "interfaces/Crafter.Graphics", "interfaces/Crafter.Graphics-Types", "interfaces/Crafter.Graphics-Font", "interfaces/Crafter.Graphics-Shm", "interfaces/Crafter.Graphics-UiElement", "interfaces/Crafter.Graphics-Animation"],
|
||||||
"type": "library"
|
"type": "library"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue