forked from StudioInfinity/dyna3
Move the components into their own module
This makes the module tree more reflective of module use patterns. In
particular, it restores the condition that every top-level module is
used in top-level code, which was broken by the addition of the
`test_assembly_chooser` module in commit 91e4e1f
.
This commit is contained in:
parent
91e4e1f414
commit
5233d8eb93
12 changed files with 15 additions and 13 deletions
|
@ -13,7 +13,7 @@ use sycamore::prelude::*;
|
||||||
use web_sys::{console, wasm_bindgen::JsValue}; /* DEBUG */
|
use web_sys::{console, wasm_bindgen::JsValue}; /* DEBUG */
|
||||||
|
|
||||||
use crate::{
|
use crate::{
|
||||||
display::DisplayItem,
|
components::{display::DisplayItem, outline::OutlineItem},
|
||||||
engine::{
|
engine::{
|
||||||
Q,
|
Q,
|
||||||
change_half_curvature,
|
change_half_curvature,
|
||||||
|
@ -29,7 +29,6 @@ use crate::{
|
||||||
DescentHistory,
|
DescentHistory,
|
||||||
Realization
|
Realization
|
||||||
},
|
},
|
||||||
outline::OutlineItem,
|
|
||||||
specified::SpecifiedValue
|
specified::SpecifiedValue
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
5
app-proto/src/components.rs
Normal file
5
app-proto/src/components.rs
Normal file
|
@ -0,0 +1,5 @@
|
||||||
|
pub mod add_remove;
|
||||||
|
pub mod diagnostics;
|
||||||
|
pub mod display;
|
||||||
|
pub mod outline;
|
||||||
|
pub mod test_assembly_chooser;
|
|
@ -1,10 +1,10 @@
|
||||||
use std::rc::Rc;
|
use std::rc::Rc;
|
||||||
use sycamore::prelude::*;
|
use sycamore::prelude::*;
|
||||||
|
|
||||||
|
use super::test_assembly_chooser::TestAssemblyChooser;
|
||||||
use crate::{
|
use crate::{
|
||||||
AppState,
|
AppState,
|
||||||
assembly::{InversiveDistanceRegulator, Point, Sphere},
|
assembly::{InversiveDistanceRegulator, Point, Sphere}
|
||||||
test_assembly_chooser::TestAssemblyChooser
|
|
||||||
};
|
};
|
||||||
|
|
||||||
#[component]
|
#[component]
|
|
@ -1,11 +1,7 @@
|
||||||
mod add_remove;
|
|
||||||
mod assembly;
|
mod assembly;
|
||||||
mod diagnostics;
|
mod components;
|
||||||
mod display;
|
|
||||||
mod engine;
|
mod engine;
|
||||||
mod outline;
|
|
||||||
mod specified;
|
mod specified;
|
||||||
mod test_assembly_chooser;
|
|
||||||
|
|
||||||
#[cfg(test)]
|
#[cfg(test)]
|
||||||
mod tests;
|
mod tests;
|
||||||
|
@ -13,11 +9,13 @@ mod tests;
|
||||||
use std::{collections::BTreeSet, rc::Rc};
|
use std::{collections::BTreeSet, rc::Rc};
|
||||||
use sycamore::prelude::*;
|
use sycamore::prelude::*;
|
||||||
|
|
||||||
use add_remove::AddRemove;
|
|
||||||
use assembly::{Assembly, Element};
|
use assembly::{Assembly, Element};
|
||||||
use diagnostics::Diagnostics;
|
use components::{
|
||||||
use display::Display;
|
add_remove::AddRemove,
|
||||||
use outline::Outline;
|
diagnostics::Diagnostics,
|
||||||
|
display::Display,
|
||||||
|
outline::Outline
|
||||||
|
};
|
||||||
|
|
||||||
#[derive(Clone)]
|
#[derive(Clone)]
|
||||||
struct AppState {
|
struct AppState {
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue