update cpp terminal

This commit is contained in:
onyad 2023-07-15 18:36:36 +03:00
parent 90655306f1
commit 89042ba754
3 changed files with 12 additions and 9 deletions

View file

@ -2,7 +2,7 @@
#include <window/window.hpp> #include <window/window.hpp>
#include <cpp-terminal/base.hpp> #include "cpp-terminal/io.hpp"
#include <cpp-terminal/input.hpp> #include <cpp-terminal/input.hpp>
#include <thread> #include <thread>
@ -98,7 +98,7 @@ int main() {
auto [w, h] = win.GetSize(); auto [w, h] = win.GetSize();
for (long long it = 0; it < 1000000000000000; ++it) { for (long long it = 0; it < 1000000000000000; ++it) {
float alp = it / 10.; float alp = it / 100.;
t.p.x = cos(alp); t.p.x = cos(alp);
t.p.y = sin(alp); t.p.y = sin(alp);
s.r = sin(alp * sqrt(2)); s.r = sin(alp * sqrt(2));

View file

@ -1,8 +1,9 @@
#include <window/window.hpp> #include <window/window.hpp>
#include <iostream> #include <iostream>
#include <cpp-terminal/base.hpp> #include "cpp-terminal/io.hpp"
#include "cpp-terminal/input.hpp" #include "cpp-terminal/input.hpp"
#include "cpp-terminal/screen.hpp"
namespace gui { namespace gui {
Window::Window() { Window::Window() {
@ -10,7 +11,7 @@ Window::Window() {
} }
void Window::ReloadSize() { void Window::ReloadSize() {
std::tie(height_, width_) = Term::get_size(); std::tie(height_, width_) = Term::screen_size().size();
current_grid_.resize(width_); current_grid_.resize(width_);
buffer_grid_.resize(width_); buffer_grid_.resize(width_);
@ -50,10 +51,10 @@ void Window::Draw() {
cur = buf; cur = buf;
if (buf.not_empty_background_color) { if (buf.not_empty_background_color) {
std::cout << Term::color_bg(Term::Color4::DEFAULT); std::cout << Term::color_bg(Term::Color::Name::Default);
} }
if (buf.not_empty_font_color) { if (buf.not_empty_font_color) {
std::cout << Term::color_fg(Term::Color4::DEFAULT); std::cout << Term::color_fg(Term::Color::Name::Default);
} }
} }
} }

View file

@ -2,8 +2,10 @@
#include <cstddef> #include <cstddef>
#include <vector> #include <vector>
#include <tuple>
#include <cpp-terminal/base.hpp> #include "cpp-terminal/io.hpp"
#include "cpp-terminal/color.hpp"
namespace gui { namespace gui {
@ -15,8 +17,8 @@ struct Color {
bool operator==(const Color&) const = default; bool operator==(const Color&) const = default;
bool operator!=(const Color&) const = default; bool operator!=(const Color&) const = default;
operator Term::RGB() { operator Term::Color() {
return Term::RGB{r, g, b}; return Term::Color{r, g, b};
} }
uint8_t r, g, b; uint8_t r, g, b;