gered/ggdt
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

hack-fixes to triangle_2d_custom and bitmap texcoord sampling. ugh!

Browse source 
this is terrible but i do not currently know what the fuck is going on
This commit is contained in:
Gered 2023-04-01 11:09:30 -04:00
parent 80d3ae91e7
commit 67bcbec69b
2 changed files with 18 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
ggdt/src/graphics/bitmap/primitives.rs
View file

@ -3,6 +3,7 @@ use std::mem::swap;
use crate::graphics::bitmap::Bitmap; use crate::graphics::bitmap::Bitmap;
use crate::graphics::font::{Character, Font, FontRenderOpts}; use crate::graphics::font::{Character, Font, FontRenderOpts};
use crate::graphics::Pixel; use crate::graphics::Pixel;
use crate::math::lerp;
use crate::math::rect::Rect; use crate::math::rect::Rect;
impl<PixelType: Pixel> Bitmap<PixelType> { impl<PixelType: Pixel> Bitmap<PixelType> {
@ -68,8 +69,14 @@ impl<PixelType: Pixel> Bitmap<PixelType> {
#[inline] #[inline]
pub fn sample_at(&self, u: f32, v: f32) -> PixelType { pub fn sample_at(&self, u: f32, v: f32) -> PixelType {
let x = (u * self.width as f32) as i32 % self.width as i32; // HACK: the 0.00001 shit. there is some weird and classic "off-by-1" issue happening SOMEWHERE in the
let y = (v * self.height as f32) as i32 % self.height as i32; // textured 2d triangle rendering and i cannot find it. every other article i've read on the subject
// doesn't seem to do anything special here so either i'm doing something wrong or no one else tests
// their shit either. i just don't know which it is! but this hack fix definitely is all kinds of shit.
// i have no doubt that this "Fix" will probably be the source of OTHER issues too that i've just not
// seen yet in my testing. ugh.
let x = lerp(0.0, self.width as f32 - 0.00001, u) as i32 % self.width as i32;
let y = lerp(0.0, self.height as f32 - 0.00001, v) as i32 % self.height as i32;
unsafe { self.get_pixel_unchecked(x, y) } unsafe { self.get_pixel_unchecked(x, y) }
} }

18
ggdt/src/graphics/bitmap/triangles.rs
View file

@ -60,15 +60,15 @@ impl<PixelType: Pixel> Bitmap<PixelType> {
// ordering but the math presented seems to only work as-is with clockwise ordering ... *grumble* // ordering but the math presented seems to only work as-is with clockwise ordering ... *grumble*
// TODO: implement fill rules, probably using top-left ordering as most 3d APIs do i guess // TODO: implement fill rules, probably using top-left ordering as most 3d APIs do i guess
let min_x = a.x.min(b.x).min(c.x); let min_x = a.x.min(b.x).min(c.x).floor() as i32;
let min_y = a.y.min(b.y).min(c.y); let min_y = a.y.min(b.y).min(c.y).floor() as i32;
let max_x = a.x.max(b.x).max(c.x); let max_x = a.x.max(b.x).max(c.x).ceil() as i32;
let max_y = a.y.max(b.y).max(c.y); let max_y = a.y.max(b.y).max(c.y).ceil() as i32;
let min_x = std::cmp::max(self.clip_region().x, min_x as i32); let min_x = std::cmp::max(self.clip_region().x, min_x);
let min_y = std::cmp::max(self.clip_region().y, min_y as i32); let min_y = std::cmp::max(self.clip_region().y, min_y);
let max_x = std::cmp::min(self.clip_region().right(), max_x as i32); let max_x = std::cmp::min(self.clip_region().right(), max_x);
let max_y = std::cmp::min(self.clip_region().bottom(), max_y as i32); let max_y = std::cmp::min(self.clip_region().bottom(), max_y);
let draw_width = (max_x - min_x + 1) as usize; let draw_width = (max_x - min_x + 1) as usize;
let next_row_inc = self.width() as usize; let next_row_inc = self.width() as usize;
@ -79,7 +79,7 @@ impl<PixelType: Pixel> Bitmap<PixelType> {
for (idx, pixel) in row_pixels.iter_mut().enumerate() { for (idx, pixel) in row_pixels.iter_mut().enumerate() {
let x = min_x + idx as i32; let x = min_x + idx as i32;
let p = Vector2::new(x as f32 + 0.5, y as f32 + 0.5); let p = Vector2::new(x as f32, y as f32);
let w0 = cross(b, c, p); let w0 = cross(b, c, p);
let w1 = cross(c, a, p); let w1 = cross(c, a, p);
let w2 = cross(a, b, p); let w2 = cross(a, b, p);