Release v0.9.0

Web builds now get their version text automatically from the Cargo.toml

.gitea/workflows/check.yml

@@ -34,44 +34,6 @@ jobs:
           components: rustfmt
       - name: cargo fmt --check
         run: cargo fmt --check
-  clippy:
-    runs-on: ubuntu-latest
-    name: ${{ matrix.toolchain }} / clippy
-    permissions:
-      contents: read
-      checks: write
-    strategy:
-      fail-fast: false
-      matrix:
-        # Get early warning of new lints which are regularly introduced in beta channels.
-        toolchain: [stable, beta]
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          submodules: true
-      - name: Install ${{ matrix.toolchain }}
-        uses: dtolnay/rust-toolchain@master
-        with:
-          toolchain: ${{ matrix.toolchain }}
-          components: clippy
-      - name: cargo clippy
-        uses: giraffate/clippy-action@v1
-        with:
-          reporter: 'github-pr-check'
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-  semver:
-    runs-on: ubuntu-latest
-    name: semver
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          submodules: true
-      - name: Install stable
-        uses: dtolnay/rust-toolchain@stable
-        with:
-          components: rustfmt
-      - name: cargo-semver-checks
-        uses: obi1kenobi/cargo-semver-checks-action@v2
   doc:
     # run docs generation on nightly rather than stable. This enables features like
     # https://doc.rust-lang.org/beta/unstable-book/language-features/doc-cfg.html which allows an
@@ -83,7 +45,7 @@ jobs:
         with:
           submodules: true
       - name: Install Dependencies
-        run: sudo apt-get update; sudo apt-get install -y --no-install-recommends libasound2-dev libudev-dev
+        run: sudo apt-get update; sudo apt-get install -y --no-install-recommends libasound2-dev libudev-dev libwayland-dev
       - name: Install nightly
         uses: dtolnay/rust-toolchain@nightly
       - name: cargo doc
@@ -100,7 +62,7 @@ jobs:
         with:
           submodules: true
       - name: Install Dependencies
-        run: sudo apt-get update; sudo apt-get install -y --no-install-recommends libasound2-dev libudev-dev cmake
+        run: sudo apt-get update; sudo apt-get install -y --no-install-recommends libasound2-dev libudev-dev libwayland-dev cmake
       - name: Install stable
         uses: dtolnay/rust-toolchain@stable
       - name: cargo install cargo-hack
@@ -116,14 +78,14 @@ jobs:
     # https://docs.github.com/en/actions/learn-github-actions/contexts#context-availability
     strategy:
       matrix:
-        msrv: ["1.79.0"]
+        msrv: ["1.88.0"]
     name: ubuntu / ${{ matrix.msrv }}
     steps:
       - uses: actions/checkout@v4
         with:
           submodules: true
       - name: Install Dependencies
-        run: sudo apt-get update; sudo apt-get install -y --no-install-recommends libasound2-dev libudev-dev
+        run: sudo apt-get update; sudo apt-get install -y --no-install-recommends libasound2-dev libudev-dev libwayland-dev
       - name: Install ${{ matrix.msrv }}
         uses: dtolnay/rust-toolchain@master
         with:

.gitignore

@@ -1 +1,2 @@
 /target
+/out

Cargo.toml

@@ -1,30 +1,14 @@
 [package]
 name = "another-boids-in-rust"
-version = "0.3.0"
+version = "0.9.0"
 edition = "2024"
+license = "AGPL-3.0-only"
+rust-version = "1.88.0"
 
 [dependencies]
-bevy = "0.16.0"
+avian2d = "0.4"
-
+bevy = "0.17.0"
-# Grand-dependency pins
+bevy-inspector-egui = "0.34"
-# ab_glyph = "0.2.16"
-# fnv = "1.0.6"
-# gilrs = "0.10.5"
-# lazy_static = "1.0.2"
-# lock_api = "0.4.7"
-# miniz-sys = "0.1.10"
-# nonmax = "0.5.1"
-# rand = "0.8.0"
-
-# Use regular bevy_spatial on non-WASM builds
-[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
-bevy_spatial = "0.11.0"
-
-# Use bevy_spatial *without* the kdtree_rayon feature when building for WASM.
-[target.'cfg(target_arch = "wasm32")'.dependencies.bevy_spatial]
-version = "0.11.0"
-default-features = false
-features = ["kdtree"]
 
 [profile.dev]
 opt-level = 1

Dockerfile

@@ -1,19 +1,12 @@
 FROM rust:1.89 AS builder
 
 RUN apt-get update
-RUN apt-get install -y --no-install-recommends libasound2-dev libudev-dev
 RUN rustup target add wasm32-unknown-unknown
 RUN cargo install --locked wasm-bindgen-cli
 
-# Copy only the package manifest and source code. Otherwise changes to anything
+COPY . .
-# will cause Docker to re-run `cargo build` even when the source hasn't changed.
-COPY src/ ./src
-COPY Cargo.toml ./Cargo.toml
-COPY Cargo.lock
 
-RUN cargo build --locked --target wasm32-unknown-unknown --profile=wasm-release
+RUN make -j
-RUN wasm-bindgen --no-typescript --target web --out-dir ./out/ --out-name "boids" target/wasm32-unknown-unknown/wasm-release/another-boids-in-rust.wasm
-COPY www/index.html out/index.html
 
 FROM busybox:musl
 RUN mkdir -p /var/www

LICENSE

@@ -0,0 +1,661 @@
+                    GNU AFFERO GENERAL PUBLIC LICENSE
+                       Version 3, 19 November 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU Affero General Public License is a free, copyleft license for
+software and other kinds of works, specifically designed to ensure
+cooperation with the community in the case of network server software.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+our General Public Licenses are intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  Developers that use our General Public Licenses protect your rights
+with two steps: (1) assert copyright on the software, and (2) offer
+you this License which gives you legal permission to copy, distribute
+and/or modify the software.
+
+  A secondary benefit of defending all users' freedom is that
+improvements made in alternate versions of the program, if they
+receive widespread use, become available for other developers to
+incorporate.  Many developers of free software are heartened and
+encouraged by the resulting cooperation.  However, in the case of
+software used on network servers, this result may fail to come about.
+The GNU General Public License permits making a modified version and
+letting the public access it on a server without ever releasing its
+source code to the public.
+
+  The GNU Affero General Public License is designed specifically to
+ensure that, in such cases, the modified source code becomes available
+to the community.  It requires the operator of a network server to
+provide the source code of the modified version running there to the
+users of that server.  Therefore, public use of a modified version, on
+a publicly accessible server, gives the public access to the source
+code of the modified version.
+
+  An older license, called the Affero General Public License and
+published by Affero, was designed to accomplish similar goals.  This is
+a different license, not a version of the Affero GPL, but Affero has
+released a new version of the Affero GPL which permits relicensing under
+this license.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU Affero General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Remote Network Interaction; Use with the GNU General Public License.
+
+  Notwithstanding any other provision of this License, if you modify the
+Program, your modified version must prominently offer all users
+interacting with it remotely through a computer network (if your version
+supports such interaction) an opportunity to receive the Corresponding
+Source of your version by providing access to the Corresponding Source
+from a network server at no charge, through some standard or customary
+means of facilitating copying of software.  This Corresponding Source
+shall include the Corresponding Source for any work covered by version 3
+of the GNU General Public License that is incorporated pursuant to the
+following paragraph.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the work with which it is combined will remain governed by version
+3 of the GNU General Public License.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU Affero General Public License from time to time.  Such new versions
+will be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU Affero General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU Affero General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU Affero General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If your software can interact with users remotely through a computer
+network, you should also make sure that it provides a way for users to
+get its source.  For example, if your program is a web application, its
+interface could display a "Source" link that leads users to an archive
+of the code.  There are many ways you could offer source, and different
+solutions will be better for different programs; see section 13 for the
+specific requirements.
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU AGPL, see
+<https://www.gnu.org/licenses/>.

Makefile

@@ -0,0 +1,86 @@
+# This script produces a web build. If you aren't trying to do that, it is
+# entirely useless to you.
+
+# # # Configuration Variables # # #
+# (because I don't have a ./configure script)
+#
+# Patch these to select a different build profile or target.
+# This Makefile will build a web bundle so using a non-wasm target is basically
+# nonsense. Maybe WASM64, but I don't think that's useful (or stabilized yet).
+CARGO_TARGET := wasm32-unknown-unknown
+CARGO_PROFILE := wasm-release
+
+# Override DESTDIR to set a custom install path
+# E.g.: your web root
+# I use it via the Debian package build process (dpkg needs it)
+DESTDIR ?= .
+
+# # # Automatic Variables # # #
+# (meaning you shouldn't modify them yourself)
+#
+# These are for automatically finding information or files so that they can be
+# used somewhere in the build process.
+SRC_DIR = ./src
+SRCS := $(wildcard $(SRC_DIR)/**)
+CRATE_VERSION != sed -nre 's/^version = "(.*)"/\1/p' Cargo.toml
+
+.PHONY: clean full-clean install tarball tarball-standalone web web-standalone
+
+# "Standalone" version
+# (i.e., it includes an index.html so it can be placed on a server as-is)
+web-standalone: out/boids.js out/boids_bg.wasm.gz out/index.html
+
+# "Bundle-able" version. The host site must provide it's own HTML page.
+web: out/boids.js out/boids_bg.wasm.gz out/boids.html
+
+tarball: boids_web_root.tar
+
+tarball_standalone: boids_web_root_standalone.tar
+
+boids_web_root.tar: out/boids.js out/boids_bg.wasm.gz out/boids.html
+	tar -caf $@ $^
+
+boids_web_root_standalone.tar: out/boids.js out/boids_bg.wasm.gz out/index.html
+	tar -caf $@ $^
+
+target/$(CARGO_TARGET)/$(CARGO_PROFILE)/another-boids-in-rust.wasm: $(SRCS) Cargo.lock Cargo.toml
+	cargo build --profile $(CARGO_PROFILE) --target $(CARGO_TARGET)
+
+out:
+	mkdir $@
+
+# Both the JS and WASM files are generated by the wasm-bindgen call, so both
+# get to be on the target half of this recipe.
+out/boids.js out/boids_bg.wasm.gz &: target/$(CARGO_TARGET)/$(CARGO_PROFILE)/another-boids-in-rust.wasm | out
+	wasm-bindgen --no-typescript --target web --out-dir ./out/ --out-name boids target/$(CARGO_TARGET)/$(CARGO_PROFILE)/another-boids-in-rust.wasm
+	gzip -9 -f out/boids_bg.wasm
+
+# Copies the index page to the output
+out/index.html: www/index.html
+	cp -a $< $@
+	rm -f out/boids.html
+	sed -i -e "s/#CRATE_VERSION_PLACEHOLDER#/$(CRATE_VERSION)/" $@
+
+# Like `out/index.html`, but renames it for use in a larger site.
+out/boids.html: www/index.html
+	cp -a $< $@
+	rm -f out/index.html
+	sed -i -e "s/#CRATE_VERSION_PLACEHOLDER#/$(CRATE_VERSION)/" $@
+
+# Clean the web build, but not the Cargo cache. Cargo handles it's own caching
+# and I don't want to obliterate it all the time.
+clean:
+	rm -rf out/ boids_web_root.tar boids_web_root_standalone.tar
+
+# Delete everything, including the Cargo build cache. In case someone needs
+# this, I guess.
+full-clean: clean
+	cargo clean
+
+# Installation goal. It's meant to be a helper utility for moving the built
+# output into the web root. Only supports the "bundle-able" mode.
+install: web
+	install -dm0755 $(DESTDIR)
+	install -m0644 out/boids.js $(DESTDIR)/
+	install -m0644 out/boids_bg.wasm.gz $(DESTDIR)/
+	install -m0644 out/boids.html $(DESTDIR)/

README.md

@@ -0,0 +1,82 @@
+# Another Boids in Rust
+
+This is my implementation of the Boids flocking algorithm. It is written in Rust and built on the Bevy game engine.
+
+## Building & Running
+
+### Desktop/native
+
+You'll need a working Rust toolchain, of course. See the [rustup](https://rustup.rs/) site for the basics.
+
+```sh
+# Install system dependencies
+
+:~$ sudo apt install libasound2-dev libudev-dev pkg-config # Debian 13
+:~$ sudo yum install alsa-lib-devel libgudev-devel ppkgconf-pkg-config # Fedora 42
+
+# Build and run
+:~$ cargo build --release
+:~$ cargo run --release # Or skip the build and only run. Cargo will (re)build as-needed.
+```
+
+### Web
+
+This project creates a "static site," meaning a complete deployment of the site is simply copying the output folder onto a webserver. There are **two** ways to use this.
+
+1. A standalone application which can be quickly hosted as-is. This includes the WASM, it's JS glue, and an index.html page.
+2. A sub-page in a larger website. This is actually the same, but names it's HTML page "boids.html" so consumers (you) can provide their own index.html.
+    - I'm not using a JS Bundler at this time. If you're familiar with JS development, this probably looks like a dumb way to do it. Sorry about that.
+
+#### Standalone build:
+
+1. Build `make web-standalone`
+2. Serve `python3 -m http.server -d ./out`
+3. Visit site in browser: `http://localhost:8000`
+
+To quickly get a tarball, use `make tarball_standalone`. If you're trying to build and upload the program somewhere, this may provide a bit of convenience. Compressing it may be a good idea, too.
+
+#### "Bundle-able" build
+
+For a "bundle-able" build, you'll need to write your own index.html and link to the boids.html file.
+
+Basically, just throw in a hyperlink with `<a href="boids.html">Boids</a>`
+
+```html
+<!DOCTYPE html>
+<html>
+    <!-- your page content, etc -->
+    <body>
+        <a href="boids.html">Boids</a>
+    </body>
+    <!-- more page content, etc -->
+</html>
+```
+
+As mentioned in the option 2 description, I'm not using a JS Bundler. There is no "package.json" or anything to integrate properly with a JS framework. I plan to fix that at some point, but for now there are just a bunch of files to grab.
+
+---
+
+You can use any HTTP server you like. In the steps above, I'm using the Python3 built-in [http.server module](https://docs.python.org/3/library/http.server.html); which is **NOT** recommended for production use. Don't put that on the Internet! Alternatives include [Miniserve](https://crates.io/crates/miniserve) and [BusyBox](https://busybox.net/). The latter of which I'm using in the Docker image.
+
+### Web, but as a Docker Container
+
+You'll need a working Docker installation. See the [get-docker](https://docs.docker.com/get-started/get-docker/) page for details. The rest of the build and execution is self-contained in the container(s) and will not require additional host tools.
+
+```sh
+:~$ docker build -t boids-website .
+:~$ docker run -it --rm boids-website
+```
+
+You might have to open another terminal to `docker kill <the boids container>`. It doesn't seem to respond to `ctrl+c` and I don't plan to figure out why any time soon.
+
+You may also notice that the Dockerfile doesn't call on the Makefile. This is because the Dockerfile predates the Makefile and I haven't updated it to follow the manual process described above. The result is the same, only now it's in a container and using the BusyBox webserver.
+
+## Controls
+
+| Input | Effect |
+|-|-|
+| Mouse | The scanner circle is attached to the mouse cursor. Move it to scan boids within the radius. |
+| Left mouse button | Put scanner into center-of-mass mode |
+| Right mouse button | Put scanner into average velocity mode |
+
+**BUG:** On web builds, the right-click action will *both* switch the scanner mode and open the browser's context menu. You can work around this by closing the menu without left-clicking on the canvas -- click outside the canvas, or use the escape key, etc.

fly.toml

@@ -1,25 +0,0 @@
-# fly.toml app configuration file generated for boids-autumn-lake-5810 on 2025-09-03T16:02:00-05:00
-#
-# See https://fly.io/docs/reference/configuration/ for information about how to use this file.
-#
-
-app = 'boids-autumn-lake-5810'
-primary_region = 'ord'
-
-[build]
-
-[env]
-  PORT = '8080'
-
-[http_service]
-  internal_port = 8080
-  force_https = true
-  auto_stop_machines = 'stop'
-  auto_start_machines = true
-  min_machines_running = 0
-  processes = ['app']
-
-[[vm]]
-  memory = '256mb'
-  cpu_kind = 'shared'
-  cpus = 1

src/birdoids/mod.rs

@@ -1,62 +1,81 @@
 pub mod physics;
 
+use avian2d::prelude::*;
 use bevy::prelude::*;
-use bevy_spatial::{
-    AutomaticUpdate, SpatialAccess, SpatialStructure, TransformMode, kdtree::KDTree2,
-};
 
 use crate::birdoids::physics::{Force, Velocity, apply_velocity};
+use bevy_inspector_egui::{InspectorOptions, prelude::ReflectInspectorOptions};
 
 const BACKGROUND_COLOR: Color = Color::srgb(0.4, 0.4, 0.4);
-const PLAYERBOID_COLOR: Color = Color::srgb(1.0, 0.0, 0.0);
-const TURN_FACTOR: f32 = 1.0;
-const BOID_VIEW_RANGE: f32 = 15.0;
-const COHESION_FACTOR: f32 = 1.0;
-const SEPARATION_FACTOR: f32 = 10.0;
-const ALIGNMENT_FACTOR: f32 = 1.0;
-const SPACEBRAKES_COEFFICIENT: f32 = 0.5;
-const LOW_SPEED_THRESHOLD: f32 = 50.0;
-const HIGH_SPEED_THRESHOLD: f32 = 200.0;
 
 pub struct BoidsPlugin;
 
 impl Plugin for BoidsPlugin {
     fn build(&self, app: &mut App) {
-        app.add_plugins(
+        app.insert_resource(ClearColor(BACKGROUND_COLOR))
-            AutomaticUpdate::<TrackedByKdTree>::new()
+            .insert_resource(FlockingParameters::new())
-                // .with_frequency(Duration::from_secs_f32(0.3))
+            .register_type::<FlockingParameters>()
-                .with_transform(TransformMode::GlobalTransform)
+            .insert_resource(MiscParams::new())
-                .with_spatial_ds(SpatialStructure::KDTree2),
+            .register_type::<MiscParams>()
-        )
+            .add_systems(Startup, (spawn_camera, spawn_boids))
-        .insert_resource(ClearColor(BACKGROUND_COLOR))
+            .add_systems(
-        .add_systems(Startup, (spawn_camera, spawn_boids))
+                FixedUpdate,
-        .add_systems(
+                (
-            FixedUpdate,
+                    apply_velocity,
-            (
+                    turn_if_edge,
-                apply_velocity,
+                    cohesion,
-                turn_if_edge,
+                    separation,
-                check_keyboard,
+                    alignment,
-                cohesion,
+                    speed_controller,
-                separation,
+                ),
-                alignment,
+            );
-                speed_controller,
+    }
-            ),
+}
-        );
+
+#[derive(InspectorOptions, Reflect, Resource, Debug, Clone, Copy)]
+#[reflect(Resource, InspectorOptions)]
+pub(crate) struct FlockingParameters {
+    view_range: f32,
+    cohesion: f32,
+    separation: f32,
+    alignment: f32,
+}
+
+impl FlockingParameters {
+    pub(crate) fn new() -> Self {
+        Self {
+            view_range: 15.0,
+            cohesion: 1.0,
+            separation: 5.0,
+            alignment: 2.0,
+        }
+    }
+}
+
+#[derive(InspectorOptions, Reflect, Resource, Debug, Clone, Copy)]
+#[reflect(Resource, InspectorOptions)]
+pub(crate) struct MiscParams {
+    turn_factor: f32,
+    spacebrakes: f32,
+    minimum_speed: f32,
+    maximum_speed: f32,
+}
+
+impl MiscParams {
+    pub(crate) fn new() -> Self {
+        Self {
+            turn_factor: 1.0,
+            spacebrakes: 0.5,
+            minimum_speed: 50.0,
+            maximum_speed: 200.0,
+        }
     }
 }
 
 #[derive(Component)]
-#[require(Velocity, Force, TrackedByKdTree)]
+#[require(Velocity, Force)]
 pub(crate) struct Boid;
 
-// It's a Boid, but with an extra component so the player
-// can control it from the keyboard
-#[derive(Component)]
-struct PlayerBoid;
-
-#[derive(Component, Default)]
-pub struct TrackedByKdTree;
-
 fn spawn_camera(mut commands: Commands) {
     commands.spawn(Camera2d);
 }
@@ -76,26 +95,21 @@ fn spawn_boids(
             Mesh2d(meshes.add(Circle::new(1.0))),
             MeshMaterial2d(materials.add(Color::srgb(1.0, 1.0, 1.0))),
             Transform::from_translation(vel * 20.0),
+            // RigidBody::Dynamic,
+            Collider::circle(1.0),
         ));
     }
-
-    commands.spawn((
-        Boid,
-        PlayerBoid,
-        Mesh2d(meshes.add(Triangle2d::default())),
-        MeshMaterial2d(materials.add(PLAYERBOID_COLOR)),
-    ));
 }
 
 /// Controls the boid's minimum and maximum speed according to a low- and
 /// high-threshold. Boids moving too slow are sped up, and boids moving too
 /// fast are slowed down.
-fn speed_controller(mut mobs: Query<(&Velocity, &mut Force), With<Boid>>) {
+fn speed_controller(mut mobs: Query<(&Velocity, &mut Force), With<Boid>>, params: Res<MiscParams>) {
     for (vel, mut impulse) in &mut mobs {
-        if vel.0.length() < LOW_SPEED_THRESHOLD {
+        if vel.0.length() < params.minimum_speed {
-            impulse.0 += vel.0 * SPACEBRAKES_COEFFICIENT;
+            impulse.0 += vel.0 * params.spacebrakes;
-        } else if vel.0.length() > HIGH_SPEED_THRESHOLD {
+        } else if vel.0.length() > params.maximum_speed {
-            impulse.0 += -vel.0 * SPACEBRAKES_COEFFICIENT;
+            impulse.0 += -vel.0 * params.spacebrakes;
         }
     }
 }
@@ -103,21 +117,22 @@ fn speed_controller(mut mobs: Query<(&Velocity, &mut Force), With<Boid>>) {
 fn turn_if_edge(
     mut query: Query<(&mut Transform, &mut Velocity), With<Boid>>,
     window: Query<&Window>,
+    params: Res<MiscParams>,
 ) {
     if let Ok(window) = window.single() {
         let (width, height) = (window.resolution.width(), window.resolution.height());
         for (transform, mut velocity) in &mut query {
             let boid_pos = transform.translation.xy();
             if boid_pos.x <= -width / 2. + 50. {
-                velocity.x += TURN_FACTOR;
+                velocity.x += params.turn_factor;
             } else if boid_pos.x >= width / 2. - 50. {
-                velocity.x -= TURN_FACTOR;
+                velocity.x -= params.turn_factor;
             }
 
             if boid_pos.y <= -height / 2. + 50. {
-                velocity.y += TURN_FACTOR;
+                velocity.y += params.turn_factor;
             } else if boid_pos.y >= height / 2. - 50. {
-                velocity.y -= TURN_FACTOR;
+                velocity.y -= params.turn_factor;
             }
         }
     } else {
@@ -125,38 +140,12 @@ fn turn_if_edge(
     }
 }
 
-fn check_keyboard(
-    keyboard_input: Res<ButtonInput<KeyCode>>,
-    mut app_exit_events: ResMut<Events<bevy::app::AppExit>>,
-    mut query: Query<&mut Force, With<PlayerBoid>>,
-) {
-    if keyboard_input.just_pressed(KeyCode::KeyQ) {
-        app_exit_events.send(bevy::app::AppExit::Success);
-    }
-
-    let mut impulse = query
-        .single_mut()
-        .expect("[birdoids_plugin::check_keyboard()] ->> There seems to be more than one player... How did that happen?");
-    let mut dir = Vec2::ZERO;
-    if keyboard_input.pressed(KeyCode::ArrowLeft) {
-        dir.x -= 1.0;
-    }
-    if keyboard_input.pressed(KeyCode::ArrowRight) {
-        dir.x += 1.0;
-    }
-    if keyboard_input.pressed(KeyCode::ArrowDown) {
-        dir.y -= 1.0;
-    }
-    if keyboard_input.pressed(KeyCode::ArrowUp) {
-        dir.y += 1.0;
-    }
-
-    **impulse += dir.extend(0.0) * 50.0;
-}
-
 fn cohesion(
-    spatial_tree: Res<KDTree2<TrackedByKdTree>>,
+    spatial: SpatialQuery,
+    // TODO: Ensure this is logically sound. I think it will fail the "disjoint queries" requirement.
+    boid_locations: Query<&Transform, With<Boid>>,
     mut boids: Query<(Entity, &Transform, &mut Force), With<Boid>>,
+    props: Res<FlockingParameters>,
 ) {
     // for each boid
     // find neighbors
@@ -164,14 +153,23 @@ fn cohesion(
     // find vector from boid to flock CoM
     // apply force
     for (this_entt, transform, mut force) in &mut boids {
-        let (len, sum) = spatial_tree
+        let (len, sum) = spatial
-            .within_distance(transform.translation.xy(), BOID_VIEW_RANGE)
+            .shape_intersections(
+                &Collider::circle(props.view_range),
+                transform.translation.xy(),
+                0.0,
+                &SpatialQueryFilter::default(),
+            )
             .iter()
-            .filter_map(|(pos, entt)| {
+            .filter_map(|&entt| {
+                // extract neighbor's position
                 // Skip self-comparison. A boid should not try to separate from itself.
-                let entt = entt
+                if this_entt == entt {
-                    .expect("within_distance gave me an entity... with no entity ID... somehow");
+                    None
-                if this_entt == entt { None } else { Some(pos) }
+                } else {
+                    let tsfm = boid_locations.get(entt).unwrap();
+                    Some(tsfm.translation.xy())
+                }
             })
             .enumerate()
             .fold((0, Vec2::ZERO), |(_len, com), (idx, pos)| (idx, com + pos));
@@ -183,47 +181,56 @@ fn cohesion(
             continue;
         };
 
-        let impulse = cohesive_force(center_of_mass, transform.translation.xy()).expect("damn");
+        let impulse = cohesive_force(center_of_mass, transform.translation.xy(), props.view_range)
+            .expect("damn");
 
-        force.0 -= impulse.0 * COHESION_FACTOR;
+        force.0 -= impulse.0 * props.cohesion;
     }
 }
 
 fn separation(
-    spatial_tree: Res<KDTree2<TrackedByKdTree>>,
+    spatial: SpatialQuery,
+    boid_locations: Query<&Transform, With<Boid>>,
     mut boids: Query<(Entity, &Transform, &mut Force), With<Boid>>,
+    props: Res<FlockingParameters>,
 ) {
     // for each boid
     // find neighbors
     // sum force from neighbors
     // apply force
     for (this_entt, tsfm, mut force) in &mut boids {
-        let impulse = spatial_tree
+        let impulse = spatial
-            .within_distance(tsfm.translation.xy(), BOID_VIEW_RANGE / 4.0)
+            .shape_intersections(
+                &Collider::circle(props.view_range / 4.0),
+                tsfm.translation.xy(),
+                0.0,
+                &SpatialQueryFilter::default(),
+            )
             .iter()
-            .filter_map(|(pos, entt)| {
+            .filter_map(|&entt| {
                 // Skip self-comparison. A boid should not try to separate from itself.
-                let entt = entt
-                    .expect("within_distance gave me an entity... with no entity ID... somehow");
                 if this_entt == entt {
                     None
                 } else {
+                    let pos = boid_locations.get(entt).unwrap().translation.xy();
                     Some(pos.extend(0.0))
                 }
             })
             .fold(Vec3::ZERO, |acc, other| {
                 // let force = tsfm.translation - other;
-                let force = separation_force(tsfm.translation.xy(), other.xy()).expect("angy");
+                let force = separation_force(tsfm.translation.xy(), other.xy(), props.view_range)
+                    .expect("angy");
                 acc + force.0
             });
-        force.0 += impulse * SEPARATION_FACTOR;
+        force.0 += impulse * props.separation;
     }
 }
 
 fn alignment(
-    spatial_tree: Res<KDTree2<TrackedByKdTree>>,
+    spatial: SpatialQuery,
     mut boids: Query<(Entity, &Transform, &mut Force), With<Boid>>,
     boid_velocities: Query<&Velocity, With<Boid>>,
+    props: Res<FlockingParameters>,
 ) {
     // for each boid
     // find neighbors
@@ -233,14 +240,16 @@ fn alignment(
     // apply steering force
 
     for (this_entt, transform, mut force) in &mut boids {
-        let neighbors = spatial_tree.within_distance(transform.translation.xy(), BOID_VIEW_RANGE);
+        let neighbors = spatial.shape_intersections(
+            &Collider::circle(props.view_range),
+            transform.translation.xy(),
+            0.0,
+            &SpatialQueryFilter::default(),
+        );
         // averaging divides by length. Guard against an empty set of neighbors
         let (len, sum) = neighbors
             .iter()
-            // Extract the velocities by `get()`ing from another query param.
+            .filter_map(|&entt| {
-            .filter_map(|(_pos, maybe_entt)| {
-                let entt = maybe_entt
-                    .expect("Neighbor boid has no Entity ID. I don't know what this means");
                 if this_entt == entt {
                     None
                 } else {
@@ -261,7 +270,7 @@ fn alignment(
         };
 
         let boid_vel = boid_velocities.get(this_entt).unwrap();
-        force.0 += (avg.extend(0.0) - boid_vel.0) * ALIGNMENT_FACTOR;
+        force.0 += (avg.extend(0.0) - boid_vel.0) * props.alignment;
     }
 }
 
@@ -287,13 +296,13 @@ fn average_of_vec2s(points: impl Iterator<Item = Vec2>) -> Option<Vec2> {
 }
 
 // f(x) = 4((x-0.5)^3 + 0.125)
-fn cohesive_force(boid: Vec2, target: Vec2) -> Option<Force> {
+fn cohesive_force(boid: Vec2, target: Vec2, view_range: f32) -> Option<Force> {
     let deviation = target - boid;
     /*
     Scale deviation vector by the boid's view range. The curve is made to
     operate on the range (0, 1), so that needs to be the viewing circle.
     */
-    let scaled = deviation / BOID_VIEW_RANGE;
+    let scaled = deviation / view_range;
     let mag = scaled.length();
     if mag > 0.0 {
         let cube: f32 = (mag - 0.5).powf(3.0);
@@ -310,9 +319,9 @@ fn cohesive_force(boid: Vec2, target: Vec2) -> Option<Force> {
 }
 
 // f(x) = x^2 - 1
-fn separation_force(boid: Vec2, target: Vec2) -> Option<Force> {
+fn separation_force(boid: Vec2, target: Vec2, view_range: f32) -> Option<Force> {
     // Scale from BOID_VIEW_RANGE to unit space
-    let distance_unit = (target - boid) / BOID_VIEW_RANGE;
+    let distance_unit = (target - boid) / view_range;
     let mag = distance_unit.length();
     if mag > 0.0 {
         let force_mag = mag.powf(2.0) - 1.0;
@@ -329,14 +338,15 @@ mod tests {
 
     use crate::birdoids::{cohesive_force, separation_force};
 
-    use super::{BOID_VIEW_RANGE, physics::Force};
+    use super::{FlockingParameters, physics::Force};
 
     // forces are relative to the boid's view range, so all
     // distances need to be fractions of that
 
     #[test]
     fn check_cohesion_zero_zero() {
-        let force = cohesive_force(Vec2::ZERO, Vec2::ZERO);
+        let props = FlockingParameters::new();
+        let force = cohesive_force(Vec2::ZERO, Vec2::ZERO, props.view_range);
         assert!(force.is_none());
     }
 
@@ -347,36 +357,56 @@ mod tests {
     #[test]
     fn check_cohesion_midpoint_x_positive() {
         // Pull right 0.5 units
+        let props = FlockingParameters::new();
         assert_eq!(
             Some(Force(Vec3::new(0.5, 0.0, 0.0))),
-            cohesive_force(Vec2::new(0.0, 0.0), Vec2::new(0.5 * BOID_VIEW_RANGE, 0.0),)
+            cohesive_force(
+                Vec2::new(0.0, 0.0),
+                Vec2::new(0.5 * props.view_range, 0.0),
+                props.view_range
+            )
         );
     }
 
     #[test]
     fn check_cohesion_midpoint_x_negative() {
         // Pull left 0.5 units
+        let props = FlockingParameters::new();
         assert_eq!(
             Some(Force(Vec3::new(-0.5, 0.0, 0.0))),
-            cohesive_force(Vec2::new(0.0, 0.0), Vec2::new(-0.5 * BOID_VIEW_RANGE, 0.0),)
+            cohesive_force(
+                Vec2::new(0.0, 0.0),
+                Vec2::new(-0.5 * props.view_range, 0.0),
+                props.view_range
+            )
         );
     }
 
     #[test]
     fn check_cohesion_edge_x_positive() {
         // pull left 1.0 units
+        let props = FlockingParameters::new();
         assert_eq!(
             Some(Force(Vec3::new(1.0, 0.0, 0.0))),
-            cohesive_force(Vec2::new(0.0, 0.0), Vec2::new(1.0 * BOID_VIEW_RANGE, 0.0),)
+            cohesive_force(
+                Vec2::new(0.0, 0.0),
+                Vec2::new(1.0 * props.view_range, 0.0),
+                props.view_range
+            )
         );
     }
 
     #[test]
     fn check_cohesion_edge_x_negative() {
         // pull left 1.0 units
+        let props = FlockingParameters::new();
         assert_eq!(
             Some(Force(Vec3::new(-1.0, 0.0, 0.0))),
-            cohesive_force(Vec2::new(0.0, 0.0), Vec2::new(-1.0 * BOID_VIEW_RANGE, 0.0),)
+            cohesive_force(
+                Vec2::new(0.0, 0.0),
+                Vec2::new(-1.0 * props.view_range, 0.0),
+                props.view_range
+            )
         );
     }
 
@@ -387,43 +417,64 @@ mod tests {
     #[test]
     fn check_cohesion_midpoint_y_positive() {
         // Pull up 0.5 units
+        let props = FlockingParameters::new();
         assert_eq!(
             Some(Force(Vec3::new(0.0, 0.5, 0.0))),
-            cohesive_force(Vec2::new(0.0, 0.0), Vec2::new(0.0, 0.5 * BOID_VIEW_RANGE),)
+            cohesive_force(
+                Vec2::new(0.0, 0.0),
+                Vec2::new(0.0, 0.5 * props.view_range),
+                props.view_range
+            )
         );
     }
 
     #[test]
     fn check_cohesion_midpoint_y_negative() {
         // Pull down 0.5 units
+        let props = FlockingParameters::new();
         assert_eq!(
             Some(Force(Vec3::new(0.0, -0.5, 0.0))),
-            cohesive_force(Vec2::new(0.0, 0.0), Vec2::new(0.0, -0.5 * BOID_VIEW_RANGE),)
+            cohesive_force(
+                Vec2::new(0.0, 0.0),
+                Vec2::new(0.0, -0.5 * props.view_range),
+                props.view_range
+            )
         );
     }
 
     #[test]
     fn check_cohesion_edge_y_positive() {
         // Pull up 1.0 units
+        let props = FlockingParameters::new();
         assert_eq!(
             Some(Force(Vec3::new(0.0, 1.0, 0.0))),
-            cohesive_force(Vec2::new(0.0, 0.0), Vec2::new(0.0, 1.0 * BOID_VIEW_RANGE))
+            cohesive_force(
+                Vec2::new(0.0, 0.0),
+                Vec2::new(0.0, 1.0 * props.view_range),
+                props.view_range
+            )
         );
     }
 
     #[test]
     fn check_cohesion_edge_y_negative() {
         // pull down 0.2 units
+        let props = FlockingParameters::new();
         assert_eq!(
             Some(Force(Vec3::new(0.0, -1.0, 0.0))),
-            cohesive_force(Vec2::new(0.0, 0.0), Vec2::new(0.0, -1.0 * BOID_VIEW_RANGE),)
+            cohesive_force(
+                Vec2::new(0.0, 0.0),
+                Vec2::new(0.0, -1.0 * props.view_range),
+                props.view_range
+            )
         );
     }
 
     // Separation 0,0 test
     #[test]
     fn check_separation_zero_zero() {
-        let force = separation_force(Vec2::ZERO, Vec2::ZERO);
+        let props = FlockingParameters::new();
+        let force = separation_force(Vec2::ZERO, Vec2::ZERO, props.view_range);
         assert!(force.is_none());
     }
 
@@ -432,39 +483,53 @@ mod tests {
     // *********************
     #[test]
     fn check_separation_midpoint_x_positive() {
+        let props = FlockingParameters::new();
         assert_eq!(
             Some(Force(Vec3::new(0.75, 0.0, 0.0))), // expected force
             separation_force(
-                Vec2::new(0.5 * BOID_VIEW_RANGE, 0.0), // boid position
+                Vec2::new(0.5 * props.view_range, 0.0), // boid position
-                Vec2::ZERO,                            // obstacle position
+                Vec2::ZERO,                             // obstacle position
+                props.view_range
             )
         );
     }
 
     #[test]
     fn check_separation_midpoint_x_negative() {
+        let props = FlockingParameters::new();
         assert_eq!(
             Some(Force(Vec3::new(-0.75, 0.0, 0.0))), // expected force
             separation_force(
-                Vec2::new(-0.5 * BOID_VIEW_RANGE, 0.0), // boid position
+                Vec2::new(-0.5 * props.view_range, 0.0), // boid position
-                Vec2::ZERO,                             // obstacle position
+                Vec2::ZERO,                              // obstacle position
+                props.view_range
             )
         );
     }
 
     #[test]
     fn check_separation_edge_x_positive() {
+        let props = FlockingParameters::new();
         assert_eq!(
             Some(Force(Vec3::ZERO)),
-            separation_force(Vec2::new(1.0 * BOID_VIEW_RANGE, 0.0), Vec2::ZERO,),
+            separation_force(
+                Vec2::new(1.0 * props.view_range, 0.0),
+                Vec2::ZERO,
+                props.view_range
+            ),
         );
     }
 
     #[test]
     fn check_separation_edge_x_negative() {
+        let props = FlockingParameters::new();
         assert_eq!(
             Some(Force(Vec3::ZERO)),
-            separation_force(Vec2::new(-1.0 * BOID_VIEW_RANGE, 0.0), Vec2::ZERO,),
+            separation_force(
+                Vec2::new(-1.0 * props.view_range, 0.0),
+                Vec2::ZERO,
+                props.view_range
+            ),
         );
     }
 
@@ -473,33 +538,53 @@ mod tests {
     // *********************
     #[test]
     fn check_separation_midpoint_y_positive() {
+        let props = FlockingParameters::new();
         assert_eq!(
             Some(Force(Vec3::new(0.0, 0.75, 0.0))),
-            separation_force(Vec2::new(0.0, 0.5 * BOID_VIEW_RANGE), Vec2::ZERO,)
+            separation_force(
+                Vec2::new(0.0, 0.5 * props.view_range),
+                Vec2::ZERO,
+                props.view_range
+            )
         );
     }
 
     #[test]
     fn check_separation_midpoint_y_negative() {
+        let props = FlockingParameters::new();
         assert_eq!(
             Some(Force(Vec3::new(0.0, -0.75, 0.0))),
-            separation_force(Vec2::new(0.0, -0.5 * BOID_VIEW_RANGE), Vec2::ZERO,)
+            separation_force(
+                Vec2::new(0.0, -0.5 * props.view_range),
+                Vec2::ZERO,
+                props.view_range
+            )
         );
     }
 
     #[test]
     fn check_separation_edge_y_positive() {
+        let props = FlockingParameters::new();
         assert_eq!(
             Some(Force(Vec3::ZERO)),
-            separation_force(Vec2::new(0.0, 1.0 * BOID_VIEW_RANGE), Vec2::ZERO,)
+            separation_force(
+                Vec2::new(0.0, 1.0 * props.view_range),
+                Vec2::ZERO,
+                props.view_range
+            )
         )
     }
 
     #[test]
     fn check_separation_edge_y_negative() {
+        let props = FlockingParameters::new();
         assert_eq!(
             Some(Force(Vec3::ZERO)),
-            separation_force(Vec2::new(0.0, -1.0 * BOID_VIEW_RANGE), Vec2::ZERO,)
+            separation_force(
+                Vec2::new(0.0, -1.0 * props.view_range),
+                Vec2::ZERO,
+                props.view_range
+            )
         )
     }
 }

src/debug_plugin.rs

@@ -1,8 +1,8 @@
+use avian2d::prelude::*;
 use bevy::{prelude::*, window::PrimaryWindow};
-use bevy_spatial::{SpatialAccess, kdtree::KDTree2};
 
 use crate::birdoids::{
-    Boid, TrackedByKdTree, center_of_boids, physics::Force, physics::Velocity, velocity_of_boids,
+    Boid, center_of_boids, physics::Force, physics::Velocity, velocity_of_boids,
 };
 
 const SCANRADIUS: f32 = 50.0;
@@ -106,15 +106,10 @@ fn update_scanner_mode(
     }
 }
 
-fn print_gizmo_config(query: Query<(&SelectionMode, &ScannerMode), With<Cursor>>) {
-    let (select, scan) = query.single().unwrap();
-    println!("Selection: {select:?}, Scanning: {scan:?}");
-}
-
 fn do_scan(
     boids_query: Query<(&Transform, &Velocity, &Force), With<Boid>>,
     scanner_query: Query<(&Transform, &SelectionMode, &ScannerMode), With<Cursor>>,
-    spatial_tree: Res<KDTree2<TrackedByKdTree>>,
+    spatial: SpatialQuery,
     /* Push info to summary somewhere */
     mut gizmos: Gizmos,
 ) {
@@ -122,25 +117,35 @@ fn do_scan(
     match select_mode {
         SelectionMode::NearestSingle => todo!(),
         SelectionMode::CircularArea => {
-            let boids = spatial_tree.within_distance(cursor_pos.translation.xy(), SCANRADIUS);
+            let boids = spatial
+                .shape_intersections(
+                    &Collider::circle(SCANRADIUS),
+                    cursor_pos.translation.xy(),
+                    0.0,
+                    &SpatialQueryFilter::default(),
+                )
+                .into_iter()
+                .map(|entt| {
+                    let (tsfm, vel, _) = boids_query
+                        .get(entt)
+                        .expect("Debugger scanned a Boid missing one of it's components!");
+                    (tsfm, vel)
+                });
+
             match scan_mode {
                 ScannerMode::CenterOfMass => {
                     if let Some(center_mass) = center_of_boids(
-                        // boids returns too many things.
+                        // `center_of_boids` needs an Iterator<Item = Vec2>, so we map over
-                        // Map over it and extract only the Vec3's
+                        // the output tuple to make one.
-                        boids.iter().map(|item| item.0),
+                        boids.map(|item| item.0.translation.xy()),
                     ) {
                         gizmos.circle_2d(center_mass, 1.0, bevy::color::palettes::css::RED);
                     }
                 }
                 ScannerMode::Velocity => {
-                    if let Some(avg_velocity) = velocity_of_boids(boids.iter().map(|item| {
+                    if let Some(avg_velocity) =
-                        let entity_id = item.1.unwrap_or_else(|| panic!("Entity has no ID!"));
+                        velocity_of_boids(boids.map(|item| (*item.1).xy() * 1.0))
-                        let (_, vel, _) = boids_query
+                    {
-                            .get(entity_id)
-                            .unwrap_or_else(|_| panic!("Boid has no Velocity component!"));
-                        (*vel).xy() * 1.0
-                    })) {
                         // cursor_pos.translation is already in world space, so I can skip the window -> world transform like in update_cursor()
                         gizmos.line_2d(
                             cursor_pos.translation.xy(),

src/main.rs

@@ -1,16 +1,20 @@
+use avian2d::prelude::*;
 use bevy::prelude::*;
 
 mod birdoids;
 mod debug_plugin;
 
+use bevy_inspector_egui::{bevy_egui::EguiPlugin, quick::ResourceInspectorPlugin};
 use birdoids::BoidsPlugin;
 use debug_plugin::BoidsDebugPlugin;
 
+use crate::birdoids::{FlockingParameters, MiscParams};
+
 fn main() {
     App::new()
         .add_plugins(DefaultPlugins.set(WindowPlugin {
             primary_window: Some(Window {
-                fit_canvas_to_parent: true,
+                canvas: Some("#boids-canvas".to_owned()),
                 prevent_default_event_handling: false,
                 ..default()
             }),
@@ -18,5 +22,9 @@ fn main() {
         }))
         .add_plugins(BoidsDebugPlugin)
         .add_plugins(BoidsPlugin)
+        .add_plugins(EguiPlugin::default())
+        .add_plugins(ResourceInspectorPlugin::<FlockingParameters>::new()) // TODO: monitor only the flocking params resource (once it exists)
+        .add_plugins(ResourceInspectorPlugin::<MiscParams>::new())
+        .add_plugins(PhysicsPlugins::default())
         .run();
 }

www/index.html

@@ -1,11 +1,121 @@
 <!doctype html>
 <html lang="en">
-
+  <head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <style>
+      body {
+        background-color: hsl(100, 10%, 60%);
+        color: hsl(0, 0%, 15%);
+      }
+      h1 {
+        background-color: rgb(72, 97, 72);
+        text-align: center;
+        margin: auto;
+        padding: 0.5em;
+      }
+      canvas {
+        margin-top: 1em;
+        margin-left: auto;
+        margin-right: auto;
+        display: block;
+        outline-color: hsl(100, 100%, 15%);
+        outline-style: outset;
+        border-radius: 8px;
+        background-color: rgb(40%, 40%, 40%);
+      }
+      main {
+        margin-left: auto;
+        margin-right: auto;
+        width: 70%;
+      }
+      table {
+        margin-bottom: 10px;
+        border-collapse: collapse;
+      }
+      th, td {
+        border: 1px solid;
+        padding: 0.1em 0.3em;
+      }
+    </style>
+  </head>
 <body style="margin: 0px;">
+  <h1>
+    Another Boids in Rust
+  </h1>
+  <canvas id="boids-canvas" width="1280" height="720"></canvas>
+  <main>
+    <article>
+      <h2>Description</h2>
+      <p>
+        This is my implementation of the Boids flocking algorithm. It is written in Rust, built on the Bevy game engine, and compiled to WASM to run in the browser.
+      </p>
+      <p>
+        The algorithm consists of just 3 rules:
+        <ul>
+          <li><strong>Separation</strong> - Boids steer apart to avoid colliding.</li>
+          <li><strong>Alignment</strong> - Boids fly in the same direction as their neighbors.</li>
+          <li><strong>Cohesion</strong> - Boids clump together so as not to fly off alone.</li>
+        </ul>
+        From these rules, the flocking behavior emerges naturally.
+      </p>
+      <p>
+        My version of this program has some extra rules governing speed. In short: things below some threshold are sped
+        up, and things above are slowed down. This is to keep an appropriate amount of kinetic energy in the system.
+        Since the boids start in a circle with the same speed, the sum of all velocity vectors is <code>vec2(0, 0)</code>.
+        Technically, floating-point rounding errors would likely mean the system always has some energy, but never
+        enough for an interesting simulation.
+      </p>
+    </article>
+    <article>
+      <h3>Controls</h3>
+      <table>
+        <thead>
+          <tr>
+            <th scope="col">Input</th>
+            <th scope="col">Effect</th>
+          </tr>
+        </thead>
+        <tr>
+          <td>Mouse</td>
+          <td>The scanner circle is attached to the mouse cursor. Move it to scan boids within the radius.</td>
+        </tr>
+        <tr>
+          <td>Left mouse button</td>
+          <td>Put scanner into center-of-mass mode</td>
+        </tr>
+        <tr>
+          <td>Right mouse button</td>
+          <td>Put scanner into average velocity mode. (There's a window focus bug. This button doesn't work quite right!)</td>
+        </tr>
+      </table>
+    </article>
+    <article>
+      <h3>Misc</h3>
+      <table>
+        <tr>
+          <td>Source code</td>
+          <td><a href=https://github.com/DerVerrater/another-boids-in-rust>https://github.com/DerVerrater/another-boids-in-rust</a></td>
+        </tr>
+        <tr>
+          <td>License</td>
+          <td><a href="https://www.gnu.org/licenses/agpl-3.0.txt">AGPL-3.0-only</a></td>
+        </tr>
+        <tr>
+          <td>Program Version</td>
+          <td><code>#CRATE_VERSION_PLACEHOLDER#</code></td>
+        </tr>
+      </table>
+    </article>
+  </main>
   <script type="module">
     import init from './boids.js'
 
-    init().catch((error) => {
+    let compressed = await fetch("./boids_bg.wasm.gz")
+    let wasm_stream = compressed.body.pipeThrough(new DecompressionStream("gzip"))
+    let blob = await new Response(wasm_stream).blob();
+
+    init(await blob.arrayBuffer()).catch((error) => {
       if (!error.message.startsWith("Using exceptions for control flow, don't mind me. This isn't actually an error!")) {
         throw error;
       }