Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[WIP] Event editor #135

Merged
merged 69 commits into from
Jul 4, 2024
Merged

[WIP] Event editor #135

merged 69 commits into from
Jul 4, 2024

Conversation

melody-rs
Copy link
Member

@melody-rs melody-rs commented Jun 29, 2024

Connections
N/A

Description
This reimplements (part of) the event editor, as well as the picker modals! (Switch, Variable, Graphic, etc) I added some temporary test modals into the item and actor editor to show off that they work.
There isn't any event command editor yet though- That's reserved for another PR. I'm still working out the details of the event command editor. Same goes for Undo/Redo as well.

Testing

  • Open a project
  • Navigate to any map
  • Open an event
    • Edit switches
    • Switch pages
    • Add and delete pages

Checklist

  • Run cargo fmt.
  • Run cargo clippy. If applicable, add:
    • --target wasm32-unknown-unknown -Z build-std=std,panic_abort
  • Run cargo build --release
  • If applicable, run trunk build --release

@melody-rs melody-rs added the core functionality a feature provided in rpg maker label Jun 29, 2024
@melody-rs melody-rs requested a review from white-axe July 2, 2024 14:43
crates/ui/src/windows/event_edit.rs Outdated Show resolved Hide resolved
@melody-rs melody-rs marked this pull request as ready for review July 3, 2024 15:52
@melody-rs melody-rs requested a review from a team as a code owner July 3, 2024 15:52
melody-rs added 2 commits July 3, 2024 09:16
It was just technical debt, back from when Window deduplication was by Window::name instead of Window::id
@melody-rs melody-rs requested a review from white-axe July 3, 2024 16:24
crates/ui/src/windows/common_event_edit.rs Outdated Show resolved Hide resolved
crates/audio/src/lib.rs Outdated Show resolved Hide resolved
crates/components/src/sound_tab.rs Show resolved Hide resolved
@melody-rs melody-rs requested a review from white-axe July 4, 2024 08:28
@melody-rs melody-rs merged commit a0eded0 into Astrabit-ST:dev Jul 4, 2024
4 checks passed
@melody-rs melody-rs added this to the v1.0 milestone Jul 4, 2024
@melody-rs melody-rs deleted the event-editor branch July 4, 2024 21:26
MolassesLover pushed a commit to MolassesLover/luminol-molasses that referenced this pull request Jul 23, 2024
* forget outputstream, making audio send+sync

* Port over modals from old branch

* add basic event editor window

* Fix modal id conflict

* Use unified modal

* Replace import hack

* Add most of the event ui

* start implementing the graphic picker

* Add picker window

* Display graphic picker options

* Add sorta working tilepicker

* More picker stuff

* More picker things

* Hue & Opacity editing

* Fix some display issues

* adjust layout

* Show stripes

* Add search and fix stripes

* Actually save the graphic

* Insert events

* Minor fixes

* Validate texture sizes

* Fix fmt errors

* Make preview sprite loading more fallible

* Grey out invalid sprites

* Fix preview sprite handling

* Properly handle sprite scrolling

* Load from RTP on native too

* Properly load RTPs this time

* Don't enable debug symbols in release

* Remove all nightly features

* Update readme

* Clean up soundtab

* cache sound tab results

* Cache filters

* Use rows for graphic picker

* Re-add stripes to graphic picker

* Remove first open

* Very destructive commit

Not very happy with this because it clones things, which is a waste of memory

* Revert "Very destructive commit"

This reverts commit 471b014.

* Only load directory entries on modal opening

* Pad out top bar of event editor & graphic picker

* Use cross justify to expand the trigger window

* Fmt

* mem::take data from update state so we can use it in database view

* Add menu use se modal to item editor

* Use get_mut instead of borrow() in Data::save()

* Clean up sound picker modal a little

* Only load tilepicker when selecting tiles

* work on the graphic picker a bit

* Make Modal::reset actually useful

* Add graphic picker to item editor

* Fill out graphic picker more

* Make modals take data by value (might revert this)

* Remove ResetData
Was annoying and probably not needed

* Move current graphic picker into "basic"

* Add hue picker

* Deduplicate graphic picker behaviour

* Move event graphic picker into graphic_picker/

* Deduplicate more things

* Hack in the enemy battler picker

* add hacky actor graphic picker

* Directly* edit events

* Remove Window::name

It was just technical debt, back from when Window deduplication was by Window::name instead of Window::id

* Fix AudioFile::default defaulting to 0 volume

* Bump rodio version (fixes sound test crash?)

* Fix compiler warnings
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
core functionality a feature provided in rpg maker
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants