Move logic out of the `gpu_data` module
This commit is contained in:
parent
3ba4ce117c
commit
3857a28e6a
|
@ -11,13 +11,18 @@
|
||||||
//! Packs data onto the GPU.
|
//! Packs data onto the GPU.
|
||||||
|
|
||||||
use crate::concurrent::executor::Executor;
|
use crate::concurrent::executor::Executor;
|
||||||
use crate::gpu_data::{AlphaTileBatchPrimitive, RenderCommand};
|
use crate::gpu_data::{AlphaTileBatchPrimitive, BuiltObject, FillBatchPrimitive, RenderCommand};
|
||||||
use crate::options::{PreparedRenderOptions, RenderCommandListener};
|
use crate::options::{PreparedRenderOptions, RenderCommandListener};
|
||||||
use crate::scene::Scene;
|
use crate::scene::Scene;
|
||||||
use crate::tiles::Tiler;
|
use crate::tile_map::DenseTileMap;
|
||||||
|
use crate::tiles::{self, TILE_HEIGHT, TILE_WIDTH, Tiler};
|
||||||
use crate::z_buffer::ZBuffer;
|
use crate::z_buffer::ZBuffer;
|
||||||
use pathfinder_geometry::basic::rect::RectF32;
|
use pathfinder_geometry::basic::line_segment::{LineSegmentF32, LineSegmentU4, LineSegmentU8};
|
||||||
use std::sync::atomic::AtomicUsize;
|
use pathfinder_geometry::basic::point::{Point2DF32, Point2DI32};
|
||||||
|
use pathfinder_geometry::basic::rect::{RectF32, RectI32};
|
||||||
|
use pathfinder_geometry::util;
|
||||||
|
use pathfinder_simd::default::{F32x4, I32x4};
|
||||||
|
use std::sync::atomic::{AtomicUsize, Ordering};
|
||||||
use std::time::Instant;
|
use std::time::Instant;
|
||||||
use std::u16;
|
use std::u16;
|
||||||
|
|
||||||
|
@ -124,3 +129,195 @@ pub struct TileStats {
|
||||||
pub solid_tile_count: u32,
|
pub solid_tile_count: u32,
|
||||||
pub alpha_tile_count: u32,
|
pub alpha_tile_count: u32,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Utilities for built objects
|
||||||
|
|
||||||
|
impl BuiltObject {
|
||||||
|
pub(crate) fn new(bounds: RectF32) -> BuiltObject {
|
||||||
|
let tile_rect = tiles::round_rect_out_to_tile_bounds(bounds);
|
||||||
|
let tiles = DenseTileMap::new(tile_rect);
|
||||||
|
BuiltObject {
|
||||||
|
bounds,
|
||||||
|
fills: vec![],
|
||||||
|
alpha_tiles: vec![],
|
||||||
|
tiles,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[inline]
|
||||||
|
pub(crate) fn tile_rect(&self) -> RectI32 {
|
||||||
|
self.tiles.rect
|
||||||
|
}
|
||||||
|
|
||||||
|
fn add_fill(
|
||||||
|
&mut self,
|
||||||
|
builder: &SceneBuilder,
|
||||||
|
segment: &LineSegmentF32,
|
||||||
|
tile_coords: Point2DI32,
|
||||||
|
) {
|
||||||
|
debug!("add_fill({:?} ({:?}))", segment, tile_coords);
|
||||||
|
|
||||||
|
// Ensure this fill is in bounds. If not, cull it.
|
||||||
|
if self.tile_coords_to_local_index(tile_coords).is_none() {
|
||||||
|
return;
|
||||||
|
};
|
||||||
|
|
||||||
|
debug_assert_eq!(TILE_WIDTH, TILE_HEIGHT);
|
||||||
|
let tile_size = F32x4::splat(TILE_WIDTH as f32);
|
||||||
|
let (min, max) = (
|
||||||
|
F32x4::default(),
|
||||||
|
F32x4::splat((TILE_WIDTH * 256 - 1) as f32),
|
||||||
|
);
|
||||||
|
let shuffle_mask = I32x4::new(0x0c08_0400, 0x0d05_0901, 0, 0).as_u8x16();
|
||||||
|
|
||||||
|
let tile_upper_left = tile_coords.to_f32().0.xyxy() * tile_size;
|
||||||
|
|
||||||
|
let segment = (segment.0 - tile_upper_left) * F32x4::splat(256.0);
|
||||||
|
let segment = segment
|
||||||
|
.clamp(min, max)
|
||||||
|
.to_i32x4()
|
||||||
|
.as_u8x16()
|
||||||
|
.shuffle(shuffle_mask)
|
||||||
|
.as_i32x4();
|
||||||
|
|
||||||
|
// Unpack whole and fractional pixels.
|
||||||
|
let px = LineSegmentU4((segment[1] | (segment[1] >> 12)) as u16);
|
||||||
|
let subpx = LineSegmentU8(segment[0] as u32);
|
||||||
|
|
||||||
|
// Cull degenerate fills.
|
||||||
|
if (px.0 & 0xf) as u8 == ((px.0 >> 8) & 0xf) as u8
|
||||||
|
&& (subpx.0 & 0xff) as u8 == ((subpx.0 >> 16) & 0xff) as u8
|
||||||
|
{
|
||||||
|
debug!("... culling!");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Allocate global tile if necessary.
|
||||||
|
let alpha_tile_index = self.get_or_allocate_alpha_tile_index(builder, tile_coords);
|
||||||
|
|
||||||
|
debug!("... OK, pushing");
|
||||||
|
self.fills.push(FillBatchPrimitive {
|
||||||
|
px,
|
||||||
|
subpx,
|
||||||
|
alpha_tile_index,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
fn get_or_allocate_alpha_tile_index(
|
||||||
|
&mut self,
|
||||||
|
builder: &SceneBuilder,
|
||||||
|
tile_coords: Point2DI32,
|
||||||
|
) -> u16 {
|
||||||
|
let local_tile_index = self.tiles.coords_to_index_unchecked(tile_coords);
|
||||||
|
let alpha_tile_index = self.tiles.data[local_tile_index].alpha_tile_index;
|
||||||
|
if alpha_tile_index != !0 {
|
||||||
|
return alpha_tile_index;
|
||||||
|
}
|
||||||
|
|
||||||
|
let alpha_tile_index = builder
|
||||||
|
.next_alpha_tile_index
|
||||||
|
.fetch_add(1, Ordering::Relaxed) as u16;
|
||||||
|
self.tiles.data[local_tile_index].alpha_tile_index = alpha_tile_index;
|
||||||
|
alpha_tile_index
|
||||||
|
}
|
||||||
|
|
||||||
|
pub(crate) fn add_active_fill(
|
||||||
|
&mut self,
|
||||||
|
builder: &SceneBuilder,
|
||||||
|
left: f32,
|
||||||
|
right: f32,
|
||||||
|
mut winding: i32,
|
||||||
|
tile_coords: Point2DI32,
|
||||||
|
) {
|
||||||
|
let tile_origin_y = (tile_coords.y() * TILE_HEIGHT as i32) as f32;
|
||||||
|
let left = Point2DF32::new(left, tile_origin_y);
|
||||||
|
let right = Point2DF32::new(right, tile_origin_y);
|
||||||
|
|
||||||
|
let segment = if winding < 0 {
|
||||||
|
LineSegmentF32::new(&left, &right)
|
||||||
|
} else {
|
||||||
|
LineSegmentF32::new(&right, &left)
|
||||||
|
};
|
||||||
|
|
||||||
|
debug!(
|
||||||
|
"... emitting active fill {} -> {} winding {} @ tile {:?}",
|
||||||
|
left.x(),
|
||||||
|
right.x(),
|
||||||
|
winding,
|
||||||
|
tile_coords
|
||||||
|
);
|
||||||
|
|
||||||
|
while winding != 0 {
|
||||||
|
self.add_fill(builder, &segment, tile_coords);
|
||||||
|
if winding < 0 {
|
||||||
|
winding += 1
|
||||||
|
} else {
|
||||||
|
winding -= 1
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pub(crate) fn generate_fill_primitives_for_line(
|
||||||
|
&mut self,
|
||||||
|
builder: &SceneBuilder,
|
||||||
|
mut segment: LineSegmentF32,
|
||||||
|
tile_y: i32,
|
||||||
|
) {
|
||||||
|
debug!(
|
||||||
|
"... generate_fill_primitives_for_line(): segment={:?} tile_y={} ({}-{})",
|
||||||
|
segment,
|
||||||
|
tile_y,
|
||||||
|
tile_y as f32 * TILE_HEIGHT as f32,
|
||||||
|
(tile_y + 1) as f32 * TILE_HEIGHT as f32
|
||||||
|
);
|
||||||
|
|
||||||
|
let winding = segment.from_x() > segment.to_x();
|
||||||
|
let (segment_left, segment_right) = if !winding {
|
||||||
|
(segment.from_x(), segment.to_x())
|
||||||
|
} else {
|
||||||
|
(segment.to_x(), segment.from_x())
|
||||||
|
};
|
||||||
|
|
||||||
|
// FIXME(pcwalton): Optimize this.
|
||||||
|
let segment_tile_left = f32::floor(segment_left) as i32 / TILE_WIDTH as i32;
|
||||||
|
let segment_tile_right =
|
||||||
|
util::alignup_i32(f32::ceil(segment_right) as i32, TILE_WIDTH as i32);
|
||||||
|
debug!(
|
||||||
|
"segment_tile_left={} segment_tile_right={} tile_rect={:?}",
|
||||||
|
segment_tile_left,
|
||||||
|
segment_tile_right,
|
||||||
|
self.tile_rect()
|
||||||
|
);
|
||||||
|
|
||||||
|
for subsegment_tile_x in segment_tile_left..segment_tile_right {
|
||||||
|
let (mut fill_from, mut fill_to) = (segment.from(), segment.to());
|
||||||
|
let subsegment_tile_right =
|
||||||
|
((i32::from(subsegment_tile_x) + 1) * TILE_HEIGHT as i32) as f32;
|
||||||
|
if subsegment_tile_right < segment_right {
|
||||||
|
let x = subsegment_tile_right;
|
||||||
|
let point = Point2DF32::new(x, segment.solve_y_for_x(x));
|
||||||
|
if !winding {
|
||||||
|
fill_to = point;
|
||||||
|
segment = LineSegmentF32::new(&point, &segment.to());
|
||||||
|
} else {
|
||||||
|
fill_from = point;
|
||||||
|
segment = LineSegmentF32::new(&segment.from(), &point);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
let fill_segment = LineSegmentF32::new(&fill_from, &fill_to);
|
||||||
|
let fill_tile_coords = Point2DI32::new(subsegment_tile_x, tile_y);
|
||||||
|
self.add_fill(builder, &fill_segment, fill_tile_coords);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[inline]
|
||||||
|
pub(crate) fn tile_coords_to_local_index(&self, coords: Point2DI32) -> Option<u32> {
|
||||||
|
self.tiles.coords_to_index(coords).map(|index| index as u32)
|
||||||
|
}
|
||||||
|
|
||||||
|
#[inline]
|
||||||
|
pub(crate) fn local_tile_index_to_coords(&self, tile_index: u32) -> Point2DI32 {
|
||||||
|
self.tiles.index_to_coords(tile_index as usize)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
|
@ -10,18 +10,12 @@
|
||||||
|
|
||||||
//! Packed data ready to be sent to the GPU.
|
//! Packed data ready to be sent to the GPU.
|
||||||
|
|
||||||
use crate::builder::SceneBuilder;
|
|
||||||
use crate::options::BoundingQuad;
|
use crate::options::BoundingQuad;
|
||||||
use crate::scene::ObjectShader;
|
use crate::scene::ObjectShader;
|
||||||
use crate::tile_map::DenseTileMap;
|
use crate::tile_map::DenseTileMap;
|
||||||
use crate::tiles::{self, TILE_HEIGHT, TILE_WIDTH};
|
use pathfinder_geometry::basic::line_segment::{LineSegmentU4, LineSegmentU8};
|
||||||
use pathfinder_geometry::basic::line_segment::{LineSegmentF32, LineSegmentU4, LineSegmentU8};
|
use pathfinder_geometry::basic::rect::RectF32;
|
||||||
use pathfinder_geometry::basic::point::{Point2DF32, Point2DI32};
|
|
||||||
use pathfinder_geometry::basic::rect::{RectF32, RectI32};
|
|
||||||
use pathfinder_geometry::util;
|
|
||||||
use pathfinder_simd::default::{F32x4, I32x4};
|
|
||||||
use std::fmt::{Debug, Formatter, Result as DebugResult};
|
use std::fmt::{Debug, Formatter, Result as DebugResult};
|
||||||
use std::sync::atomic::Ordering;
|
|
||||||
use std::time::Duration;
|
use std::time::Duration;
|
||||||
|
|
||||||
#[derive(Debug)]
|
#[derive(Debug)]
|
||||||
|
@ -86,242 +80,6 @@ pub struct AlphaTileBatchPrimitive {
|
||||||
pub tile_index: u16,
|
pub tile_index: u16,
|
||||||
}
|
}
|
||||||
|
|
||||||
// Utilities for built objects
|
|
||||||
|
|
||||||
impl BuiltObject {
|
|
||||||
pub(crate) fn new(bounds: RectF32) -> BuiltObject {
|
|
||||||
let tile_rect = tiles::round_rect_out_to_tile_bounds(bounds);
|
|
||||||
let tiles = DenseTileMap::new(tile_rect);
|
|
||||||
BuiltObject {
|
|
||||||
bounds,
|
|
||||||
fills: vec![],
|
|
||||||
alpha_tiles: vec![],
|
|
||||||
tiles,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#[inline]
|
|
||||||
pub(crate) fn tile_rect(&self) -> RectI32 {
|
|
||||||
self.tiles.rect
|
|
||||||
}
|
|
||||||
|
|
||||||
fn add_fill(
|
|
||||||
&mut self,
|
|
||||||
builder: &SceneBuilder,
|
|
||||||
segment: &LineSegmentF32,
|
|
||||||
tile_coords: Point2DI32,
|
|
||||||
) {
|
|
||||||
debug!("add_fill({:?} ({:?}))", segment, tile_coords);
|
|
||||||
|
|
||||||
// Ensure this fill is in bounds. If not, cull it.
|
|
||||||
if self.tile_coords_to_local_index(tile_coords).is_none() {
|
|
||||||
return;
|
|
||||||
};
|
|
||||||
|
|
||||||
debug_assert_eq!(TILE_WIDTH, TILE_HEIGHT);
|
|
||||||
let tile_size = F32x4::splat(TILE_WIDTH as f32);
|
|
||||||
let (min, max) = (
|
|
||||||
F32x4::default(),
|
|
||||||
F32x4::splat((TILE_WIDTH * 256 - 1) as f32),
|
|
||||||
);
|
|
||||||
let shuffle_mask = I32x4::new(0x0c08_0400, 0x0d05_0901, 0, 0).as_u8x16();
|
|
||||||
|
|
||||||
let tile_upper_left = tile_coords.to_f32().0.xyxy() * tile_size;
|
|
||||||
|
|
||||||
let segment = (segment.0 - tile_upper_left) * F32x4::splat(256.0);
|
|
||||||
let segment = segment
|
|
||||||
.clamp(min, max)
|
|
||||||
.to_i32x4()
|
|
||||||
.as_u8x16()
|
|
||||||
.shuffle(shuffle_mask)
|
|
||||||
.as_i32x4();
|
|
||||||
|
|
||||||
// Unpack whole and fractional pixels.
|
|
||||||
let px = LineSegmentU4((segment[1] | (segment[1] >> 12)) as u16);
|
|
||||||
let subpx = LineSegmentU8(segment[0] as u32);
|
|
||||||
|
|
||||||
// Cull degenerate fills.
|
|
||||||
if (px.0 & 0xf) as u8 == ((px.0 >> 8) & 0xf) as u8
|
|
||||||
&& (subpx.0 & 0xff) as u8 == ((subpx.0 >> 16) & 0xff) as u8
|
|
||||||
{
|
|
||||||
debug!("... culling!");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Allocate global tile if necessary.
|
|
||||||
let alpha_tile_index = self.get_or_allocate_alpha_tile_index(builder, tile_coords);
|
|
||||||
|
|
||||||
debug!("... OK, pushing");
|
|
||||||
self.fills.push(FillBatchPrimitive {
|
|
||||||
px,
|
|
||||||
subpx,
|
|
||||||
alpha_tile_index,
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
fn get_or_allocate_alpha_tile_index(
|
|
||||||
&mut self,
|
|
||||||
builder: &SceneBuilder,
|
|
||||||
tile_coords: Point2DI32,
|
|
||||||
) -> u16 {
|
|
||||||
let local_tile_index = self.tiles.coords_to_index_unchecked(tile_coords);
|
|
||||||
let alpha_tile_index = self.tiles.data[local_tile_index].alpha_tile_index;
|
|
||||||
if alpha_tile_index != !0 {
|
|
||||||
return alpha_tile_index;
|
|
||||||
}
|
|
||||||
|
|
||||||
let alpha_tile_index = builder
|
|
||||||
.next_alpha_tile_index
|
|
||||||
.fetch_add(1, Ordering::Relaxed) as u16;
|
|
||||||
self.tiles.data[local_tile_index].alpha_tile_index = alpha_tile_index;
|
|
||||||
alpha_tile_index
|
|
||||||
}
|
|
||||||
|
|
||||||
pub(crate) fn add_active_fill(
|
|
||||||
&mut self,
|
|
||||||
builder: &SceneBuilder,
|
|
||||||
left: f32,
|
|
||||||
right: f32,
|
|
||||||
mut winding: i32,
|
|
||||||
tile_coords: Point2DI32,
|
|
||||||
) {
|
|
||||||
let tile_origin_y = (tile_coords.y() * TILE_HEIGHT as i32) as f32;
|
|
||||||
let left = Point2DF32::new(left, tile_origin_y);
|
|
||||||
let right = Point2DF32::new(right, tile_origin_y);
|
|
||||||
|
|
||||||
let segment = if winding < 0 {
|
|
||||||
LineSegmentF32::new(&left, &right)
|
|
||||||
} else {
|
|
||||||
LineSegmentF32::new(&right, &left)
|
|
||||||
};
|
|
||||||
|
|
||||||
debug!(
|
|
||||||
"... emitting active fill {} -> {} winding {} @ tile {:?}",
|
|
||||||
left.x(),
|
|
||||||
right.x(),
|
|
||||||
winding,
|
|
||||||
tile_coords
|
|
||||||
);
|
|
||||||
|
|
||||||
while winding != 0 {
|
|
||||||
self.add_fill(builder, &segment, tile_coords);
|
|
||||||
if winding < 0 {
|
|
||||||
winding += 1
|
|
||||||
} else {
|
|
||||||
winding -= 1
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
pub(crate) fn generate_fill_primitives_for_line(
|
|
||||||
&mut self,
|
|
||||||
builder: &SceneBuilder,
|
|
||||||
mut segment: LineSegmentF32,
|
|
||||||
tile_y: i32,
|
|
||||||
) {
|
|
||||||
debug!(
|
|
||||||
"... generate_fill_primitives_for_line(): segment={:?} tile_y={} ({}-{})",
|
|
||||||
segment,
|
|
||||||
tile_y,
|
|
||||||
tile_y as f32 * TILE_HEIGHT as f32,
|
|
||||||
(tile_y + 1) as f32 * TILE_HEIGHT as f32
|
|
||||||
);
|
|
||||||
|
|
||||||
let winding = segment.from_x() > segment.to_x();
|
|
||||||
let (segment_left, segment_right) = if !winding {
|
|
||||||
(segment.from_x(), segment.to_x())
|
|
||||||
} else {
|
|
||||||
(segment.to_x(), segment.from_x())
|
|
||||||
};
|
|
||||||
|
|
||||||
// FIXME(pcwalton): Optimize this.
|
|
||||||
let segment_tile_left = f32::floor(segment_left) as i32 / TILE_WIDTH as i32;
|
|
||||||
let segment_tile_right =
|
|
||||||
util::alignup_i32(f32::ceil(segment_right) as i32, TILE_WIDTH as i32);
|
|
||||||
debug!(
|
|
||||||
"segment_tile_left={} segment_tile_right={} tile_rect={:?}",
|
|
||||||
segment_tile_left,
|
|
||||||
segment_tile_right,
|
|
||||||
self.tile_rect()
|
|
||||||
);
|
|
||||||
|
|
||||||
for subsegment_tile_x in segment_tile_left..segment_tile_right {
|
|
||||||
let (mut fill_from, mut fill_to) = (segment.from(), segment.to());
|
|
||||||
let subsegment_tile_right =
|
|
||||||
((i32::from(subsegment_tile_x) + 1) * TILE_HEIGHT as i32) as f32;
|
|
||||||
if subsegment_tile_right < segment_right {
|
|
||||||
let x = subsegment_tile_right;
|
|
||||||
let point = Point2DF32::new(x, segment.solve_y_for_x(x));
|
|
||||||
if !winding {
|
|
||||||
fill_to = point;
|
|
||||||
segment = LineSegmentF32::new(&point, &segment.to());
|
|
||||||
} else {
|
|
||||||
fill_from = point;
|
|
||||||
segment = LineSegmentF32::new(&segment.from(), &point);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
let fill_segment = LineSegmentF32::new(&fill_from, &fill_to);
|
|
||||||
let fill_tile_coords = Point2DI32::new(subsegment_tile_x, tile_y);
|
|
||||||
self.add_fill(builder, &fill_segment, fill_tile_coords);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#[inline]
|
|
||||||
pub(crate) fn tile_coords_to_local_index(&self, coords: Point2DI32) -> Option<u32> {
|
|
||||||
self.tiles.coords_to_index(coords).map(|index| index as u32)
|
|
||||||
}
|
|
||||||
|
|
||||||
#[inline]
|
|
||||||
pub(crate) fn local_tile_index_to_coords(&self, tile_index: u32) -> Point2DI32 {
|
|
||||||
self.tiles.index_to_coords(tile_index as usize)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
impl Default for TileObjectPrimitive {
|
|
||||||
#[inline]
|
|
||||||
fn default() -> TileObjectPrimitive {
|
|
||||||
TileObjectPrimitive {
|
|
||||||
backdrop: 0,
|
|
||||||
alpha_tile_index: !0,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
impl TileObjectPrimitive {
|
|
||||||
#[inline]
|
|
||||||
pub fn is_solid(&self) -> bool {
|
|
||||||
self.alpha_tile_index == !0
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
impl AlphaTileBatchPrimitive {
|
|
||||||
#[inline]
|
|
||||||
pub fn new(
|
|
||||||
tile_coords: Point2DI32,
|
|
||||||
backdrop: i8,
|
|
||||||
object_index: u16,
|
|
||||||
tile_index: u16,
|
|
||||||
) -> AlphaTileBatchPrimitive {
|
|
||||||
AlphaTileBatchPrimitive {
|
|
||||||
tile_x_lo: (tile_coords.x() & 0xff) as u8,
|
|
||||||
tile_y_lo: (tile_coords.y() & 0xff) as u8,
|
|
||||||
tile_hi: (((tile_coords.x() >> 8) & 0x0f) | ((tile_coords.y() >> 4) & 0xf0)) as u8,
|
|
||||||
backdrop,
|
|
||||||
object_index,
|
|
||||||
tile_index,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#[inline]
|
|
||||||
pub fn tile_coords(&self) -> Point2DI32 {
|
|
||||||
Point2DI32::new(
|
|
||||||
(self.tile_x_lo as i32) | (((self.tile_hi & 0xf) as i32) << 8),
|
|
||||||
(self.tile_y_lo as i32) | (((self.tile_hi & 0xf0) as i32) << 4),
|
|
||||||
)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
impl Debug for RenderCommand {
|
impl Debug for RenderCommand {
|
||||||
fn fmt(&self, formatter: &mut Formatter) -> DebugResult {
|
fn fmt(&self, formatter: &mut Formatter) -> DebugResult {
|
||||||
match *self {
|
match *self {
|
||||||
|
@ -331,8 +89,12 @@ impl Debug for RenderCommand {
|
||||||
}
|
}
|
||||||
RenderCommand::AddFills(ref fills) => write!(formatter, "AddFills(x{})", fills.len()),
|
RenderCommand::AddFills(ref fills) => write!(formatter, "AddFills(x{})", fills.len()),
|
||||||
RenderCommand::FlushFills => write!(formatter, "FlushFills"),
|
RenderCommand::FlushFills => write!(formatter, "FlushFills"),
|
||||||
RenderCommand::AlphaTile(ref tiles) => write!(formatter, "AlphaTile(x{})", tiles.len()),
|
RenderCommand::AlphaTile(ref tiles) => {
|
||||||
RenderCommand::SolidTile(ref tiles) => write!(formatter, "SolidTile(x{})", tiles.len()),
|
write!(formatter, "AlphaTile(x{})", tiles.len())
|
||||||
|
}
|
||||||
|
RenderCommand::SolidTile(ref tiles) => {
|
||||||
|
write!(formatter, "SolidTile(x{})", tiles.len())
|
||||||
|
}
|
||||||
RenderCommand::Finish { .. } => write!(formatter, "Finish"),
|
RenderCommand::Finish { .. } => write!(formatter, "Finish"),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -9,7 +9,7 @@
|
||||||
// except according to those terms.
|
// except according to those terms.
|
||||||
|
|
||||||
use crate::builder::SceneBuilder;
|
use crate::builder::SceneBuilder;
|
||||||
use crate::gpu_data::{AlphaTileBatchPrimitive, BuiltObject};
|
use crate::gpu_data::{AlphaTileBatchPrimitive, BuiltObject, TileObjectPrimitive};
|
||||||
use crate::sorted_vector::SortedVector;
|
use crate::sorted_vector::SortedVector;
|
||||||
use pathfinder_geometry::basic::line_segment::LineSegmentF32;
|
use pathfinder_geometry::basic::line_segment::LineSegmentF32;
|
||||||
use pathfinder_geometry::basic::point::{Point2DF32, Point2DI32};
|
use pathfinder_geometry::basic::point::{Point2DF32, Point2DI32};
|
||||||
|
@ -120,6 +120,7 @@ impl<'a> Tiler<'a> {
|
||||||
self.object_index,
|
self.object_index,
|
||||||
tile.alpha_tile_index as u16,
|
tile.alpha_tile_index as u16,
|
||||||
);
|
);
|
||||||
|
|
||||||
self.built_object.alpha_tiles.push(alpha_tile);
|
self.built_object.alpha_tiles.push(alpha_tile);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -237,8 +238,6 @@ impl<'a> Tiler<'a> {
|
||||||
self.active_edges.push(active_edge);
|
self.active_edges.push(active_edge);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
//debug_assert_eq!(current_winding, 0);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
fn add_new_active_edge(&mut self, tile_y: i32) {
|
fn add_new_active_edge(&mut self, tile_y: i32) {
|
||||||
|
@ -517,3 +516,41 @@ impl PartialOrd<ActiveEdge> for ActiveEdge {
|
||||||
self.crossing.x().partial_cmp(&other.crossing.x())
|
self.crossing.x().partial_cmp(&other.crossing.x())
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
impl AlphaTileBatchPrimitive {
|
||||||
|
#[inline]
|
||||||
|
fn new(tile_coords: Point2DI32,
|
||||||
|
backdrop: i8,
|
||||||
|
object_index: u16,
|
||||||
|
tile_index: u16)
|
||||||
|
-> AlphaTileBatchPrimitive {
|
||||||
|
AlphaTileBatchPrimitive {
|
||||||
|
tile_x_lo: (tile_coords.x() & 0xff) as u8,
|
||||||
|
tile_y_lo: (tile_coords.y() & 0xff) as u8,
|
||||||
|
tile_hi: (((tile_coords.x() >> 8) & 0x0f) | ((tile_coords.y() >> 4) & 0xf0)) as u8,
|
||||||
|
backdrop,
|
||||||
|
object_index,
|
||||||
|
tile_index,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[inline]
|
||||||
|
pub fn tile_coords(&self) -> Point2DI32 {
|
||||||
|
Point2DI32::new(
|
||||||
|
(self.tile_x_lo as i32) | (((self.tile_hi & 0xf) as i32) << 8),
|
||||||
|
(self.tile_y_lo as i32) | (((self.tile_hi & 0xf0) as i32) << 4),
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Default for TileObjectPrimitive {
|
||||||
|
#[inline]
|
||||||
|
fn default() -> TileObjectPrimitive {
|
||||||
|
TileObjectPrimitive { backdrop: 0, alpha_tile_index: !0 }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl TileObjectPrimitive {
|
||||||
|
#[inline]
|
||||||
|
pub fn is_solid(&self) -> bool { self.alpha_tile_index == !0 }
|
||||||
|
}
|
||||||
|
|
Loading…
Reference in New Issue