Commit c1ad3f69 authored by Dan Sheppard's avatar Dan Sheppard
Browse files

Tidying.

parent ae1e9c27
......@@ -66,7 +66,7 @@ pub fn initial_actions() -> Vec<Action> {
out.push(Action::SetState(name.to_string(),StateValue::On()));
}
out.extend(vec! {
Action::SetStick("13".to_string()),
Action::SetStick("16".to_string()),
Action::Pos(Dot(0_f64,0_f64),None),
Action::ZoomTo(-9.)
});
......
......@@ -29,10 +29,6 @@ pub const DEBUG_SOURCES : [&str;8] = [
"internal:debug:zzz-framework"
];
#[cfg(deploy)]
pub const DEMO_SOURCES : [&str;0] = [];
#[cfg(not(deploy))]
pub const DEMO_SOURCES : [&str;8] = [
"gene-pc-fwd",
"gene-other-fwd",
......@@ -44,7 +40,6 @@ pub const DEMO_SOURCES : [&str;8] = [
"zzz-framework"
];
#[cfg(deploy)]
pub fn add_debug_sources(s: &mut CombinedSource, name: &str) {}
......
......@@ -223,7 +223,6 @@ impl PinRectTypeSpec {
3 => PTGeom::PageUnderAll,
_ => PTGeom::Fix,
};
console!("pt {:?}",pt);
Some(ShapeSpec::PinRect(RectSpec {
pt,
offset: RectPosition::Fix(pos),
......
......@@ -183,12 +183,12 @@ impl TextureTypeSpec {
impl TypeToShape for TextureTypeSpec {
fn new_short_shape(&self, td: &ShapeShortInstanceData) -> Option<ShapeSpec> {
Some(match (self.sea_x.is_some(),self.sea_y.is_some()) {
match (self.sea_x.is_some(),self.sea_y.is_some()) {
(false,false) => self.new_pin(td),
(false,true) => Some(self.new_tape(td)),
(true,false) => Some(self.new_page(td)),
(true,true) => Some(self.new_fix(td))
}.unwrap())
}
}
fn sid_type(&self) -> ShapeInstanceDataType { ShapeInstanceDataType::Short }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment