From 3e342396fe218e4f7174dfca17b7bf9ed5377152 Mon Sep 17 00:00:00 2001 From: Simon Hardt Date: Thu, 3 Mar 2022 20:58:10 +0100 Subject: [PATCH] include fix --- frame/src/Vector.hpp | 12 +++++++++--- frame/src/main.cpp | 32 ++++++++++++++++++++++++++++--- frame/src/render/RenderTarget.cpp | 7 ++++++- 3 files changed, 44 insertions(+), 7 deletions(-) diff --git a/frame/src/Vector.hpp b/frame/src/Vector.hpp index 75c958c..15d1173 100644 --- a/frame/src/Vector.hpp +++ b/frame/src/Vector.hpp @@ -1,4 +1,5 @@ #pragma once +#include #include "Size.hpp" @@ -10,7 +11,7 @@ namespace frame int32_t y; Vector() = default; - Vector(int32_t x, int32_t) + Vector(int32_t x, int32_t y) : x(x) , y(y) { @@ -18,7 +19,7 @@ namespace frame Vector(Size const& size) : x(size.width) - , y(size.width) + , y(size.height) { } @@ -53,4 +54,9 @@ namespace frame return a; } -} // namespace frame \ No newline at end of file + inline std::ostream& operator<<(std::ostream& os, Vector const& v) + { + return os << "x: "<< v.x << " y: " << v.y; + } + +} // namespace frame diff --git a/frame/src/main.cpp b/frame/src/main.cpp index 8ee0a48..6310f24 100644 --- a/frame/src/main.cpp +++ b/frame/src/main.cpp @@ -2,14 +2,27 @@ #include #include #include +#include using namespace std::chrono_literals; #include "display/EPD_7in5_V2.hpp" #include "render/RenderTarget.hpp" + int main() { + double const pi = 3.14159; + + std::cout << "pi: " << pi << " " << 3.14159f << std::endl; + std::cout << "pi / 180;" << pi / 180.f << std::endl; + for(int i = 0; i < 360; i += 45) + { + std::cout << "(i): " << i << std::endl; + std::cout << "rad: " << (float)i * pi / 180.f << std::endl; + } + + return 0; frame::display::EPD_7in5_V2 display{}; @@ -21,15 +34,28 @@ int main() frame::Vector const center = (display.getSize() / 2); + frame::Vector v = {10, 12}; + std::cout << "Main: " << v << std::endl; + target.DrawPixel({10, 10}, frame::BLACK); - target.DrawLine({10, 12}, {100, 12}, frame::BLACK); + target.DrawLine(v, {100, 12}, frame::BLACK); for(int i = 0; i < 360; i += 45) { auto end = center; - end.x += (int)std::cos(i * 0.01745329); - end.y += (int)std::sin(i * 0.01745329); + double const cos_ = i * 0.01745329; + std::cout << i << " cos: " << cos_ << std::endl; + double x = std::cos(cos_); + double y = std::sin(i * 0.01745329); + x *= 50.f; + y *= 50.f; + std::cout << x << " " << (int)x << " " << y << std::endl; + end.x += (int)x; + end.y += (int)y; + + + std::cout << end << std::endl; target.DrawLine(center, end); } diff --git a/frame/src/render/RenderTarget.cpp b/frame/src/render/RenderTarget.cpp index 0d8ca4d..850fcdf 100644 --- a/frame/src/render/RenderTarget.cpp +++ b/frame/src/render/RenderTarget.cpp @@ -1,5 +1,8 @@ #include "RenderTarget.hpp" +#include +#include + namespace frame::render { @@ -26,6 +29,7 @@ namespace frame::render auto pos = start; auto E = 2 * deltaY - deltaX; + std::cout << "Start: " << start << " End: " << end << std::endl; DrawPixel(pos, color); while(pos != end) @@ -42,8 +46,9 @@ namespace frame::render E += 2 * deltaY - 2 * deltaX; } + std::cout << pos << std::endl; DrawPixel(pos, color); } } -} // namespace frame::render \ No newline at end of file +} // namespace frame::render