.gitea/workflows/build.yaml

@@ -1,25 +0,0 @@
-name: Build
-on: [push]
-
-jobs:
-  Build:
-    env:
-      RUNNER_TOOL_CACHE: /toolcache
-    container: rust:alpine
-    steps:
-      - name: Install node
-        run: apk add nodejs gcc libc-dev pkgconf libx11-dev alsa-lib-dev eudev-dev tar
-      - name: Check out repository code
-        uses: actions/checkout@v4
-      - name: Restore cache
-        uses: actions/cache@v4
-        with:
-          path: |
-            ~/.cargo/bin/
-            ~/.cargo/registry/index/
-            ~/.cargo/registry/cache/
-            ~/.cargo/git/db/
-            target/
-          key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
-      - name: Build
-        run: cargo build --release

.gitignore

@@ -1,3 +1 @@
 /target
-Cargo.lock
-.cargo

README.md

@@ -1,6 +1,7 @@
 # bevy_basic_interaction
 
 ![License](https://img.shields.io/badge/license-0BSD%2FMIT%2FApache-blue.svg)
+![Tag](https://img.shields.io/github/v/tag/exvacuum/bevy_basic_interaction)
 
 This crate provides an `InteractionPlugin` which enables a basic interaction system.
 
@@ -19,7 +20,7 @@ If enough people (like literally 1 person) want this on crates.io I'll consider
 
 ```toml
 [dependencies.bevy_basic_interaction]
-git = "https://git.soaos.dev/soaos/bevy_basic_interaction"
+git = "https://git.exvacuum.dev/bevy_basic_interaction"
 ```
 
 ## Usage

src/components.rs

@@ -1,7 +1,5 @@
 //! Components used for interactions
 
-use std::sync::Arc;
-
 use bevy::{prelude::*, utils::HashSet};
 
 /// Component which enables an entity to request interactions.
@@ -20,14 +18,14 @@ pub struct Interactor {
 ///
 /// An entity with an `Interactable` component might get passed to an `InteractionEvent` when an
 /// `Interactor` requests an interaction, if the interactable is in range.
-#[derive(Component, Clone)]
+#[derive(Component, Clone, Debug)]
 pub struct Interactable {
     /// An optional name for this interactable
     pub name: Option<String>,
     /// An optional description of the action
     pub description: Option<String>,
     /// Predicate to check to see if interaction is possible
-    pub predicate: Option<Arc<Box<dyn Fn(Entity, &mut World) -> bool + Send + Sync>>>,
+    pub predicate: Option<fn(Entity, &mut World) -> bool>,
     pub(crate) exclusive: bool,
     pub(crate) max_distance_squared: f32,
     pub(crate) possible: bool,
@@ -41,17 +39,11 @@ impl Interactable {
     /// If exclusive, this interactable will only be interacted with if it's the closest one to the
     /// interactor, and the interaction will *not* be processed for any other in-range
     /// interactables.
-    pub fn new(
+    pub fn new(max_distance: f32, exclusive: bool, name: Option<String>, description: Option<String>, predicate: Option<fn(Entity, &mut World) -> bool>) -> Self {
-        max_distance: f32,
-        exclusive: bool,
-        name: Option<String>,
-        description: Option<String>,
-        predicate: Option<Box<dyn Fn(Entity, &mut World) -> bool + Send + Sync>>,
-    ) -> Self {
         Self {
             name,
             description,
-            predicate: predicate.map(|p| Arc::new(p)),
+            predicate,
             exclusive,
             max_distance_squared: max_distance * max_distance,
             possible: true,
@@ -70,3 +62,4 @@ impl Default for Interactable {
         Self::new(1.0, false, None, None, None)
     }
 }
+

src/lib.rs

@@ -1,5 +1,4 @@
 #![warn(missing_docs)]
-#![allow(clippy::type_complexity)]
 
 //! This library provides basic "interaction" functionality
 //! Entities which can trigger interactions get the `Interactor` component, and entities which can
@@ -29,11 +28,7 @@ impl Plugin for InteractionPlugin {
     fn build(&self, app: &mut App) {
         app.add_systems(
             Update,
-            (
+            (handle_interactor_events, update_interactor_targets, update_interactable_predicates),
-                handle_interactor_events,
-                update_interactor_targets,
-                update_interactable_predicates,
-            ),
         )
         .add_event::<InteractorFiredEvent>()
         .add_event::<InteractionEvent>();
@@ -123,17 +118,14 @@ fn update_interactable_predicates(world: &mut World) {
     let mut interactable_query = world.query::<(Entity, &mut Interactable)>();
     let mut interactables = vec![];
     for (interactable_entity, interactable) in interactable_query.iter(world) {
-        interactables.push((interactable_entity, interactable.clone()));
+        interactables.push((interactable_entity, (*interactable).clone()));
     }
     for (interactable_entity, interactable) in interactables.iter_mut() {
         if let Some(predicate) = &interactable.predicate {
             interactable.possible = predicate(*interactable_entity, world);
         }
     }
-    for ((_, mut interactable), (_, temp)) in interactable_query
+    for ((_, mut interactable), (_, temp)) in interactable_query.iter_mut(world).zip(interactables.into_iter()) {
-        .iter_mut(world)
-        .zip(interactables.into_iter())
-    {
         *interactable = temp;
     }
 }