curds/boredos_mirror
1
0
Fork 0
mirror of https://github.com/BoredDevNL/BoredOS.git synced 2026-05-15 10:48:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

FEAT: always rotate 3d graph

Browse source
This commit is contained in:
boreddevnl 2026-04-02 17:51:43 +02:00
parent 823e9c0ce7
commit bf3c2cb578
2 changed files with 35 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/userland/gui/grapher.c
View file

@ -519,7 +519,6 @@ static void parse_equation(void) {
lhs_root = parse_expr(lt, &lp, lhs_nodes, &lhs_nc);
rhs_root = parse_expr(rt, &rp, rhs_nodes, &rhs_nc);
} else {
// No '=': treat as y = expr (2D) or expr = 0
Token tt[MAX_TOKENS];
tokenize(eq_buffer, tt);
int tp = 0;
@ -1318,13 +1317,18 @@ int main(void) {
}
}
if (graph_mode == MODE_3D) {
rot_y += 0.01;
needs_repaint = true;
}
if (needs_repaint) {
paint_all();
needs_repaint = false;
}
if (!got_event) {
sleep(10);
sleep(16);
}
}

39
src/wm/graphics.c
View file

@ -496,7 +496,6 @@ void draw_char(int x, int y, char c, uint32_t color) {
}
}
// Bitmap-only version for terminal — always uses 8x8 bitmap font regardless of TTF
void draw_char_bitmap(int x, int y, char c, uint32_t color) {
unsigned char uc = (unsigned char)c;
if (uc > 127) return;
@ -576,7 +575,6 @@ void draw_string_scaled(int x, int y, const char *s, uint32_t color, float scale
int cur_x = x;
if (g_current_ttf) {
// We let the font manager handle the stbtt scale internally to avoid bringing stb_truetype into graphics.c
int baseline = y + font_manager_get_font_ascent_scaled(g_current_ttf, scale) - 2;
int line_height = font_manager_get_font_line_height_scaled(g_current_ttf, scale);
@ -812,12 +810,6 @@ void graphics_flip_buffer(void) {
int gray = (r * 77 + g * 150 + b * 29) >> 8;
// Boost contrast by 2x to separate the dark UI colors:
// Background (~30) -> 60
// Panel (~40) -> 80
// With thresholds {0, 64, 128, 192}:
// BG > 0 (1/4 white), Panel > 64 (2/4 white - checkerboard)
// Text (~170) -> 255 (solid white)
gray = gray * 2;
if (gray > 255) gray = 255;
@ -849,11 +841,38 @@ void graphics_copy_screenbuffer(uint32_t *dest) {
int sw = (int)g_fb->width;
int sh = (int)g_fb->height;
// Copy from the composition back buffer
// Copy from the composition back buffer, applying color mode transformations if necessary
for (int y = 0; y < sh; y++) {
uint32_t *src_row = &g_back_buffer[y * sw];
for (int x = 0; x < sw; x++) {
dest[y * sw + x] = src_row[x];
uint32_t px = src_row[x];
if (g_color_mode == 1) { // 8-bit Grayscale
uint8_t r = (px >> 16) & 0xFF;
uint8_t g = (px >> 8) & 0xFF;
uint8_t b = px & 0xFF;
uint8_t gray = (uint8_t)((r * 77 + g * 150 + b * 29) >> 8);
dest[y * sw + x] = 0xFF000000 | (gray << 16) | (gray << 8) | gray;
} else if (g_color_mode == 2) { // 1-bit Monochrome (Dithered)
static const uint8_t bayer2[2][2] = {
{ 0, 128 },
{192, 64 }
};
uint8_t r = (px >> 16) & 0xFF;
uint8_t g = (px >> 8) & 0xFF;
uint8_t b = px & 0xFF;
int gray = (r * 77 + g * 150 + b * 29) >> 8;
// Boost contrast (matches graphics_flip_buffer logic)
gray = gray * 2;
if (gray > 255) gray = 255;
uint8_t threshold = bayer2[y & 1][x & 1];
dest[y * sw + x] = (gray > threshold) ? 0xFFFFFFFF : 0xFF000000;
} else {
// 32-bit (Standard)
dest[y * sw + x] = px;
}
}
}