diff --git a/docs/README.md b/docs/README.md deleted file mode 100644 index 64ecc08..0000000 --- a/docs/README.md +++ /dev/null @@ -1,50 +0,0 @@ -# Todo - -Here some ideas for improving this tiny engine: - -## Rendering -- [ ] replace the OpenGL renderer with a Vulkan backend -- [ ] add animatable sprites (access to UV mapping and tiling) -- [ ] add a SDF based renderer (parametric tiles and font rendering) - -## Game Support -- [ ] audio! -- [ ] some minimal animation system with tweening with different f-curves - - -## System Level - -- [ ] add a `Asset` handler to load cache and manage assets -- [ ] introspection of file system if we load assset - -## Design - -- [ ] replace some of the 'unkown source' assets - -## Build / Dev Support -- [ ] add a test rig either with Snitch or Catch2 -- [ ] write some reasonable testcases -- [ ] add CPU and GPU benchmarks to address various issues - - -# Issues - - -```sh - Performance counter stats for 'bin/paradiso_pong': - - 555,35 msec task-clock:u # 0,042 CPUs utilized - 0 context-switches:u # 0,000 /sec - 0 cpu-migrations:u # 0,000 /sec - 4.072 page-faults:u # 7,332 K/sec - 319.484.735 cycles:u # 0,575 GHz - 358.165.995 instructions:u # 1,12 insn per cycle - 86.037.942 branches:u # 154,926 M/sec - 2.469.068 branch-misses:u # 2,87% of all branches - - 13,092775373 seconds time elapsed - - 0,311565000 seconds user - 0,247491000 seconds sys -``` -above run with `perf stat bin/paradiso_pong` shows some really bad performance issues. diff --git a/examples/pong/pong.cpp b/examples/pong/pong.cpp index 2b979f7..11f89f0 100644 --- a/examples/pong/pong.cpp +++ b/examples/pong/pong.cpp @@ -1,7 +1,7 @@ /** * paradiso - Paradigmen der Softwareentwicklung * - * (c) Copyright 2023-2024 Hartmut Seichter + * (c) Copyright 2023 Hartmut Seichter * */ @@ -16,6 +16,7 @@ #include +#include #include struct PongStage { @@ -85,7 +86,7 @@ struct PongPaddle { velocity_horizontal *= whoopiness; sprite.pivot.x() += velocity_horizontal; - sprite.pivot.x() = std::clamp(sprite.pivot.x(), -0.5f, 0.5f); + std::clamp(sprite.pivot.x(), -0.5f, 0.5f); // update shader uniforms shader.set_uniform("pivot", sprite.pivot); @@ -150,7 +151,7 @@ struct PongBall { void draw(const paradiso::Shader& shader) { - sprite.pivot.x() = std::clamp(sprite.pivot.x(), -0.5f, 0.5f); + std::clamp(sprite.pivot.x(), -0.5f, 0.5f); // update shader uniforms shader.set_uniform("pivot", sprite.pivot); @@ -165,9 +166,6 @@ struct PongBall { paradiso::Renderer renderer{}; constexpr void push(const auto& impulse) noexcept { velocity += impulse; } - - constexpr void whoop(const auto& whoopiness) noexcept { velocity *= whoopiness; } - }; auto main() -> int { @@ -236,19 +234,6 @@ auto main() -> int { ball.sprite.pivot.x() = 0.0f; ball.sprite.pivot.y() = 0.9f; } - // speed adjust - if (w.keyboard_input().top().key == 'N') { - - std::cout << "Speed Up!\n"; - - ball.push(paradiso::Vector2::make(0.f,0.01f)); - - } else if (w.keyboard_input().top().key == 'M') { - - ball.push(paradiso::Vector2::make(0.f,-0.01f)); - - std::cout << "Speed Lower!\n"; - } } ball.interact(stage); @@ -266,4 +251,4 @@ auto main() -> int { }; return 0; -} +} \ No newline at end of file diff --git a/examples/quickwings/assets/tappybird/Font/kenvector_future.ttf b/examples/quickwings/assets/tappybird/Font/kenvector_future.ttf deleted file mode 100644 index 39ebdfa..0000000 Binary files a/examples/quickwings/assets/tappybird/Font/kenvector_future.ttf and /dev/null differ diff --git a/examples/quickwings/assets/tappybird/Font/kenvector_future_thin.ttf b/examples/quickwings/assets/tappybird/Font/kenvector_future_thin.ttf deleted file mode 100644 index 9f4b4fa..0000000 Binary files a/examples/quickwings/assets/tappybird/Font/kenvector_future_thin.ttf and /dev/null differ diff --git a/examples/quickwings/assets/tappybird/PNG/Letters/letterA.png b/examples/quickwings/assets/tappybird/PNG/Letters/letterA.png deleted file mode 100644 index eb9a6ab..0000000 Binary files a/examples/quickwings/assets/tappybird/PNG/Letters/letterA.png and /dev/null differ diff --git a/examples/quickwings/assets/tappybird/PNG/Letters/letterB.png b/examples/quickwings/assets/tappybird/PNG/Letters/letterB.png deleted file mode 100644 index 75a6276..0000000 Binary files a/examples/quickwings/assets/tappybird/PNG/Letters/letterB.png and /dev/null differ diff --git a/examples/quickwings/assets/tappybird/PNG/Letters/letterC.png b/examples/quickwings/assets/tappybird/PNG/Letters/letterC.png deleted file mode 100644 index 8ae3c7f..0000000 Binary files a/examples/quickwings/assets/tappybird/PNG/Letters/letterC.png and /dev/null differ diff --git a/examples/quickwings/assets/tappybird/PNG/Letters/letterD.png b/examples/quickwings/assets/tappybird/PNG/Letters/letterD.png deleted file mode 100644 index 99dffaa..0000000 Binary files a/examples/quickwings/assets/tappybird/PNG/Letters/letterD.png and /dev/null differ diff --git a/examples/quickwings/assets/tappybird/PNG/Letters/letterE.png b/examples/quickwings/assets/tappybird/PNG/Letters/letterE.png deleted file mode 100644 index d9d0ecf..0000000 Binary files a/examples/quickwings/assets/tappybird/PNG/Letters/letterE.png and /dev/null differ diff --git a/examples/quickwings/assets/tappybird/PNG/Letters/letterF.png b/examples/quickwings/assets/tappybird/PNG/Letters/letterF.png deleted file mode 100644 index d118f25..0000000 Binary files a/examples/quickwings/assets/tappybird/PNG/Letters/letterF.png and /dev/null differ diff --git a/examples/quickwings/assets/tappybird/PNG/Letters/letterG.png b/examples/quickwings/assets/tappybird/PNG/Letters/letterG.png deleted file mode 100644 index 6285343..0000000 Binary files a/examples/quickwings/assets/tappybird/PNG/Letters/letterG.png and /dev/null differ diff --git a/examples/quickwings/assets/tappybird/PNG/Letters/letterH.png b/examples/quickwings/assets/tappybird/PNG/Letters/letterH.png deleted file mode 100644 index c0969fd..0000000 Binary files a/examples/quickwings/assets/tappybird/PNG/Letters/letterH.png and /dev/null differ diff --git a/examples/quickwings/assets/tappybird/PNG/Letters/letterI.png b/examples/quickwings/assets/tappybird/PNG/Letters/letterI.png deleted file mode 100644 index 9c5e737..0000000 Binary files a/examples/quickwings/assets/tappybird/PNG/Letters/letterI.png and /dev/null differ diff --git a/examples/quickwings/assets/tappybird/PNG/Letters/letterJ.png b/examples/quickwings/assets/tappybird/PNG/Letters/letterJ.png deleted file mode 100644 index ecb0f6e..0000000 Binary files a/examples/quickwings/assets/tappybird/PNG/Letters/letterJ.png and /dev/null differ diff --git a/examples/quickwings/assets/tappybird/PNG/Letters/letterK.png b/examples/quickwings/assets/tappybird/PNG/Letters/letterK.png deleted file mode 100644 index 5362d89..0000000 Binary files a/examples/quickwings/assets/tappybird/PNG/Letters/letterK.png and /dev/null differ diff --git a/examples/quickwings/assets/tappybird/PNG/Letters/letterL.png b/examples/quickwings/assets/tappybird/PNG/Letters/letterL.png deleted file mode 100644 index e747d8a..0000000 Binary files a/examples/quickwings/assets/tappybird/PNG/Letters/letterL.png and /dev/null differ diff --git a/examples/quickwings/assets/tappybird/PNG/Letters/letterM.png b/examples/quickwings/assets/tappybird/PNG/Letters/letterM.png deleted file mode 100644 index e197a99..0000000 Binary files a/examples/quickwings/assets/tappybird/PNG/Letters/letterM.png and /dev/null differ diff --git a/examples/quickwings/assets/tappybird/PNG/Letters/letterN.png b/examples/quickwings/assets/tappybird/PNG/Letters/letterN.png deleted file mode 100644 index 60884b3..0000000 Binary files a/examples/quickwings/assets/tappybird/PNG/Letters/letterN.png and /dev/null differ diff --git a/examples/quickwings/assets/tappybird/PNG/Letters/letterO.png b/examples/quickwings/assets/tappybird/PNG/Letters/letterO.png deleted file mode 100644 index 390b566..0000000 Binary files a/examples/quickwings/assets/tappybird/PNG/Letters/letterO.png and /dev/null differ diff --git a/examples/quickwings/assets/tappybird/PNG/Letters/letterP.png b/examples/quickwings/assets/tappybird/PNG/Letters/letterP.png deleted file mode 100644 index 70883d0..0000000 Binary files a/examples/quickwings/assets/tappybird/PNG/Letters/letterP.png and /dev/null differ diff --git a/examples/quickwings/assets/tappybird/PNG/Letters/letterQ.png b/examples/quickwings/assets/tappybird/PNG/Letters/letterQ.png deleted file mode 100644 index c8ee726..0000000 Binary files a/examples/quickwings/assets/tappybird/PNG/Letters/letterQ.png and /dev/null differ diff --git a/examples/quickwings/assets/tappybird/PNG/Letters/letterR.png b/examples/quickwings/assets/tappybird/PNG/Letters/letterR.png deleted file mode 100644 index fcae55c..0000000 Binary files a/examples/quickwings/assets/tappybird/PNG/Letters/letterR.png and /dev/null differ diff --git a/examples/quickwings/assets/tappybird/PNG/Letters/letterS.png b/examples/quickwings/assets/tappybird/PNG/Letters/letterS.png deleted file mode 100644 index c5b671f..0000000 Binary files a/examples/quickwings/assets/tappybird/PNG/Letters/letterS.png and /dev/null differ diff --git a/examples/quickwings/assets/tappybird/PNG/Letters/letterT.png b/examples/quickwings/assets/tappybird/PNG/Letters/letterT.png deleted file mode 100644 index 5e4a3e7..0000000 Binary files a/examples/quickwings/assets/tappybird/PNG/Letters/letterT.png and /dev/null differ diff --git a/examples/quickwings/assets/tappybird/PNG/Letters/letterU.png b/examples/quickwings/assets/tappybird/PNG/Letters/letterU.png deleted file mode 100644 index 8fb60a9..0000000 Binary files a/examples/quickwings/assets/tappybird/PNG/Letters/letterU.png and /dev/null differ diff --git a/examples/quickwings/assets/tappybird/PNG/Letters/letterV.png b/examples/quickwings/assets/tappybird/PNG/Letters/letterV.png deleted file mode 100644 index ad94fc7..0000000 Binary files a/examples/quickwings/assets/tappybird/PNG/Letters/letterV.png and /dev/null differ diff --git a/examples/quickwings/assets/tappybird/PNG/Letters/letterW.png b/examples/quickwings/assets/tappybird/PNG/Letters/letterW.png deleted file mode 100644 index 0b3e63e..0000000 Binary files a/examples/quickwings/assets/tappybird/PNG/Letters/letterW.png and /dev/null differ diff --git a/examples/quickwings/assets/tappybird/PNG/Letters/letterX.png b/examples/quickwings/assets/tappybird/PNG/Letters/letterX.png deleted file mode 100644 index f65c348..0000000 Binary files a/examples/quickwings/assets/tappybird/PNG/Letters/letterX.png and /dev/null differ diff --git a/examples/quickwings/assets/tappybird/PNG/Letters/letterY.png b/examples/quickwings/assets/tappybird/PNG/Letters/letterY.png deleted file mode 100644 index ba733c2..0000000 Binary files a/examples/quickwings/assets/tappybird/PNG/Letters/letterY.png and /dev/null differ diff --git a/examples/quickwings/assets/tappybird/PNG/Letters/letterZ.png b/examples/quickwings/assets/tappybird/PNG/Letters/letterZ.png deleted file mode 100644 index d5e88ad..0000000 Binary files a/examples/quickwings/assets/tappybird/PNG/Letters/letterZ.png and /dev/null differ diff --git a/examples/quickwings/assets/tappybird/PNG/Numbers/number0.png b/examples/quickwings/assets/tappybird/PNG/Numbers/number0.png deleted file mode 100644 index a6ad98c..0000000 Binary files a/examples/quickwings/assets/tappybird/PNG/Numbers/number0.png and /dev/null differ diff --git a/examples/quickwings/assets/tappybird/PNG/Numbers/number1.png b/examples/quickwings/assets/tappybird/PNG/Numbers/number1.png deleted file mode 100644 index 99b38b8..0000000 Binary files a/examples/quickwings/assets/tappybird/PNG/Numbers/number1.png and /dev/null differ diff --git a/examples/quickwings/assets/tappybird/PNG/Numbers/number2.png b/examples/quickwings/assets/tappybird/PNG/Numbers/number2.png deleted file mode 100644 index 90dd749..0000000 Binary files a/examples/quickwings/assets/tappybird/PNG/Numbers/number2.png and /dev/null differ diff --git a/examples/quickwings/assets/tappybird/PNG/Numbers/number3.png b/examples/quickwings/assets/tappybird/PNG/Numbers/number3.png deleted file mode 100644 index 1942bc4..0000000 Binary files a/examples/quickwings/assets/tappybird/PNG/Numbers/number3.png and /dev/null differ diff --git a/examples/quickwings/assets/tappybird/PNG/Numbers/number4.png b/examples/quickwings/assets/tappybird/PNG/Numbers/number4.png deleted file mode 100644 index b72f2e3..0000000 Binary files a/examples/quickwings/assets/tappybird/PNG/Numbers/number4.png and /dev/null differ diff --git a/examples/quickwings/assets/tappybird/PNG/Numbers/number5.png b/examples/quickwings/assets/tappybird/PNG/Numbers/number5.png deleted file mode 100644 index 0bb43f8..0000000 Binary files a/examples/quickwings/assets/tappybird/PNG/Numbers/number5.png and /dev/null differ diff --git a/examples/quickwings/assets/tappybird/PNG/Numbers/number6.png b/examples/quickwings/assets/tappybird/PNG/Numbers/number6.png deleted file mode 100644 index f488ffb..0000000 Binary files a/examples/quickwings/assets/tappybird/PNG/Numbers/number6.png and /dev/null differ diff --git a/examples/quickwings/assets/tappybird/PNG/Numbers/number7.png b/examples/quickwings/assets/tappybird/PNG/Numbers/number7.png deleted file mode 100644 index 7533db1..0000000 Binary files a/examples/quickwings/assets/tappybird/PNG/Numbers/number7.png and /dev/null differ diff --git a/examples/quickwings/assets/tappybird/PNG/Numbers/number8.png b/examples/quickwings/assets/tappybird/PNG/Numbers/number8.png deleted file mode 100644 index 71ba693..0000000 Binary files a/examples/quickwings/assets/tappybird/PNG/Numbers/number8.png and /dev/null differ diff --git a/examples/quickwings/assets/tappybird/PNG/Numbers/number9.png b/examples/quickwings/assets/tappybird/PNG/Numbers/number9.png deleted file mode 100644 index 18c1d42..0000000 Binary files a/examples/quickwings/assets/tappybird/PNG/Numbers/number9.png and /dev/null differ diff --git a/examples/quickwings/assets/tappybird/PNG/Planes/planeBlue1.png b/examples/quickwings/assets/tappybird/PNG/Planes/planeBlue1.png deleted file mode 100644 index ea52a1d..0000000 Binary files a/examples/quickwings/assets/tappybird/PNG/Planes/planeBlue1.png and /dev/null differ diff --git a/examples/quickwings/assets/tappybird/PNG/Planes/planeBlue2.png b/examples/quickwings/assets/tappybird/PNG/Planes/planeBlue2.png deleted file mode 100644 index 566b1f4..0000000 Binary files a/examples/quickwings/assets/tappybird/PNG/Planes/planeBlue2.png and /dev/null differ diff --git a/examples/quickwings/assets/tappybird/PNG/Planes/planeBlue3.png b/examples/quickwings/assets/tappybird/PNG/Planes/planeBlue3.png deleted file mode 100644 index 7264222..0000000 Binary files a/examples/quickwings/assets/tappybird/PNG/Planes/planeBlue3.png and /dev/null differ diff --git a/examples/quickwings/assets/tappybird/PNG/Planes/planeGreen1.png b/examples/quickwings/assets/tappybird/PNG/Planes/planeGreen1.png deleted file mode 100644 index ba2949b..0000000 Binary files a/examples/quickwings/assets/tappybird/PNG/Planes/planeGreen1.png and /dev/null differ diff --git a/examples/quickwings/assets/tappybird/PNG/Planes/planeGreen2.png b/examples/quickwings/assets/tappybird/PNG/Planes/planeGreen2.png deleted file mode 100644 index 2ae3006..0000000 Binary files a/examples/quickwings/assets/tappybird/PNG/Planes/planeGreen2.png and /dev/null differ diff --git a/examples/quickwings/assets/tappybird/PNG/Planes/planeGreen3.png b/examples/quickwings/assets/tappybird/PNG/Planes/planeGreen3.png deleted file mode 100644 index 4b22f29..0000000 Binary files a/examples/quickwings/assets/tappybird/PNG/Planes/planeGreen3.png and /dev/null differ diff --git a/examples/quickwings/assets/tappybird/PNG/Planes/planeRed1.png b/examples/quickwings/assets/tappybird/PNG/Planes/planeRed1.png deleted file mode 100644 index c0d1ddb..0000000 Binary files a/examples/quickwings/assets/tappybird/PNG/Planes/planeRed1.png and /dev/null differ diff --git a/examples/quickwings/assets/tappybird/PNG/Planes/planeRed2.png b/examples/quickwings/assets/tappybird/PNG/Planes/planeRed2.png deleted file mode 100644 index a492b1d..0000000 Binary files a/examples/quickwings/assets/tappybird/PNG/Planes/planeRed2.png and /dev/null differ diff --git a/examples/quickwings/assets/tappybird/PNG/Planes/planeRed3.png b/examples/quickwings/assets/tappybird/PNG/Planes/planeRed3.png deleted file mode 100644 index 5ca6c70..0000000 Binary files a/examples/quickwings/assets/tappybird/PNG/Planes/planeRed3.png and /dev/null differ diff --git a/examples/quickwings/assets/tappybird/PNG/Planes/planeYellow1.png b/examples/quickwings/assets/tappybird/PNG/Planes/planeYellow1.png deleted file mode 100644 index 906947d..0000000 Binary files a/examples/quickwings/assets/tappybird/PNG/Planes/planeYellow1.png and /dev/null differ diff --git a/examples/quickwings/assets/tappybird/PNG/Planes/planeYellow2.png b/examples/quickwings/assets/tappybird/PNG/Planes/planeYellow2.png deleted file mode 100644 index aedbe37..0000000 Binary files a/examples/quickwings/assets/tappybird/PNG/Planes/planeYellow2.png and /dev/null differ diff --git a/examples/quickwings/assets/tappybird/PNG/Planes/planeYellow3.png b/examples/quickwings/assets/tappybird/PNG/Planes/planeYellow3.png deleted file mode 100644 index 6f2af91..0000000 Binary files a/examples/quickwings/assets/tappybird/PNG/Planes/planeYellow3.png and /dev/null differ diff --git a/examples/quickwings/assets/tappybird/PNG/UI/UIbg.png b/examples/quickwings/assets/tappybird/PNG/UI/UIbg.png deleted file mode 100644 index 0f238ff..0000000 Binary files a/examples/quickwings/assets/tappybird/PNG/UI/UIbg.png and /dev/null differ diff --git a/examples/quickwings/assets/tappybird/PNG/UI/buttonLarge.png b/examples/quickwings/assets/tappybird/PNG/UI/buttonLarge.png deleted file mode 100644 index edda3bc..0000000 Binary files a/examples/quickwings/assets/tappybird/PNG/UI/buttonLarge.png and /dev/null differ diff --git a/examples/quickwings/assets/tappybird/PNG/UI/buttonSmall.png b/examples/quickwings/assets/tappybird/PNG/UI/buttonSmall.png deleted file mode 100644 index ff1fbae..0000000 Binary files a/examples/quickwings/assets/tappybird/PNG/UI/buttonSmall.png and /dev/null differ diff --git a/examples/quickwings/assets/tappybird/PNG/UI/medalBronze.png b/examples/quickwings/assets/tappybird/PNG/UI/medalBronze.png deleted file mode 100644 index 18ee3df..0000000 Binary files a/examples/quickwings/assets/tappybird/PNG/UI/medalBronze.png and /dev/null differ diff --git a/examples/quickwings/assets/tappybird/PNG/UI/medalGold.png b/examples/quickwings/assets/tappybird/PNG/UI/medalGold.png deleted file mode 100644 index 9a41593..0000000 Binary files a/examples/quickwings/assets/tappybird/PNG/UI/medalGold.png and /dev/null differ diff --git a/examples/quickwings/assets/tappybird/PNG/UI/medalSilver.png b/examples/quickwings/assets/tappybird/PNG/UI/medalSilver.png deleted file mode 100644 index dd6bb8e..0000000 Binary files a/examples/quickwings/assets/tappybird/PNG/UI/medalSilver.png and /dev/null differ diff --git a/examples/quickwings/assets/tappybird/PNG/UI/tap.png b/examples/quickwings/assets/tappybird/PNG/UI/tap.png deleted file mode 100644 index 5c82864..0000000 Binary files a/examples/quickwings/assets/tappybird/PNG/UI/tap.png and /dev/null differ diff --git a/examples/quickwings/assets/tappybird/PNG/UI/tapLeft.png b/examples/quickwings/assets/tappybird/PNG/UI/tapLeft.png deleted file mode 100644 index 336fd1d..0000000 Binary files a/examples/quickwings/assets/tappybird/PNG/UI/tapLeft.png and /dev/null differ diff --git a/examples/quickwings/assets/tappybird/PNG/UI/tapRight.png b/examples/quickwings/assets/tappybird/PNG/UI/tapRight.png deleted file mode 100644 index daec2ca..0000000 Binary files a/examples/quickwings/assets/tappybird/PNG/UI/tapRight.png and /dev/null differ diff --git a/examples/quickwings/assets/tappybird/PNG/UI/tapTick.png b/examples/quickwings/assets/tappybird/PNG/UI/tapTick.png deleted file mode 100644 index 5ba2731..0000000 Binary files a/examples/quickwings/assets/tappybird/PNG/UI/tapTick.png and /dev/null differ diff --git a/examples/quickwings/assets/tappybird/PNG/UI/textGameOver.png b/examples/quickwings/assets/tappybird/PNG/UI/textGameOver.png deleted file mode 100644 index 11d730d..0000000 Binary files a/examples/quickwings/assets/tappybird/PNG/UI/textGameOver.png and /dev/null differ diff --git a/examples/quickwings/assets/tappybird/PNG/UI/textGetReady.png b/examples/quickwings/assets/tappybird/PNG/UI/textGetReady.png deleted file mode 100644 index ed0d035..0000000 Binary files a/examples/quickwings/assets/tappybird/PNG/UI/textGetReady.png and /dev/null differ diff --git a/examples/quickwings/assets/tappybird/PNG/background.png b/examples/quickwings/assets/tappybird/PNG/background.png deleted file mode 100644 index 05c6a07..0000000 Binary files a/examples/quickwings/assets/tappybird/PNG/background.png and /dev/null differ diff --git a/examples/quickwings/assets/tappybird/PNG/groundDirt.png b/examples/quickwings/assets/tappybird/PNG/groundDirt.png deleted file mode 100644 index 4223b3c..0000000 Binary files a/examples/quickwings/assets/tappybird/PNG/groundDirt.png and /dev/null differ diff --git a/examples/quickwings/assets/tappybird/PNG/groundGrass.png b/examples/quickwings/assets/tappybird/PNG/groundGrass.png deleted file mode 100644 index fd3655e..0000000 Binary files a/examples/quickwings/assets/tappybird/PNG/groundGrass.png and /dev/null differ diff --git a/examples/quickwings/assets/tappybird/PNG/groundIce.png b/examples/quickwings/assets/tappybird/PNG/groundIce.png deleted file mode 100644 index 4ae4512..0000000 Binary files a/examples/quickwings/assets/tappybird/PNG/groundIce.png and /dev/null differ diff --git a/examples/quickwings/assets/tappybird/PNG/groundRock.png b/examples/quickwings/assets/tappybird/PNG/groundRock.png deleted file mode 100644 index c7fc7f1..0000000 Binary files a/examples/quickwings/assets/tappybird/PNG/groundRock.png and /dev/null differ diff --git a/examples/quickwings/assets/tappybird/PNG/groundSnow.png b/examples/quickwings/assets/tappybird/PNG/groundSnow.png deleted file mode 100644 index 891e3e0..0000000 Binary files a/examples/quickwings/assets/tappybird/PNG/groundSnow.png and /dev/null differ diff --git a/examples/quickwings/assets/tappybird/PNG/puffLarge.png b/examples/quickwings/assets/tappybird/PNG/puffLarge.png deleted file mode 100644 index 4023cc7..0000000 Binary files a/examples/quickwings/assets/tappybird/PNG/puffLarge.png and /dev/null differ diff --git a/examples/quickwings/assets/tappybird/PNG/puffSmall.png b/examples/quickwings/assets/tappybird/PNG/puffSmall.png deleted file mode 100644 index 12dfc4b..0000000 Binary files a/examples/quickwings/assets/tappybird/PNG/puffSmall.png and /dev/null differ diff --git a/examples/quickwings/assets/tappybird/PNG/rock.png b/examples/quickwings/assets/tappybird/PNG/rock.png deleted file mode 100644 index 1a89ad9..0000000 Binary files a/examples/quickwings/assets/tappybird/PNG/rock.png and /dev/null differ diff --git a/examples/quickwings/assets/tappybird/PNG/rockDown.png b/examples/quickwings/assets/tappybird/PNG/rockDown.png deleted file mode 100644 index 90edad5..0000000 Binary files a/examples/quickwings/assets/tappybird/PNG/rockDown.png and /dev/null differ diff --git a/examples/quickwings/assets/tappybird/PNG/rockGrass.png b/examples/quickwings/assets/tappybird/PNG/rockGrass.png deleted file mode 100644 index 2f06686..0000000 Binary files a/examples/quickwings/assets/tappybird/PNG/rockGrass.png and /dev/null differ diff --git a/examples/quickwings/assets/tappybird/PNG/rockGrassDown.png b/examples/quickwings/assets/tappybird/PNG/rockGrassDown.png deleted file mode 100644 index d6a18c6..0000000 Binary files a/examples/quickwings/assets/tappybird/PNG/rockGrassDown.png and /dev/null differ diff --git a/examples/quickwings/assets/tappybird/PNG/rockIce.png b/examples/quickwings/assets/tappybird/PNG/rockIce.png deleted file mode 100644 index 7dc1fca..0000000 Binary files a/examples/quickwings/assets/tappybird/PNG/rockIce.png and /dev/null differ diff --git a/examples/quickwings/assets/tappybird/PNG/rockIceDown.png b/examples/quickwings/assets/tappybird/PNG/rockIceDown.png deleted file mode 100644 index 1ed4858..0000000 Binary files a/examples/quickwings/assets/tappybird/PNG/rockIceDown.png and /dev/null differ diff --git a/examples/quickwings/assets/tappybird/PNG/rockSnow.png b/examples/quickwings/assets/tappybird/PNG/rockSnow.png deleted file mode 100644 index 6c20222..0000000 Binary files a/examples/quickwings/assets/tappybird/PNG/rockSnow.png and /dev/null differ diff --git a/examples/quickwings/assets/tappybird/PNG/rockSnowDown.png b/examples/quickwings/assets/tappybird/PNG/rockSnowDown.png deleted file mode 100644 index 7bac5dd..0000000 Binary files a/examples/quickwings/assets/tappybird/PNG/rockSnowDown.png and /dev/null differ diff --git a/examples/quickwings/assets/tappybird/PNG/starBronze.png b/examples/quickwings/assets/tappybird/PNG/starBronze.png deleted file mode 100644 index 6ad5c8e..0000000 Binary files a/examples/quickwings/assets/tappybird/PNG/starBronze.png and /dev/null differ diff --git a/examples/quickwings/assets/tappybird/PNG/starGold.png b/examples/quickwings/assets/tappybird/PNG/starGold.png deleted file mode 100644 index c866382..0000000 Binary files a/examples/quickwings/assets/tappybird/PNG/starGold.png and /dev/null differ diff --git a/examples/quickwings/assets/tappybird/PNG/starSilver.png b/examples/quickwings/assets/tappybird/PNG/starSilver.png deleted file mode 100644 index 3ad059c..0000000 Binary files a/examples/quickwings/assets/tappybird/PNG/starSilver.png and /dev/null differ diff --git a/examples/quickwings/assets/tappybird/Spritesheet/planes.png b/examples/quickwings/assets/tappybird/Spritesheet/planes.png deleted file mode 100644 index cd94487..0000000 Binary files a/examples/quickwings/assets/tappybird/Spritesheet/planes.png and /dev/null differ diff --git a/examples/quickwings/assets/tappybird/Spritesheet/planes.xml b/examples/quickwings/assets/tappybird/Spritesheet/planes.xml deleted file mode 100644 index 82733ab..0000000 --- a/examples/quickwings/assets/tappybird/Spritesheet/planes.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/examples/quickwings/assets/tappybird/Spritesheet/sheet.png b/examples/quickwings/assets/tappybird/Spritesheet/sheet.png deleted file mode 100644 index 2584c66..0000000 Binary files a/examples/quickwings/assets/tappybird/Spritesheet/sheet.png and /dev/null differ diff --git a/examples/quickwings/assets/tappybird/Spritesheet/sheet.xml b/examples/quickwings/assets/tappybird/Spritesheet/sheet.xml deleted file mode 100644 index 129f283..0000000 --- a/examples/quickwings/assets/tappybird/Spritesheet/sheet.xml +++ /dev/null @@ -1,81 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/examples/quickwings/assets/tappybird/Vector/vector.svg b/examples/quickwings/assets/tappybird/Vector/vector.svg deleted file mode 100644 index 92800b3..0000000 --- a/examples/quickwings/assets/tappybird/Vector/vector.svg +++ /dev/null @@ -1,510 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/examples/quickwings/assets/tappybird/Vector/vector.swf b/examples/quickwings/assets/tappybird/Vector/vector.swf deleted file mode 100644 index 4956561..0000000 Binary files a/examples/quickwings/assets/tappybird/Vector/vector.swf and /dev/null differ diff --git a/examples/quickwings/assets/tappybird/license.txt b/examples/quickwings/assets/tappybird/license.txt deleted file mode 100644 index b1a5ebe..0000000 --- a/examples/quickwings/assets/tappybird/license.txt +++ /dev/null @@ -1,14 +0,0 @@ - -############################################################################### - - Tappy Plane by Kenney Vleugels (www.kenney.nl) - - ------------------------------ - - License (CC0) - http://creativecommons.org/publicdomain/zero/1.0/ - - You may use these graphics in personal and commercial projects. - Credit (Kenney or www.kenney.nl) would be nice but is not mandatory. - -############################################################################### \ No newline at end of file diff --git a/examples/quickwings/assets/tappybird/preview.png b/examples/quickwings/assets/tappybird/preview.png deleted file mode 100644 index 21772c0..0000000 Binary files a/examples/quickwings/assets/tappybird/preview.png and /dev/null differ diff --git a/examples/quickwings/assets/tappybird/sample.png b/examples/quickwings/assets/tappybird/sample.png deleted file mode 100644 index efccaf4..0000000 Binary files a/examples/quickwings/assets/tappybird/sample.png and /dev/null differ diff --git a/examples/quickwings/quickwings.cpp b/examples/quickwings/quickwings.cpp index 9df112b..2d8bd96 100644 --- a/examples/quickwings/quickwings.cpp +++ b/examples/quickwings/quickwings.cpp @@ -1,10 +1,14 @@ /** * paradiso - Paradigmen der Softwareentwicklung * - * (c) Copyright 2023-2024 Hartmut Seichter, Robin Rottstädt, brxxh (Hannes Brothuhn) + * (c) Copyright 2023 Hartmut Seichter, Robin Rottstädt, brxxh (Hannes Brothuhn) * */ +#include +#include +#include +#include #include #include #include @@ -16,7 +20,14 @@ #include #include +#include +#include #include +#include +#include +#include + +// #include "lib/image_loader.hpp" const int frame_rate = 60; bool game_over = false; @@ -104,7 +115,7 @@ struct Pipe { .scale = {paradiso::Vector2::make(((500.0f - (500.0f - 52.0f)) / 500.0f) * 2.25f, ((700.0f - (700.0f - 320.0f)) / 700.0f) * 2.25f)}}; paused = true; - + } void update() { @@ -152,7 +163,7 @@ struct Pipe { shader.set_uniform("pivot", pipe_bottom.pivot); shader.set_uniform("scale", pipe_bottom.scale); renderer1.draw(pipe_bottom, shader); - + shader.set_uniform("pivot", pipe_top.pivot); shader.set_uniform("scale", pipe_top.scale); shader.set_uniform("rotation", pipe_top.rotation); @@ -291,12 +302,12 @@ struct QuickWings { if (game_over == true) { paused = true; } - + // Stop game if (paused) { return; } - else { + else { // Apply gravity velocity += gravity; @@ -395,7 +406,7 @@ struct Message { messageSprite.pivot.y() = pos; } } - + void on_keyboard(const paradiso::Window::KeyboardInputStack& input) { if (input.size()) { start = true; @@ -506,7 +517,7 @@ auto main() -> int { grass.draw(shader); message.draw(shader); - if (game_over == true) { + if (game_over == true) { gameover.draw(shader); } diff --git a/src/lib/include/paradiso/aabb.hpp b/src/lib/include/paradiso/aabb.hpp index cad123f..62267bf 100644 --- a/src/lib/include/paradiso/aabb.hpp +++ b/src/lib/include/paradiso/aabb.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2023-2024 Hartmut Seichter + * Copyright 2023 Hartmut Seichter * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -59,4 +59,4 @@ struct AABB final { } // namespace paradiso -#endif +#endif \ No newline at end of file diff --git a/src/lib/include/paradiso/bitmap.hpp b/src/lib/include/paradiso/bitmap.hpp index d6971f5..d75d352 100644 --- a/src/lib/include/paradiso/bitmap.hpp +++ b/src/lib/include/paradiso/bitmap.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2023-2024 Hartmut Seichter + * Copyright 2023 Hartmut Seichter * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -106,4 +106,4 @@ struct Bitmap final { }; } // namespace paradiso -#endif +#endif \ No newline at end of file diff --git a/src/lib/include/paradiso/bitmap_io.hpp b/src/lib/include/paradiso/bitmap_io.hpp index af0c529..0ed2cff 100644 --- a/src/lib/include/paradiso/bitmap_io.hpp +++ b/src/lib/include/paradiso/bitmap_io.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2023-2024 Hartmut Seichter + * Copyright 2023 Hartmut Seichter * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -53,4 +53,4 @@ struct BitmapIO { } // namespace paradiso -#endif +#endif \ No newline at end of file diff --git a/src/lib/include/paradiso/context.hpp b/src/lib/include/paradiso/context.hpp index 31a9ac1..f53495a 100644 --- a/src/lib/include/paradiso/context.hpp +++ b/src/lib/include/paradiso/context.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2023-2024 Hartmut Seichter + * Copyright 2023 Hartmut Seichter * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/lib/include/paradiso/geometry.hpp b/src/lib/include/paradiso/geometry.hpp index acd018a..e3a8393 100644 --- a/src/lib/include/paradiso/geometry.hpp +++ b/src/lib/include/paradiso/geometry.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2023-2024 Hartmut Seichter + * Copyright 2023 Hartmut Seichter * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -71,4 +71,4 @@ struct Rectangle final { }; } // namespace paradiso -#endif +#endif \ No newline at end of file diff --git a/src/lib/include/paradiso/globals.hpp b/src/lib/include/paradiso/globals.hpp index 440bc7d..3c126ed 100644 --- a/src/lib/include/paradiso/globals.hpp +++ b/src/lib/include/paradiso/globals.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2023-2024 Hartmut Seichter + * Copyright 2023 Hartmut Seichter * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -41,4 +41,4 @@ -#endif +#endif \ No newline at end of file diff --git a/src/lib/include/paradiso/matrix.hpp b/src/lib/include/paradiso/matrix.hpp index c359a87..f5c87e0 100644 --- a/src/lib/include/paradiso/matrix.hpp +++ b/src/lib/include/paradiso/matrix.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2023-2024 Hartmut Seichter + * Copyright 2023 Hartmut Seichter * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -32,7 +32,7 @@ namespace paradiso { template struct Matrix : MatrixBase> { - Scalar data[R * C]{}; + Scalar data[R * C]{}; static constexpr std::size_t rows{R}; static constexpr std::size_t cols{C}; diff --git a/src/lib/include/paradiso/matrixbase.hpp b/src/lib/include/paradiso/matrixbase.hpp index b20a8d4..491102b 100644 --- a/src/lib/include/paradiso/matrixbase.hpp +++ b/src/lib/include/paradiso/matrixbase.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2023-2024 Hartmut Seichter + * Copyright 2023 Hartmut Seichter * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -144,4 +144,4 @@ template struct MatrixBase { }; } // namespace paradiso -#endif +#endif \ No newline at end of file diff --git a/src/lib/include/paradiso/renderer.hpp b/src/lib/include/paradiso/renderer.hpp index b52a908..2f349de 100644 --- a/src/lib/include/paradiso/renderer.hpp +++ b/src/lib/include/paradiso/renderer.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2023-2024 Hartmut Seichter + * Copyright 2023 Hartmut Seichter * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/lib/include/paradiso/rgba.hpp b/src/lib/include/paradiso/rgba.hpp index d7745e2..0ab6ec4 100644 --- a/src/lib/include/paradiso/rgba.hpp +++ b/src/lib/include/paradiso/rgba.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2023-2024 Hartmut Seichter + * Copyright 2023 Hartmut Seichter * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -90,4 +90,4 @@ struct RGBA final { }; } // namespace paradiso -#endif +#endif \ No newline at end of file diff --git a/src/lib/include/paradiso/shader.hpp b/src/lib/include/paradiso/shader.hpp index d51f6cf..549fe7d 100644 --- a/src/lib/include/paradiso/shader.hpp +++ b/src/lib/include/paradiso/shader.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2023-2024 Hartmut Seichter + * Copyright 2023 Hartmut Seichter * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -58,7 +58,7 @@ struct Shader final { const Shader& set_uniform_at_location(int location, float v) const; //!< sets a float in a shader - + const Shader& set_uniform_at_location( int location, uint32_t v) const; //!< sets a 32bit unsigned in a shader diff --git a/src/lib/include/paradiso/sprite.hpp b/src/lib/include/paradiso/sprite.hpp index a518e51..34a024b 100644 --- a/src/lib/include/paradiso/sprite.hpp +++ b/src/lib/include/paradiso/sprite.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2023-2024 Hartmut Seichter + * Copyright 2023 Hartmut Seichter * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -72,4 +72,4 @@ struct Sprite final { }; } // namespace paradiso -#endif +#endif \ No newline at end of file diff --git a/src/lib/include/paradiso/vector.hpp b/src/lib/include/paradiso/vector.hpp index 2012ef5..647f8cf 100644 --- a/src/lib/include/paradiso/vector.hpp +++ b/src/lib/include/paradiso/vector.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2023-2024 Hartmut Seichter + * Copyright 2023 Hartmut Seichter * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -82,4 +82,4 @@ template struct Vector3 : Matrix<3, 1, T> { }; // namespace paradiso -#endif +#endif \ No newline at end of file diff --git a/src/lib/include/paradiso/window.hpp b/src/lib/include/paradiso/window.hpp index 91337ac..6613b99 100644 --- a/src/lib/include/paradiso/window.hpp +++ b/src/lib/include/paradiso/window.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2023-2024 Hartmut Seichter + * Copyright 2023 Hartmut Seichter * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -89,4 +89,4 @@ struct Window final { } // namespace paradiso -#endif +#endif \ No newline at end of file diff --git a/src/lib/src/bitmap_io.cpp b/src/lib/src/bitmap_io.cpp index 3490669..fabfda3 100644 --- a/src/lib/src/bitmap_io.cpp +++ b/src/lib/src/bitmap_io.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2023-2024 Hartmut Seichter + * Copyright 2023 Hartmut Seichter * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -138,4 +138,4 @@ std::string BitmapIO::path() const } -} // namespace paradiso +} // namespace paradiso \ No newline at end of file diff --git a/src/lib/src/context.cpp b/src/lib/src/context.cpp index 6ef465c..031ca07 100644 --- a/src/lib/src/context.cpp +++ b/src/lib/src/context.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2023-2024 Hartmut Seichter + * Copyright 2023 Hartmut Seichter * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -71,7 +71,7 @@ struct Context::impl { Context::Context() : impl_(std::make_unique()) {} -Context::~Context() = default; +Context::~Context() {} Context& Context::set_blend() { return *this; } diff --git a/src/lib/src/renderer.cpp b/src/lib/src/renderer.cpp index ab03c23..3c5853d 100644 --- a/src/lib/src/renderer.cpp +++ b/src/lib/src/renderer.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2023-2024 Hartmut Seichter + * Copyright 2023 Hartmut Seichter * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -34,7 +34,7 @@ #include #include -#if defined(_WIN32) +#if defined(_WIN32) #undef max #endif diff --git a/src/lib/src/shader.cpp b/src/lib/src/shader.cpp index e3d6b73..7a6b04e 100644 --- a/src/lib/src/shader.cpp +++ b/src/lib/src/shader.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2023-2024 Hartmut Seichter + * Copyright 2023 Hartmut Seichter * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/lib/src/shader_sprite.hpp b/src/lib/src/shader_sprite.hpp index 1f546c9..fc4c15d 100644 --- a/src/lib/src/shader_sprite.hpp +++ b/src/lib/src/shader_sprite.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2023-2024 Hartmut Seichter + * Copyright 2023 Hartmut Seichter * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -34,7 +34,7 @@ layout (location = 2) in vec2 texture_coords; // pivot der sprite uniform vec2 pivot = vec2( 0.0, 0.0 ); -// scale +// scale uniform vec2 scale = vec2( 1.0, 1.0 ); // rotation uniform float rotation = 0.0; @@ -80,4 +80,4 @@ void main() { })"; } // namespace paradiso -#endif +#endif \ No newline at end of file diff --git a/src/lib/src/window.cpp b/src/lib/src/window.cpp index a264dcf..4962439 100644 --- a/src/lib/src/window.cpp +++ b/src/lib/src/window.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2023-2024 Hartmut Seichter + * Copyright 2023 Hartmut Seichter * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal