fix for new version of protostar

This commit is contained in:
Bennyboiii
2023-03-10 13:37:36 -05:00
parent 79b3568f35
commit d661b5ecb3
3 changed files with 105 additions and 154 deletions

View File

@@ -34,7 +34,7 @@ const HEX_DIRECTION_VECTORS: [Hex; 6] = [
Hex { q: 1, r: -1, s: 0 },
Hex { q: 0, r: -1, s: 1 },
Hex { q: -1, r: 0, s: 1 },
Hex { q: -1, r: 1, s: 0 },
Hex{ q: -1, r: 1, s: 0 },
Hex { q: 0, r: 1, s: -1 },
];
@@ -162,7 +162,7 @@ impl App {
) -> Option<Self> {
let position = position.into();
let protostar =
ProtoStar::create_from_desktop_file(parent, position, desktop_file.clone()).ok()?;
ProtoStar::create_from_desktop_file(parent, desktop_file.clone()).ok()?;
Some(App {
_desktop_file: desktop_file,
protostar,

View File

@@ -34,8 +34,8 @@ struct Star {
}
impl Star {
fn new(parent: &Spatial, name: Option<&str>,path: &str) -> Option<Self> {
let cli = ProtoStar::new_raw(parent, Vec3::default(), name, None, path.to_string()).unwrap();
fn new(parent: &Spatial, _name: Option<&str>,path: &str) -> Option<Self> {
let cli = ProtoStar::new_raw(parent, None, path.to_string()).unwrap();
Some(Star {
cli,
})
@@ -60,9 +60,9 @@ struct Sirius {
impl Sirius {
fn new(client: &Client) -> Result<Self, NodeError> {
let client_list: Vec<(Option<&str>, &str)> = Vec::from([
(Some("Magnetar"), "$HOME/repos/stardust/telescope/repos/magnetar/target/release/magnetar"),
(Some("Atmosphere"), "$HOME/repos/stardust/telescope/repos/atmosphere/target/release/atmosphere"),
(Some("Manifold"), "$HOME/repos/stardust/telescope/repos/manifold/target/release/manifold"),
(Some("Magnetar"), "/home/bc/repos/stardust/telescope/repos/magnetar/target/release/magnetar"),
(Some("Atmosphere"), "/home/bc/repos/stardust/telescope/repos/atmosphere/target/release/atmosphere"),
(Some("Manifold"), "/home/bc/repos/stardust/telescope/repos/manifold/target/release/manifold"),
]);
let root = Spatial::create(client.get_root(), Transform::default(), false).unwrap();