Commit Graph

67 Commits

Author SHA1 Message Date
Paul Kupper 751fabb417 Implement viewport selection (#178)
* Begin implementing viewport selection

* Implement viewport click and drag selection for ellipse and rectangle

* Begin implementing line selection

* Remove debug prints

* Run cargo format

* Use DVec2 instead of kurbo::Point

* Line and polyline intersection

* Run cargo format

* Add fix for missing layer panel update

* Replace point selection with box selection

* Formatting

Co-authored-by: Keavon Chambers <keavon@keavon.com>
2021-07-05 01:05:12 +02:00
Till Arnold 94c42ff5d7 Copy and paste layers MVP (#220)
* Initial implementation of copy and paste for layers

* Sort layers on copy and add tests

* Fix logger init for test

* Fix `copy_paste_deleted_layers` test

* Readd erroneously removed svg

* Make Layer serializable and cleanup

* Add test for copy and pasting folders

* Cleanup

* Rename left_mouseup

* Cleanup

* Add length check to test

* Fix typo

* Make mouseup, mousedown more consistent
2021-07-05 00:34:47 +02:00
0HyperCube bb3293af43 Add a movable canvas with matricies (#175)
* Convert polygon and rectangle tool to kurbo::BezPath

* Add glam

* Add affine transform to elipse and remove circle

* Format

* Add svg group and add matrix for group

* Convert all operations to use matricies

* Work uses same transform as root

* Format

* Frontend fixed to render changes to working colors when changed from backend (#180)

* Backend and Frontend modification to show working color mods

* Remove comments & change precedence for tool and doc actions

* Add keybind for resetting work colors

* Minor Frontend changes

* Remove early sample "greet" code

* Add a contributing section to the project README

* Add moving document around

* Add document transform for tools

* Update to GraphiteEditor's fork

* Use write in foreach for rendering group / folder

* Add missing TranslateDown action

* Use points for line operation

* Format

* Add todo to change to shape's aspect ratio

* Remove empty if

* Initial pass at refactor

* Fix polyline test

* Use document message to modify document transform

* Messages -> Operations

* Transform layer

* Format

* Use DAffine2::IDENTITY

* Clean up kurbo generation for line and rect

* Use .into for rectangle points

* Rename cols to transform

* Rename other cols to transform

* Add todo for into_iter

* Remove unnecessary clone

Co-authored-by: akshay1992kalbhor <akshay1992kalbhor@gmail.com>
Co-authored-by: Keavon Chambers <keavon@keavon.com>
2021-06-26 21:44:48 +01:00
TrueDoctor 3d9e15adb7 Simplify document selection by reusing code (#226) 2021-06-23 11:20:59 +02:00
akshay1992kalbhor b2b8c75e9e Add support for closing document tabs (#215)
* Can only remove last document successfully

* Correctly update the layer tree panel

* Remove comments

* Add support for randomly closing docs

* Create new doc after closing last doc

* Update layer panel when creating new docs

* Fix bug that crashed the program when first doc was closed

* Refactor to make code simpler and increase readability

* Add shortcut to close active doc (Shift + C)

* Add a confirmation dialog box before closing tabs

* New docs get the correct title

* Remove comments and fix typos

* Disable 'eslint-no-alert'

* Refactor and fix document title bug

* Rename the FrontendMessage and ReponseType for showing close confirmation modal

* Change the message displayed in the close confirmation modal

Co-authored-by: Keavon Chambers <keavon@keavon.com>
2021-06-22 14:28:02 +05:30
RustyNixieTube 5bf19f6979 Add comment to STORAGE_SIZE and simplify it (#223)
* Add comment to STORAGE_SIZE and simplify it

* Modify comment

Co-authored-by: RustyNixieTube <RustyNixieTube@users.noreply.github.com>
2021-06-19 18:47:42 +02:00
RustyNixieTube affc9cc320 Remove unsafe call in input mapper (#222)
* Remove unsafe call

* Run cargo fmt

Co-authored-by: RustyNixieTube <RustyNixieTube@users.noreply.github.com>
2021-06-17 23:20:54 +02:00
Till Arnold ff232bd722 Add keyboard shortcut to duplicate layers (#214)
* Add keyboard shortcut to duplicate layers

* Avoid heap allocation in DuplicateSelectedLayers
2021-06-16 11:15:02 +02:00
George Atkinson ad0a40e512 Multi-document management (create new document; tab switching) (#210)
* Multi-docs WIP

* Change to number

* Add new document and switch documents

* Remove keybind for previous document. Change keybind for next document.

* Switch documents by clicking tabs

* Remove keybind for previous document. Change keybind for next document.

* multi-docs

* Update package-lock.json

* Hook up File>New to add new document

* Remove console logs and empty lines. Start new documents from 2 instead of 1.

* Fix formatting
2021-06-14 04:24:09 +01:00
akshay1992kalbhor 3079223db3 Frontend fixed to render changes to working colors when changed from backend (#180)
* Backend and Frontend modification to show working color mods

* Remove comments & change precedence for tool and doc actions

* Add keybind for resetting work colors

* Minor Frontend changes
2021-06-12 21:30:31 +05:30
TrueDoctor e4b5aa3933 Delete selected layers (#173)
* Delete Layers
* Fix backend selection
* Fix shift selection
* Add desired shape add selection behavior
* Add X and Backspace as keybinds for layer deletion
* Change key storage to u128
* Remove unhelpful trace logging
* Reverse display direction for layers
2021-06-10 09:24:59 +02:00
TrueDoctor 0e8cbad003 Implement backend part of the layer selection (#172)
* Implement backend part of the layer selection
2021-06-09 12:20:50 +02:00
Keavon Chambers d1bf68320e Implement menu bar floating list menus (#163)
Progress towards #135
2021-05-31 11:51:32 -07:00
TrueDoctor c0e60a21d3 Export current document as SVG when pressing Ctrl+Shift+S (#160)
* Export current document when pressing Ctrl+Shift+S

* Use a blob for download

* Add Ctrl + E shortcut, match on lower case

* Don't mount element in DOM

* Polish some keybindings

* Add initialization for MappingEntries

* Implement svg coloring

* Add newline after svg tag

* Add spaces to svg style format

* Fix more svg formatting

* Add space before />

* Remove duplicate whitespace
2021-05-28 20:43:51 +02:00
Keavon Chambers 805116b031 Fix missing keyboard shortcut <P> for the Pen Tool 2021-05-27 22:10:48 -07:00
TrueDoctor 4b19a459b7 Major overhaul of input and communication systems
* Add input manager

* WIP lifetime hell

* Hell yeah, dark lifetime magic

* Replace events with actions in tools

* Fix borrow in GlobalEventHandler

* Fix typo in response-handler

* Distribute dispatch structure

* Add translation from events to actions

* Port default key actions to input_mapper

* Split actions macro

* Add handling for Ambiguous Mouse events

* Fix warnings and clippy lints

* Add actions macro

* WIP rework

* Add AsMessage macro

* Add implementation for derived enums

* Add macro implementation for top level message

* Add #[child] attribute to indicate derivation

* Replace some mentions of Actions and Responses with Message

* It compiles !!!

* Add functionality to some message handlers

* Add document rendering

* ICE

* Rework the previous code while keeping basic functionality

* Reduce parent-top-level macro args to only two

* Add workaround for ICE

* Fix cyclic reference in document.rs

* Make derive_transitive_child a bit more powerful

This addresses the todo that was left,
enabling arbitrary expressions to be passed as the last
parameter of a #[parent] attribute

* Adapt frontend message format

* Make responses use VecDeque

Our responses are a queue so we should use a queue type for them

* Move traits to sensible location

* Are we rectangle yet?

* Simplify, improve & document `derive_discriminant`

* Change `child` to `sub_discriminant`

This only applies to `ToDiscriminant`.
Code using `#[impl_message]` continues to work.

* Add docs for `derive_transitive_child`

* Finish docs and improve macros

The improvements are that impl_message now uses trait
resolution to obtain the parent's discriminant
and that derive_as_message now allows for non-unit
variants (which we don't use but it's nice to have,
just in case)

* Remove logging call

* Move files around and cleanup structure

* Fix proc macro doc tests

* Improve actions_fn!() macro

* Add ellipse tool

* Pass populated actions list to the input mapper

* Add KeyState bitvector

* Merge mouse buttons into "keyboard"

* Add macro for initialization of key mapper table

* Add syntactic sugar for the macro

* Implement mapping function

* Translate the remaining tools

* Fix shape tool

* Add keybindings for line and pen tool

* Fix modifiers

* Cleanup

* Add doc comments for the actions macro

* Fix formatting

* Rename MouseMove to PointerMove

* Add keybinds for tools

* Apply review suggestions

* Rename KeyMappings -> KeyMappingEntries

* Apply review changes

Co-authored-by: T0mstone <realt0mstone@gmail.com>
Co-authored-by: Paul Kupper <kupper.pa@gmail.com>
2021-05-23 01:26:24 +02:00
akshay1992kalbhor a5bea53db2 Make the show/hide layer buttons work (#118) (#127) 2021-05-18 22:25:05 +05:30
Paul Kupper 52bebfad25 Cancel in-progress drag with right click or escape key (#119) 2021-05-09 10:26:47 +02:00
RustyStriker 3522969fec Fix rect/hexagon not centering properly when holding alt (#121) 2021-05-09 10:23:13 +03:00
Keavon Chambers 4975a4e737 Plumb frontend for layer visibility toggle 2021-05-07 16:57:45 -07:00
Paul Kupper 14e61d2328 Improved Rectangle, Line and Shape Tools (#106) 2021-05-07 20:05:03 +02:00
Keavon Chambers 2650b2c998 Fix "P" not switching to the Pen Tool 2021-05-07 01:51:15 -07:00
TrueDoctor 6adb984f2d Plumb layer panel (#107)
* WIP ExpandFolder handling

* Implement response parsing in typescript

* Update layer panel with list sent by wasm

* Add events for layer interaction

* Add proper default naming

* Fix displaying of the eye icon

* Attach path to LayerPanelEntry

* Fix lint issues

Co-authored-by: Keavon Chambers <keavon@keavon.com>
2021-05-07 10:17:46 +02:00
Paul Kupper b4ad274fd8 Fix ellipse tool behavior (#105) 2021-05-04 22:25:25 +02:00
T0mstone 3431128e66 Another round of polishing (#101)
* Implement basic refactorings

* Simplify some match statements

* Rename `ix` to `index`

If we're not going with a single letter name,
then a full word makes more sense.

* Rename `as_hex` to `to_hex`

`as_` implies lossless reinterpretation
while the function does a conversion that loses information

* Replace `for_each` with for loops

for loops are a lot easier to read and maintain.

* factor out x and y coords in Line::render

this is arguably more ergonomic

* Remove redundant `format!(format_args!())`
2021-05-04 15:08:24 +02:00
Paul Kupper 0ff9e5ff49 Improve Ellipse Tool (#98) 2021-05-04 10:53:00 +02:00
TrueDoctor f8ebff033d Use serde to serialize responses (#96) 2021-05-02 22:46:47 +02:00
TrueDoctor fc10575dfa Improve rendering efficiency and add caching (#95)
Fixes #84

*Reduce heap allocations
* Add caching for rendering svgs
* Deduplicate UpdateCanvas Responses
2021-05-02 21:21:39 +02:00
TrueDoctor 457c465342 Add caching to svg rendering (#94)
* Add documentation for functions in the document library
* Restructure backchannel
2021-05-02 20:34:23 +02:00
TrueDoctor 8d683a4162 Fix active tool selection (#92) 2021-05-02 08:30:51 +02:00
TrueDoctor f05cb30acb Add responses in document for layer system (#91) 2021-05-02 00:57:47 +02:00
TrueDoctor c5506c71b3 Split mouse events according to the button pressed (#90) 2021-05-01 21:09:13 +02:00
Keavon Chambers 3b32184906 Rename tools: "Sample" to "Eyedropper", "Blur/Sharpen" to "Detail" (#87) 2021-04-29 00:50:55 -07:00
0HyperCube 164e9f9729 Add preview for rectangles / shapes / lines (#85)
👀 Add preview for rectangles / shapes / lines
2021-04-24 22:18:48 +01:00
Edwin Cheng e40727e914 Implement Pen Tool (#79) 2021-04-23 00:12:24 +08:00
T0mstone b556dd6bfd Polish a few things (#81)
* Implement/suppress various compiler/clippy lints

* Change `tool_init` to take `ToolType` by value

* Factor out error conversion into a function

* Consume parameters with `todo`

* Make `workspace` stuff public

Making them public also removes the warnings
without having to suppress them.

Also, this commit removes the unused import of
`EditorError`

* Remove allow(unused_variables), use vars in `todo`

Also implements `Debug` on `DocumentToolData`
2021-04-22 17:05:25 +02:00
T0mstone 87ed3a1bbd Use `array::IntoIter` instead of copying (#80) 2021-04-22 15:09:44 +02:00
0HyperCube 46c9ef02ca Add colors in Rust (#78)
* 🎨 Add colors in Rust

* 🌿 Use an option for the properties and #[repr(C)]

*  Remove WASM dependency on document.

* 😎 Wrap Fill and stroke in a style struct.

* 📦 Use crate::Color

* Merge Add transactions for temporary modifications to the document

* Run cargo fmt

* Color without a 'U'
2021-04-21 22:25:06 +01:00
TrueDoctor 2849b99b59 Add transactions for temporary modifications to the document (#77)
* Add transactions for temporary modifications to the document

* Add DiscardTempFolder Operation

* Add clearFolder operation

* Rename Temp to Work
2021-04-21 00:32:36 +02:00
0HyperCube 90df412aab Add Shape Tool for drawing polygons (#75)
* ⬠ Add polygon drawing tool

* 🔤 Minor fix of variable and function names

*  Remove stroke

* ⌨️ Use N key as polygo tool shortcut.

* ⌨️ Now using key Y for polygons.

* ⌨️ The tooltip for the shortcut is fixed
2021-04-17 19:08:44 +01:00
Edwin Cheng f12db377f4 Implement Line tool (#71)
* Add Line tool
2021-04-13 12:43:05 +08:00
TrueDoctor 6511f5a628 Implement svg layer structure (#59)
* Add folder struct

* Add file system like structure to interface with svgs

* Add primitive undo functionality

* Restructure layer system
2021-04-12 00:57:39 +02:00
T0mstone 2497a21737 Fix Bug introduced in #67 (#68) 2021-04-10 18:54:59 +02:00
T0mstone 21ffb3571e Polish a few things (#67)
* Improve some match statements using macros

* Use `thiserror` instead of manually impl'ing Error
2021-04-10 16:27:44 +02:00
Keavon Chambers a56f50c60c Implement active tool visual syncing with tool shelf state 2021-04-10 03:49:27 -07:00
Keavon Chambers 958d351505 Plumb Responses from WASM to JS in the page 2021-04-10 02:48:33 -07:00
Keavon Chambers 8b6053b1c4 Populate tool shelf and tool options bar (#66) 2021-04-08 06:10:27 -07:00
T0mstone 09c4a1b796 Add proc macros for Hint and edge (#63)
* Add proc-macro crate with two macros

* Let cargo recalculate the Cargo.lock

* Add tests and refactor some code to allow testing

also the impl for parse_hint_helper_attrs now preserves order
(which is essential for testing)
2021-04-07 13:51:33 +02:00
TrueDoctor 0a112be97b Implement key handling (#65) 2021-04-07 11:02:56 +02:00
TrueDoctor 599d478a5c Add ToolData and rectangle tool (#64) 2021-04-07 09:25:23 +02:00