|
@@ -19,7 +19,7 @@
|
|
|
use crate::{
|
|
use crate::{
|
|
|
error::{Error, Result},
|
|
error::{Error, Result},
|
|
|
expr::{SExprMachine, SExprVal},
|
|
expr::{SExprMachine, SExprVal},
|
|
|
- gfx::{Dimension, Rectangle},
|
|
|
|
|
|
|
+ gfx::{Dimension, Point, Rectangle},
|
|
|
scene::SceneNode as SceneNode3,
|
|
scene::SceneNode as SceneNode3,
|
|
|
ui::VectorShape,
|
|
ui::VectorShape,
|
|
|
};
|
|
};
|
|
@@ -448,7 +448,7 @@ impl PropertyEnum {
|
|
|
self.prop.clone()
|
|
self.prop.clone()
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
-/*
|
|
|
|
|
|
|
+
|
|
|
#[derive(Clone)]
|
|
#[derive(Clone)]
|
|
|
pub struct PropertyPoint {
|
|
pub struct PropertyPoint {
|
|
|
prop: PropertyPtr,
|
|
prop: PropertyPtr,
|
|
@@ -481,6 +481,11 @@ impl PropertyPoint {
|
|
|
[self.prop.get_f32(0).unwrap(), self.prop.get_f32(1).unwrap()].into()
|
|
[self.prop.get_f32(0).unwrap(), self.prop.get_f32(1).unwrap()].into()
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
+ pub fn eval(&self, atom: &mut PropertyAtomicGuard) -> Result<()> {
|
|
|
|
|
+ eval_f32_multi(&self.prop(), atom, self.role, &[0, 1], vec![])
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ #[allow(dead_code)]
|
|
|
pub fn set(&self, atom: &mut PropertyAtomicGuard, pos: Point) {
|
|
pub fn set(&self, atom: &mut PropertyAtomicGuard, pos: Point) {
|
|
|
self.prop().set_f32(atom, self.role, 0, pos.x).unwrap();
|
|
self.prop().set_f32(atom, self.role, 0, pos.x).unwrap();
|
|
|
self.prop().set_f32(atom, self.role, 1, pos.y).unwrap();
|
|
self.prop().set_f32(atom, self.role, 1, pos.y).unwrap();
|
|
@@ -491,7 +496,6 @@ impl PropertyPoint {
|
|
|
self.prop.clone()
|
|
self.prop.clone()
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
-*/
|
|
|
|
|
|
|
|
|
|
#[derive(Clone)]
|
|
#[derive(Clone)]
|
|
|
pub struct PropertyRect {
|
|
pub struct PropertyRect {
|