lua: change lyra-scripting path in lyra-engine crate
This commit is contained in:
parent
eff6b221e0
commit
624cd5362f
|
@ -5,7 +5,7 @@ use lyra_engine::{
|
|||
Action, ActionHandler, ActionKind, ActionMapping, ActionMappingId, ActionSource,
|
||||
InputActionPlugin, KeyCode, LayoutId, MouseAxis, MouseInput,
|
||||
},
|
||||
lua::{LuaScript, LuaScriptingPlugin},
|
||||
script::{lua::{LuaScript, LuaScriptingPlugin}, Script, ScriptList},
|
||||
math::{self, Transform, Vec3},
|
||||
render::light::directional::DirectionalLight,
|
||||
scene::{
|
||||
|
@ -13,7 +13,6 @@ use lyra_engine::{
|
|||
ACTLBL_LOOK_LEFT_RIGHT, ACTLBL_LOOK_ROLL, ACTLBL_LOOK_UP_DOWN,
|
||||
ACTLBL_MOVE_FORWARD_BACKWARD, ACTLBL_MOVE_LEFT_RIGHT, ACTLBL_MOVE_UP_DOWN,
|
||||
},
|
||||
Script, ScriptList,
|
||||
};
|
||||
|
||||
#[async_std::main]
|
||||
|
|
|
@ -43,4 +43,4 @@ fast_poisson = { version = "1.0.0", features = ["single_precision"] }
|
|||
atomic_refcell = "0.1.13"
|
||||
|
||||
[features]
|
||||
tracy = ["dep:tracing-tracy"]
|
||||
tracy = ["dep:tracing-tracy"]
|
|
@ -1,119 +0,0 @@
|
|||
use std::ops::{DerefMut, Deref};
|
||||
|
||||
/// A change tracker. This tracks changes of the data it owns.
|
||||
/// Tracking changes can cause false positives since it actually tracks calls to `deref_mut()`
|
||||
/// If you mutably dereference this, make sure its only when you change the data.
|
||||
pub struct Ct<T> {
|
||||
data: T,
|
||||
changed: bool,
|
||||
}
|
||||
|
||||
impl<T> Ct<T> {
|
||||
pub fn new(data: T) -> Self {
|
||||
Self {
|
||||
data,
|
||||
changed: false,
|
||||
}
|
||||
}
|
||||
|
||||
/// Create a new change tracker with data
|
||||
pub fn new_true(data: T) -> Self {
|
||||
Self {
|
||||
data,
|
||||
changed: true,
|
||||
}
|
||||
}
|
||||
|
||||
/// Returns true if there was a change. Will reset back to false after this is called.
|
||||
pub fn changed(&mut self) -> bool {
|
||||
let before = self.changed;
|
||||
self.reset();
|
||||
before
|
||||
}
|
||||
|
||||
/// Returns true if there was a change, will NOT reset back to false.
|
||||
pub fn peek_changed(&self) -> bool {
|
||||
self.changed
|
||||
}
|
||||
|
||||
/// Resets the changed tracker to be false
|
||||
pub fn reset(&mut self) {
|
||||
self.changed = false;
|
||||
}
|
||||
|
||||
/// Triggers the change tracker to be true
|
||||
pub fn trigger(&mut self) {
|
||||
self.changed = true;
|
||||
}
|
||||
|
||||
/// Silently mutate the inner data, this wont be tracked
|
||||
pub fn silently_mutate(&mut self) -> &mut T {
|
||||
&mut self.data
|
||||
}
|
||||
|
||||
/// Consumes self and returns the data stored inside.
|
||||
pub fn take(self) -> T {
|
||||
self.data
|
||||
}
|
||||
}
|
||||
|
||||
impl<T> Deref for Ct<T> {
|
||||
type Target = T;
|
||||
|
||||
fn deref(&self) -> &Self::Target {
|
||||
&self.data
|
||||
}
|
||||
}
|
||||
|
||||
impl<T> DerefMut for Ct<T> {
|
||||
fn deref_mut(&mut self) -> &mut Self::Target {
|
||||
self.changed = true;
|
||||
&mut self.data
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::Ct;
|
||||
|
||||
#[test]
|
||||
fn new() {
|
||||
let mut c = Ct::new(100);
|
||||
assert!(!c.changed());
|
||||
|
||||
let mut c = Ct::new_true(100);
|
||||
assert!(c.changed());
|
||||
assert!(!c.changed()); // it should've reset itself
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn change_tracking() {
|
||||
let mut c = Ct::new(100);
|
||||
assert!(!c.changed());
|
||||
|
||||
*c = 10;
|
||||
assert!(c.changed());
|
||||
assert!(!c.changed()); // should now be not changed
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn silent_mutate() {
|
||||
let mut c = Ct::new(100);
|
||||
let a = c.silently_mutate();
|
||||
*a = 10;
|
||||
assert!(!c.changed());
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn reset_trigger() {
|
||||
let mut c = Ct::new(100);
|
||||
*c = 10;
|
||||
c.reset();
|
||||
assert!(!c.changed()); // should not be changed because of reset
|
||||
|
||||
let mut c = Ct::new(100);
|
||||
c.trigger();
|
||||
assert!(c.changed()); // should changed because of trigger
|
||||
assert!(!c.changed()); // should've reset itself
|
||||
}
|
||||
}
|
|
@ -11,7 +11,6 @@ pub mod input;
|
|||
pub mod winit;
|
||||
pub mod as_any;
|
||||
pub mod plugin;
|
||||
pub mod change_tracker;
|
||||
|
||||
mod event;
|
||||
pub use event::*;
|
||||
|
@ -29,7 +28,4 @@ pub use lyra_ecs as ecs;
|
|||
pub use lyra_math as math;
|
||||
pub use lyra_reflect as reflect;
|
||||
|
||||
#[cfg(feature = "scripting")]
|
||||
pub use lyra_scripting as script;
|
||||
|
||||
pub use plugin::DefaultPlugins;
|
|
@ -1,4 +1,4 @@
|
|||
pub use lyra_game::*;
|
||||
|
||||
#[cfg(feature = "scripting")]
|
||||
pub use lyra_scripting::*;
|
||||
pub use lyra_scripting as script;
|
Loading…
Reference in New Issue