wip: make compile

berkus · Feb 4, 2024 · d11dcb8 · d11dcb8
1 parent 081f99b
commit d11dcb8
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/src/main.rs b/src/main.rs
@@ -129,18 +129,17 @@ fn main() {
 
     let mut app = App::new();
 
-    app.register_asset_loader(CarAssetLoader)
-        .init_asset::<CarAsset>();
-
     app.add_plugins(DefaultPlugins.set(ImagePlugin::default_nearest()))
         .add_plugins(WorldInspectorPlugin::new())
         .add_plugins(LookTransformPlugin)
         .add_plugins(UnrealCameraPlugin::default())
-        .add_systems(Startup, setup_cars)
-        .add_systems(Startup, setup)
+        .add_systems(Startup, (setup_cars, setup))
         .add_systems(Update, rotate);
     // .add_system(animate_camera)
 
+    app.register_asset_loader(CarAssetLoader)
+        .init_asset::<CarAsset>();
+
     // app.configure_sets(Update, (
     //     MainMenuSet
     //         .run_if(in_state(MainMenu)),

diff --git a/src/support/render_manager.rs b/src/support/render_manager.rs
@@ -7,7 +7,10 @@
 // (See file LICENSE_1_0.txt or a copy at http://www.boost.org/LICENSE_1_0.txt)
 //
 use {
-    crate::support::{actor::ActorNode, car::Car, Vertex},
+    crate::{
+        support::{actor::ActorNode, car::Car, Vertex},
+        CameraState,
+    },
     cgmath::{prelude::*, Matrix4, Vector3},
     glium::{
         self,

diff --git a/src/support/visitor.rs b/src/support/visitor.rs
@@ -11,7 +11,7 @@ use {
 // one possible implementation of walking a directory only visiting files
 #[throws]
 pub fn visit_files<P: AsRef<Path>>(dir: P, cb: &mut dyn for<'r> FnMut(&'r DirEntry) -> Result<()>) {
-    if dir.is_dir() {
+    if dir.as_ref().is_dir() {
         for entry in fs::read_dir(dir)? {
             let entry = entry?;
             let path = entry.path();