Update Camera and Shadertoy examples #25
Conversation
examples/camera.rs
Outdated
| } | ||
| } | ||
|
|
||
| #[macroquad::main(window_conf)] |
There was a problem hiding this comment.
Nice, I really like how it looks! :)
Cargo.toml
Outdated
| @@ -23,3 +23,6 @@ glam = {version = "0.8", features = ["scalar-math"] } | |||
| image = { version = "0.22", default-features = false, features = ["png_codec", "tga"] } | |||
| megaui = { version = "=0.2.11" } | |||
| macroquad_macro = { version = "0.1", path = "macroquad_macro" } | |||
|
|
|||
| [patch.crates-io] | |||
There was a problem hiding this comment.
This probably should not be a part of this PR?
There was a problem hiding this comment.
Yes, I will remove that. Just trying to make cross-compile, checks work correctly
| async fn main() { | ||
| let ferris = load_texture("rust.png").await; | ||
| let ferris = load_texture("examples/rust.png").await; |
There was a problem hiding this comment.
IIRC examples/rust.png will not work on wasm - there is no examples folder for textures
There was a problem hiding this comment.
In this case have to run executables from examples directory.
Otherwise just run cargo run --example shadertoy works correctly
There was a problem hiding this comment.
Also there an issue of this problem #26
macroquad_macro/src/lib.rs
Outdated
| @@ -34,12 +34,19 @@ pub fn main(attr: TokenStream, item: TokenStream) -> TokenStream { | |||
| } | |||
| modified.extend(source); | |||
|
|
|||
| let (method, ident) = match attr.into_iter().next() { | |||
There was a problem hiding this comment.
Could you make separate PR with just macro changes?
It would be way easier to review!
There was a problem hiding this comment.
Moved macro changes to #28 PR
examples/camera.rs
Outdated
| let mut offset = (0., 0.); | ||
|
|
||
| 'main: loop { | ||
| for &key in get_down_keys(&mut down_keys).iter() { |
There was a problem hiding this comment.
I am not quite sold on the idea of get_down_keys
As for me, this example would be a bit more readable with just a number of
if is_key_down(Key::Whatever) {
target.1 -= 0.1;
}
There was a problem hiding this comment.
It was just to write more compact code. Which is easy to add new cases. See diff: 1bd4e3e#diff-6a6a8253e0291eb499839f6f1f4c15c3L35
However, I removed it.
examples/camera.rs
Outdated
| (_x, y) if y != 0.0 => { | ||
| // Normalise mouse wheel values is browser (chromium: 53, firefox: 3) | ||
| #[cfg(target_arch = "wasm32")] | ||
| let y = if y < 0.0 {-1.0} else if y > 0.0 {1.0} else {0.0}; |
There was a problem hiding this comment.
It looks like rustfmt would not be happy with this line
There was a problem hiding this comment.
Formatted with rustfmt be5cc78#diff-6a6a8253e0291eb499839f6f1f4c15c3R53
examples/camera.rs
Outdated
| KeyCode::Up => offset.1 += 0.1, | ||
| KeyCode::Down => offset.1 -= 0.1, | ||
| #[cfg(not(target_arch = "wasm32"))] | ||
| KeyCode::Q | KeyCode::Escape => break 'main, |
There was a problem hiding this comment.
I think we will need some exit mechanism in macroquad.
Until it's done - I would try to avoid 'main on loops to not confuse people too much :)
examples/camera.rs
Outdated
|
|
||
| match mouse_wheel() { | ||
| (_x, y) if y != 0.0 => { | ||
| // Normalise mouse wheel values is browser (chromium: 53, firefox: 3) |
There was a problem hiding this comment.
Maybe do normalization on macroquad side, not on the user code side?
Not necessarily as a part of this PR though
There was a problem hiding this comment.
Maybe move normalization into mouse_wheel function?
|
Hi! |
|
This pull request looks promising, what can i do to help? |
@not-fl3 I moved new code to |
get_down_keysfor efficent handle down keysUpdated
cameraexample for visualize transitions: target/rotation/zoom/offset inCamera2DUpdated
shadertoyexample for autocompile shader once it editedMerge after Add Tab/Shift+Tab key handlers to editbox megaui#12 been merged