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

some similar changes in indexed triangle_2d drawing

Browse source
This commit is contained in:
Gered 2023-04-04 21:06:10 -04:00
parent a0c1199264
commit 29e5a8b080
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
ggdt/src/graphics/bitmap/indexed/triangles.rs
View file

@ -53,29 +53,29 @@ impl IndexedBitmap {
) )
} }
SolidTextured { position, texcoord, bitmap } => { SolidTextured { position, texcoord, bitmap } => {
let inverse_area = 1.0 / edge_function(position[0], position[1], position[2]); let area = edge_function(position[0], position[1], position[2]);
per_pixel_triangle_2d( per_pixel_triangle_2d(
self, // self, //
position[0], position[0],
position[1], position[1],
position[2], position[2],
|dest_pixels, w0, w1, w2| { |dest_pixels, w0, w1, w2| {
let u = (w0 * texcoord[0].x + w1 * texcoord[1].x + w2 * texcoord[2].x) * inverse_area; let u = (w0 * texcoord[0].x + w1 * texcoord[1].x + w2 * texcoord[2].x) / area;
let v = (w0 * texcoord[0].y + w1 * texcoord[1].y + w2 * texcoord[2].y) * inverse_area; let v = (w0 * texcoord[0].y + w1 * texcoord[1].y + w2 * texcoord[2].y) / area;
*dest_pixels = bitmap.sample_at(u, v); *dest_pixels = bitmap.sample_at(u, v);
}, },
) )
} }
SolidTexturedBlended { position, texcoord, bitmap, blendmap } => { SolidTexturedBlended { position, texcoord, bitmap, blendmap } => {
let inverse_area = 1.0 / edge_function(position[0], position[1], position[2]); let area = edge_function(position[0], position[1], position[2]);
per_pixel_triangle_2d( per_pixel_triangle_2d(
self, // self, //
position[0], position[0],
position[1], position[1],
position[2], position[2],
|dest_pixels, w0, w1, w2| { |dest_pixels, w0, w1, w2| {
let u = (w0 * texcoord[0].x + w1 * texcoord[1].x + w2 * texcoord[2].x) * inverse_area; let u = (w0 * texcoord[0].x + w1 * texcoord[1].x + w2 * texcoord[2].x) / area;
let v = (w0 * texcoord[0].y + w1 * texcoord[1].y + w2 * texcoord[2].y) * inverse_area; let v = (w0 * texcoord[0].y + w1 * texcoord[1].y + w2 * texcoord[2].y) / area;
let texel = bitmap.sample_at(u, v); let texel = bitmap.sample_at(u, v);
*dest_pixels = *dest_pixels =
if let Some(blended) = blendmap.blend(texel, *dest_pixels) { blended } else { texel }; if let Some(blended) = blendmap.blend(texel, *dest_pixels) { blended } else { texel };