Nope, no issues

Hmm

@abraxas Why is

tile_size

a

Vec2

rather than an

UVec2

?

tile size was the size of the tiles in pixels in the texture right?

Or is it the size in the world

We talked about that but I didn't understand you clearly

Mainly because macroquad uses Vec2 for everything

been a bit back and forth on what to use. The most correct thing to do is probably to use UVec2 (or Size) for such things. The argument for using Vec2 for everything, is less conversions

but we should probably go for using the "correct" type over reducing conversions

Yeah, the float conversion can be done at the end

I assume that's not going to be a problem w the graphical rewrite though

Finished w the open/create map windows 😁

(Oops I forgot to change the title on the open/import one)

Import finished too!

Only three TODOs missing now: The object placement tool (Should be trivial), the background edit window (oof) and map zoom (which I really should've implemented earlier...)

It's done!! Now's the time for testing. If you're interested to see how it has turned out, simply navigate to your local fishfight clone and do the following:

git remote add aleok https://github.com/aleokdev/FishFight
git checkout aleok/new_editor_ui
cargo run

If you have any comments/issues to point out/criticism/missing features please post them either here or in the PR: https://github.com/fishfight/FishFight/pull/407 There are still a few things missing (Background edit window isn't quite finished) but it's ready for general testing and debugging. Note that gamepad and theme support will probably be done in a different PR as those tackle different parts of the codebase.

PD: Since the editor has been rewritten from the ground up, there might be a couple features I've completely missed. Please mention them if you find any! Some bugs may have unintentionally been fixed too :)

PD 2: The code might be a bit messy 😅 I haven't taken much time to clean it up lately. I'll fix it once abraxas fixes the refactor branch and I can merge with main.

what happened to the tools api?

it should really be possible to extend this, as we plan to add the editor to the engine, long term

Since the tools available were known at compile time i just replaced the selected tool by an enum.

What do you plan to extend?

add tools in external code, for example

this is why I said refactor, not redesign 🙂

don't worry about this now, though. I will do a redesign of this when I move it out to core

Thank you 🙏 I was getting pretty anxious as I'd have to rewrite quite a bit of code

Channels are now connected!

The editor doesn't functionally edit the map yet, but check it out. We can already run a multiplayer game, and open the editor, having somebody play while somebody is editing. And nothing stops the other player from also going into edit mode or back and forth. https://files.revolt.spicy-lobster.katharostech.com/attachments/lBK2Tbvw9M6IIFAfyIP9PGepUopKrvMXmSjRHtuZlL

I didn't have to do anything special or even add any code to the editor after I got networking, which is one thing I really liked about designing the editor as a wrapper around the real, live game.

damn, that's cool!!