Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/dev' into luminol-preferences
Browse files Browse the repository at this point in the history
  • Loading branch information
melody-rs committed Mar 26, 2024
2 parents 286974e + 19ffd46 commit 4470722
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 15 deletions.
22 changes: 11 additions & 11 deletions FUNCTIONALITY.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

### Common funtionality

- [x] Common event editor
- [ ] Common event editor
- [x] Script editor
- [x] Sound test
- [x] Properly render blend modes and opacity
Expand All @@ -17,21 +17,21 @@
- [ ] Resize maps
- [x] Open events
- [ ] Edit event commands
- [x] View event commands
- [ ] View event commands
- [x] Change tiles on map
- [x] Multiple brush types
- [x] Change autotiles on map
- [x] Hardware accelerated tilemap
- [ ] Actor editor
- [ ] Class editor
- [ ] Skill editor
- [x] Actor editor
- [x] Class editor
- [x] Skill editor
- [x] Item editor
- [ ] Weapon editor
- [ ] Armor editor
- [x] Weapon editor
- [x] Armor editor
- [ ] Enemy editor
- [ ] Troop editor
- [ ] State editor
- [ ] Animation editor
- [x] State editor
- [x] Animation editor
- [ ] Tileset editor

### RPG Maker VX
Expand Down Expand Up @@ -96,7 +96,7 @@
- [ ] Language server support for script editor?
- [x] Custom event commands
- [x] Procedural event commands
- [ ] Debugger support?
- [x] Debugger support (via rdbg and integrated terminal)
- [ ] Custom data formats
- [ ] Extra layers
- [x] Move route previews
Expand All @@ -105,4 +105,4 @@
- [ ] Styling different from egui's
- [ ] Lua plugin API?
- [ ] Text based event editor [based on keke](https://github.com/Astrabit-ST/keke)
- [ ] Extra properties
- [ ] Extra properties
4 changes: 3 additions & 1 deletion crates/components/src/tilepicker.rs
Original file line number Diff line number Diff line change
Expand Up @@ -274,7 +274,9 @@ impl Tilepicker {
};
let pos = ((pos - canvas_rect.min) / 32.).to_pos2();

if response.dragged_by(egui::PointerButton::Primary) {
if response.is_pointer_button_down_on()
&& ui.input(|i| i.pointer.button_down(egui::PointerButton::Primary))
{
let drag_origin = if let Some(drag_origin) = self.drag_origin {
drag_origin
} else {
Expand Down
3 changes: 2 additions & 1 deletion crates/graphics/src/tiles/atlas.rs
Original file line number Diff line number Diff line change
Expand Up @@ -399,7 +399,8 @@ fn write_texture_region<P>(
P: image::Pixel,
P::Subpixel: bytemuck::Pod,
{
let (x, y, width, height) = image.bounds();
let (x, y) = image.offsets();
let (width, height) = image.dimensions();
let bytes = bytemuck::cast_slice(image.inner().as_raw());

let inner_width = image.inner().width();
Expand Down
7 changes: 5 additions & 2 deletions crates/ui/src/tabs/map/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -418,8 +418,11 @@ impl luminol_core::Tab for Tab {
}

// Tile drawing
if response.dragged_by(egui::PointerButton::Primary)
&& !ui.input(|i| i.modifiers.command)
if response.is_pointer_button_down_on()
&& ui.input(|i| {
i.pointer.button_down(egui::PointerButton::Primary)
&& !i.modifiers.command
})
{
self.handle_brush(
map_x as usize,
Expand Down

0 comments on commit 4470722

Please sign in to comment.