mirror of
https://github.com/GraphiteEditor/Graphite.git
synced 2026-09-17 07:18:04 +08:00
* Created wasm binding to action's of the radio buttons which control the view mode
Added entry to DocumentMessage Enum
* draw in wireframe mode by changing parameters on each shape
added functions/changed behavior to do as above
not working yet
- newly added shapes should be drawn in wireframe
- setting fill to "none" on a path does not only draw an outline
- maybe the stroke width is 0?
* Wire frame view mostly functional for ellipses
- Need to implement for all shapes
- BUG: shapes don't immediatley update upon changing view-mode
* Fixed: active document now updates after view mode swap
* The Pros:
- wire frame mode effects all shapes correctly
The Cons:
- wire frame mode effects everything, including things that maybe shouldn't be, like select boxes and pen lines
* wire frame view no longer effects overlay layers
* Fixed: While in wireframe view the pen tool will draw regular thickness lines.
* some commenting
* Fixed potential bug:
In layer/file system with a Folder layer with a sub-layer that is also
a Folder cache_dirty must be set in order for all shapes to update properly
* refactored code to use ViewMode enum names throughout
* Changed: All wireframe lines are blank
cargo fmt
* Wireframe thickness doesn't change as a result of zooming
- Added DocumentMessage::ReRenderDocument, which marks layers as dirty and renders with the updated render-string
- All "zoom" messages in the movement_handler send a re-render message
- while in wireframe view, the "render-transform" of all shapes includes the root layer transform
Added getter/setter methods for graphene::Document::view_mode
* cargo fmt
* wireframe now has proper thickness after "Zoom Canvas to Fit all" action
* Refactored
- Changed FrontendMessage::UpdateCanvas to RenderDocument message to allow for lazy evaluation
- Created DocumentOperation::SetViewMode to be more consistent with existing code
- removed log statement
- Added constants for empty fill and thin-black stroke
* cargo fmt
* Removed ReRenderDocument message
* cargo fmt
* Fixes as suggested by TrueDoctor
* clean up merge
cargo fmt
* Refactor:
moved view_mode to DocumentMessageHandler
* Polishing
* changed those two comments
* Remove unknown todo comment
Co-authored-by: Keavon Chambers <keavon@keavon.com>
182 lines
4.5 KiB
Rust
182 lines
4.5 KiB
Rust
pub mod style;
|
|
use style::ViewMode;
|
|
|
|
use glam::DAffine2;
|
|
use glam::{DMat2, DVec2};
|
|
|
|
pub mod blend_mode;
|
|
pub use blend_mode::BlendMode;
|
|
|
|
pub mod simple_shape;
|
|
pub use simple_shape::Shape;
|
|
|
|
pub mod folder;
|
|
use crate::LayerId;
|
|
use crate::{DocumentError, Quad};
|
|
pub use folder::Folder;
|
|
use serde::{Deserialize, Serialize};
|
|
|
|
use std::fmt::Write;
|
|
|
|
pub trait LayerData {
|
|
fn render(&mut self, svg: &mut String, transforms: &mut Vec<glam::DAffine2>, view_mode: ViewMode);
|
|
fn intersects_quad(&self, quad: Quad, path: &mut Vec<LayerId>, intersections: &mut Vec<Vec<LayerId>>);
|
|
fn bounding_box(&self, transform: glam::DAffine2) -> Option<[DVec2; 2]>;
|
|
}
|
|
|
|
#[derive(Debug, Clone, PartialEq, Deserialize, Serialize)]
|
|
pub enum LayerDataType {
|
|
Folder(Folder),
|
|
Shape(Shape),
|
|
}
|
|
|
|
impl LayerDataType {
|
|
pub fn inner(&self) -> &dyn LayerData {
|
|
match self {
|
|
LayerDataType::Shape(s) => s,
|
|
LayerDataType::Folder(f) => f,
|
|
}
|
|
}
|
|
|
|
pub fn inner_mut(&mut self) -> &mut dyn LayerData {
|
|
match self {
|
|
LayerDataType::Shape(s) => s,
|
|
LayerDataType::Folder(f) => f,
|
|
}
|
|
}
|
|
}
|
|
|
|
impl LayerData for LayerDataType {
|
|
fn render(&mut self, svg: &mut String, transforms: &mut Vec<glam::DAffine2>, view_mode: ViewMode) {
|
|
self.inner_mut().render(svg, transforms, view_mode)
|
|
}
|
|
|
|
fn intersects_quad(&self, quad: Quad, path: &mut Vec<LayerId>, intersections: &mut Vec<Vec<LayerId>>) {
|
|
self.inner().intersects_quad(quad, path, intersections)
|
|
}
|
|
|
|
fn bounding_box(&self, transform: glam::DAffine2) -> Option<[DVec2; 2]> {
|
|
self.inner().bounding_box(transform)
|
|
}
|
|
}
|
|
|
|
#[derive(Serialize, Deserialize)]
|
|
#[serde(remote = "glam::DAffine2")]
|
|
struct DAffine2Ref {
|
|
pub matrix2: DMat2,
|
|
pub translation: DVec2,
|
|
}
|
|
|
|
fn return_true() -> bool {
|
|
true
|
|
}
|
|
|
|
#[derive(Debug, PartialEq, Deserialize, Serialize)]
|
|
pub struct Layer {
|
|
pub visible: bool,
|
|
pub name: Option<String>,
|
|
pub data: LayerDataType,
|
|
#[serde(with = "DAffine2Ref")]
|
|
pub transform: glam::DAffine2,
|
|
#[serde(skip)]
|
|
pub cache: String,
|
|
#[serde(skip)]
|
|
pub thumbnail_cache: String,
|
|
#[serde(skip, default = "return_true")]
|
|
pub cache_dirty: bool,
|
|
pub blend_mode: BlendMode,
|
|
pub opacity: f64,
|
|
pub overlay: bool,
|
|
}
|
|
|
|
impl Layer {
|
|
pub fn new(data: LayerDataType, transform: [f64; 6]) -> Self {
|
|
Self {
|
|
visible: true,
|
|
name: None,
|
|
data,
|
|
transform: glam::DAffine2::from_cols_array(&transform),
|
|
cache: String::new(),
|
|
thumbnail_cache: String::new(),
|
|
cache_dirty: true,
|
|
blend_mode: BlendMode::Normal,
|
|
opacity: 1.,
|
|
overlay: false,
|
|
}
|
|
}
|
|
|
|
pub fn render(&mut self, transforms: &mut Vec<DAffine2>, view_mode: ViewMode) -> &str {
|
|
if !self.visible {
|
|
return "";
|
|
}
|
|
if self.cache_dirty {
|
|
transforms.push(self.transform);
|
|
self.thumbnail_cache.clear();
|
|
self.data.render(&mut self.thumbnail_cache, transforms, if self.overlay { ViewMode::Normal } else { view_mode });
|
|
|
|
self.cache.clear();
|
|
let _ = writeln!(self.cache, r#"<g transform="matrix("#);
|
|
self.transform.to_cols_array().iter().enumerate().for_each(|(i, f)| {
|
|
let _ = self.cache.write_str(&(f.to_string() + if i != 5 { "," } else { "" }));
|
|
});
|
|
let _ = write!(
|
|
self.cache,
|
|
r#")" style="mix-blend-mode: {}; opacity: {}">{}</g>"#,
|
|
self.blend_mode.to_svg_style_name(),
|
|
self.opacity,
|
|
self.thumbnail_cache.as_str()
|
|
);
|
|
transforms.pop();
|
|
self.cache_dirty = false;
|
|
}
|
|
self.cache.as_str()
|
|
}
|
|
|
|
pub fn intersects_quad(&self, quad: Quad, path: &mut Vec<LayerId>, intersections: &mut Vec<Vec<LayerId>>) {
|
|
if !self.visible || self.overlay {
|
|
return;
|
|
}
|
|
let transformed_quad = self.transform.inverse() * quad;
|
|
self.data.intersects_quad(transformed_quad, path, intersections)
|
|
}
|
|
|
|
pub fn current_bounding_box_with_transform(&self, transform: DAffine2) -> Option<[DVec2; 2]> {
|
|
self.data.bounding_box(transform)
|
|
}
|
|
|
|
pub fn current_bounding_box(&self) -> Option<[DVec2; 2]> {
|
|
self.current_bounding_box_with_transform(self.transform)
|
|
}
|
|
|
|
pub fn as_folder_mut(&mut self) -> Result<&mut Folder, DocumentError> {
|
|
match &mut self.data {
|
|
LayerDataType::Folder(f) => Ok(f),
|
|
_ => Err(DocumentError::NotAFolder),
|
|
}
|
|
}
|
|
|
|
pub fn as_folder(&self) -> Result<&Folder, DocumentError> {
|
|
match &self.data {
|
|
LayerDataType::Folder(f) => Ok(f),
|
|
_ => Err(DocumentError::NotAFolder),
|
|
}
|
|
}
|
|
}
|
|
|
|
impl Clone for Layer {
|
|
fn clone(&self) -> Self {
|
|
Self {
|
|
visible: self.visible,
|
|
name: self.name.clone(),
|
|
data: self.data.clone(),
|
|
transform: self.transform,
|
|
cache: String::new(),
|
|
thumbnail_cache: String::new(),
|
|
cache_dirty: true,
|
|
blend_mode: self.blend_mode,
|
|
opacity: self.opacity,
|
|
overlay: self.overlay,
|
|
}
|
|
}
|
|
}
|