Skip to content
Permalink
Branch: rendy-all
Commits on Feb 22, 2020
  1. More work on examples

    semtexzv committed Feb 22, 2020
  2. Attempt to rework examples

    semtexzv committed Feb 22, 2020
Commits on Feb 21, 2020
  1. Cleanup

    valkum authored and semtexzv committed Dec 11, 2019
    Update the following examples to work with the winit and rendy upgrades: rendy, renderable, sprite_animation, sprite_camera_follow, sprites_ordered, tiles
  2. Add PR branch as rendy dep temp. Revert when merged

    valkum authored and semtexzv committed Nov 14, 2019
    Restructure to use EventLoop::run instead of run_return
    Fix rendy by moving some system to the mainthread
  3. Update to winit v0.20.0-alpha4 and rendy v0.5.1

    valkum authored and semtexzv committed Nov 14, 2019
    As rendy updated to the new winit version the change is included here too.
Commits on Feb 17, 2020
  1. Merge amethyst#2138

    bors and bonsairobo committed Feb 17, 2020
    2138: Support targeting multiple entities with UiEvents generated by the MouseUiSystem r=azriel91 a=bonsairobo
    
    ## Description
    
    Support targeting multiple entities with UiEvents generated by the MouseUiSystem
    
    ## Additions
    
    - Add the `transparent_target: bool` field to `UiTransform` and `UiTransformData`.
    
    ## Modifications
    
    - Use the field in `ui::events::targeted` to support the desired behavior.
    
    ## PR Checklist
    
    By placing an x in the boxes I certify that I have:
    
    - [ ] Updated the content of the book if this PR would make the book outdated.
    - [x] Added a changelog entry if this will impact users, or modified more than 5 lines of Rust that wasn't a doc comment.
    - [ ] Added unit tests for new code added in this PR.
    - [x] Acknowledged that by making this pull request I release this code under an MIT/Apache 2.0 dual licensing scheme.
    
    If this modified or created any rs files:
    
    - [x] Ran `cargo +stable fmt --all`
    - [x] Ran `cargo clippy --all --features "empty"`
    - [x] Ran `cargo test --all --features "empty"`
    
    
    Co-authored-by: Duncan <bonsairobo@gmail.com>
  2. Merge amethyst#2044

    bors and azriel91 committed Feb 17, 2020
    2044: Maintenance/update rodio cpal r=azriel91 a=azriel91
    
    ## Description
    
    - Updated `rodio` from `0.9` to `0.10`.
    - Updated `cpal` from `0.8` to `0.11`.
    
    A nice side effect with this is:
    
    ```
        Removing core-foundation-sys v0.5.1
        Removing generic-array v0.12.3
        Removing nalgebra v0.18.1
    ```
    
    ~~May want to manually `impl PartialEq` back on `Output`.~~
    
    Note: I tried the "back onto `AlsaHost` directly approach, it's not great, plus it makes `amethyst_audio` less portable when `Alsa` is not available.
    
    cc: amethyst#2030 (this doesn't fix it, and may worsen it)
    
    ## PR Checklist
    
    By placing an x in the boxes I certify that I have:
    
    - **n/a** Updated the content of the book if this PR would make the book outdated.
    - [x] Added a changelog entry if this will impact users, or modified more than 5 lines of Rust that wasn't a doc comment.
    - **n/a** Added unit tests for new code added in this PR.
    - [x] Acknowledged that by making this pull request I release this code under an MIT/Apache 2.0 dual licensing scheme.
    
    If this modified or created any rs files:
    
    - [x] Ran `cargo +stable fmt --all`
    - [x] Ran `cargo clippy --all --features "empty"`
    - [x] Ran `cargo test --all --features "empty"`
    
    
    Co-authored-by: Azriel Hoh <azriel91@gmail.com>
  3. Updated `CHANGELOG.md`.

    azriel91 committed Nov 18, 2019
  4. Revert "Updated `cpal` to `0.11.0`."

    azriel91 committed Feb 17, 2020
    This reverts commit ddf29eb.
Commits on Feb 15, 2020
  1. add the transparent_target: bool field to UiTransform and use it to s…

    bonsairobo committed Feb 8, 2020
    …upport targeting multiple entities with UiEvents generated by the MouseUiSystem
Commits on Feb 14, 2020
  1. Updated `cpal` to `0.11.0`.

    azriel91 committed Jan 7, 2020
    Also removed the `Output` field from `AudioSystem` as it was never used.
  2. Merge amethyst#2136

    bors and azriel91 committed Feb 14, 2020
    2136: Bumped dependency versions. r=azriel91 a=azriel91
    
    ## Description
    
    Updated dependency versions, excluding:
    
    * rendy
    * palette: need to update this in `rendy`
    * image: need to update this in `rendy`
    * rodio: see amethyst#2044
    * cpal: see amethyst#2044
    * objekt: crate renamed to `dyn-clone`, but asset implementation is going to be replaced with `atelier-assets`.
    
    ## PR Checklist
    
    By placing an x in the boxes I certify that I have:
    
    - [x] Updated the content of the book if this PR would make the book outdated.
    - [x] Added a changelog entry if this will impact users, or modified more than 5 lines of Rust that wasn't a doc comment.
    - **n/a** Added unit tests for new code added in this PR.
    - [x] Acknowledged that by making this pull request I release this code under an MIT/Apache 2.0 dual licensing scheme.
    
    If this modified or created any rs files:
    
    - [x] Ran `cargo +stable fmt --all`
    - [x] Ran `cargo clippy --all --features "empty"`
    - [x] Ran `cargo test --all --features "empty"`
    
    
    Co-authored-by: Azriel Hoh <azriel91@gmail.com>
  3. Revert "Drop `bytes` back to `0.4`."

    azriel91 committed Feb 14, 2020
    This reverts commit 15ae55e.
Commits on Feb 13, 2020
  1. Drop `bytes` back to `0.4`.

    azriel91 committed Feb 13, 2020
    `0.5` needs the nightly `const_slice_len` feature to build.
  2. Updated `CHANGELOG.md`.

    azriel91 committed Feb 13, 2020
  3. Bumped dependency versions.

    azriel91 committed Feb 13, 2020
  4. Merge amethyst#2085

    bors and MilanVasko committed Feb 13, 2020
    2085: Update to a newer, Rusty version of mikktspace r=azriel91,distransient a=MilanVasko
    
    Hello, this is my first PR, so apologies in case I've done something wrong.
    
    ## Description
    
    I was trying to run the GLTF example on Windows and I got told off by Visual Studio while compiling `amethyst_gltf`. The error message was as follows:
    
    ```
    error: linking with `link.exe` failed: exit code: 1120
      |
      = note: "C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\Community\\VC\\Tools\\MSVC\\14.24.28314\\bin\\HostX64\\x86\\link.exe" "/NOLOGO" "/NXCOMPAT" ... line too long to paste here
      = note: libmikktspace-ed048d53099c6187.rlib(mikktspace-ed048d53099c6187.mikktspace.24tkbvwf-cgu.0.rcgu.o) : error LNK2019: unresolved external symbol _genTangSpaceDefault@4 referenced in function __ZN10mikktspace8Closures8generate17hfe0598a16c7e4f72E
              C:\Users\mvask\Projects\amethyst\target\debug\examples\gltf.exe : fatal error LNK1120: 1 unresolved externals
    ```
    
    To be honest I had no idea how to fix it, but given that the problem seemed to be with the `mikktspace` library, I figured I could try and update to a newer version. Doing a little research, I found out that `mikktspace` started out as a wrapper around C code (which is what Amethyst is using), and has been later transformed to Rust.
    
    After the update, I had to adapt the code a bit, since the API of `mikktspace` has changed. Having done that, I was able to compile and run the GLTF example without problems, with the same visual result.
    
    One thing to note is that the library has not released this new, Rusty version yet and the repository looks kind of inactive (last commit was about 7 months ago), so I decided to pin the Amethyst dependency on the latest commit on master.
    
    ## Additions
    
    None
    
    ## Removals
    
    None
    
    ## Modifications
    
    Adapt the code using the `mikktspace` library to a new API.
    
    ## PR Checklist
    
    By placing an x in the boxes I certify that I have:
    
    - [x] Updated the content of the book if this PR would make the book outdated.
    - [x] Added a changelog entry if this will impact users, or modified more than 5 lines of Rust that wasn't a doc comment.
    - [x] Added unit tests for new code added in this PR.
    - [x] Acknowledged that by making this pull request I release this code under an MIT/Apache 2.0 dual licensing scheme.
    
    If this modified or created any rs files:
    
    - [x] Ran `cargo +stable fmt --all`
    - [x] Ran `cargo clippy --all --features "empty"`
    - [x] Ran `cargo test --all --features "empty"`
    
    
    Co-authored-by: Milan Vaško <m.vasko2@gmail.com>
Commits on Feb 12, 2020
  1. Merge amethyst#2126

    bors and azriel91 committed Feb 12, 2020
    2126: Fixed book snippet compilation errors. r=azriel91 a=azriel91
    
    ## Description
    
    Fixed book compilation errors -- added an import and a `?`.
    
    ## PR Checklist
    
    By placing an x in the boxes I certify that I have:
    
    - [x] Updated the content of the book if this PR would make the book outdated.
    - **n/a** Added a changelog entry if this will impact users, or modified more than 5 lines of Rust that wasn't a doc comment.
    - **n/a** Added unit tests for new code added in this PR.
    - [x] Acknowledged that by making this pull request I release this code under an MIT/Apache 2.0 dual licensing scheme.
    
    
    Co-authored-by: Azriel Hoh <azriel91@gmail.com>
  2. Merge amethyst#2128

    bors and bonsairobo committed Feb 12, 2020
    2128: Export the get_parent_pixel_size function r=azriel91 a=bonsairobo
    
    ## Description
    
    The function can be used to get the pixel (width, height) of an entity's parent's `UiTransform`. The function is a simplified version of what already existed in the `ui::drag` module.
    
    ## Additions
    
    - export a new function from `amethyst_ui` module
    
    ## Modifications
    
    - change the `get_scale_for_entity` to only check the parent's pixel size rather than checking the "scaled" size on all ancestors
    
    ## PR Checklist
    
    By placing an x in the boxes I certify that I have:
    
    - [ ] Updated the content of the book if this PR would make the book outdated.
    - [x] Added a changelog entry if this will impact users, or modified more than 5 lines of Rust that wasn't a doc comment.
    - [ ] Added unit tests for new code added in this PR.
    - [x] Acknowledged that by making this pull request I release this code under an MIT/Apache 2.0 dual licensing scheme.
    
    If this modified or created any rs files:
    
    - [x] Ran `cargo +stable fmt --all`
    - [x] Ran `cargo clippy --all --features "empty"`
    - [x] Ran `cargo test --all --features "empty"`
    
    
    Co-authored-by: Duncan <bonsairobo@gmail.com>
Commits on Feb 5, 2020
  1. Merge amethyst#2127

    bors and jstnlef committed Feb 5, 2020
    2127: The dependency ordering for laminar and udp are backward r=azriel91 a=jstnlef
    
    It looks as though I got the order of these wrong, though I swear the behavior I noticed was the opposite at the time I wrote it. Very specifically in this commit: amethyst@f3874f2#diff-4174748f4e78ca2a28b7480eb243f814
    
    ## PR Checklist
    
    By placing an x in the boxes I certify that I have:
    
    - [x] Updated the content of the book if this PR would make the book outdated.
    - [x] Added a changelog entry if this will impact users, or modified more than 5 lines of Rust that wasn't a doc comment.
    - [x] Added unit tests for new code added in this PR.
    - [x] Acknowledged that by making this pull request I release this code under an MIT/Apache 2.0 dual licensing scheme.
    
    If this modified or created any rs files:
    
    - [x] Ran `cargo +stable fmt --all`
    - [x] Ran `cargo clippy --all --features "empty"`
    - [x] Ran `cargo test --all --features "empty"`
    
    
    Co-authored-by: Justin LeFebvre <jstnlefebvre@gmail.com>
  2. Merge amethyst#2125

    bors and machine-hum committed Feb 5, 2020
    2125: Reorganised the dependencies to combat a race condition in amethyst network r=azriel91 a=Machine-Hum
    
    ## Description
    
    Fixed race condition by reorg'ing dependency order. In addition, networking examples can now sent / receive from the client end, before the client could just send data. This makes them more comprehensive and easier for beginners to get going.
    
    ## PR Checklist
    
    By placing an x in the boxes I certify that I have:
    
    - [NA] Updated the content of the book if this PR would make the book outdated.
    - [NA] Added a changelog entry if this will impact users, or modified more than 5 lines of Rust that wasn't a doc comment.
    - [NA] Added unit tests for new code added in this PR.
    - [x] Acknowledged that by making this pull request I release this code under an MIT/Apache 2.0 dual licensing scheme.
    
    If this modified or created any rs files:
    
    - [x] Ran `cargo +stable fmt --all`
    - [x] Ran `cargo clippy --all --features "empty"`
    - [x] Ran `cargo test --all --features "empty"`
    
    
    Co-authored-by: machine-hum <machinehum@wlkr.wlker>
Older
You can’t perform that action at this time.