GameRuntime & Game cleanup

Fixes #390

Orbital/src/game/settings.rs → Example/src/app/cache_settings.rs

@@ -1,14 +1,5 @@
 use std::time::Duration;
 
-use crate::app::AppSettings;
-
-#[derive(Default, Debug, Clone)]
-pub struct GameSettings {// TODO: Cleanup
-    pub app_settings: AppSettings,
-    pub pipeline_cache: CacheSettings,
-    pub material_cache: CacheSettings,
-}
-
 #[derive(Debug, Clone)]
 pub struct CacheSettings {
     pub cleanup_interval: Duration,

Example/src/game/elements/camera.rs → Example/src/app/elements/camera.rs

@@ -4,7 +4,7 @@ use orbital::{
     app::AppChange,
     async_trait::{async_trait},
     cgmath::{Point3, Vector3},
-    game::{CameraChange, Element, ElementRegistration, Message, Mode, WorldChange},
+    world::{CameraChange, Element, ElementRegistration, Message, Mode, WorldChange},
     gilrs::Button,
     input::{InputAxis, InputButton, InputState},
     resources::descriptors::CameraDescriptor,

Example/src/game/elements/damaged_helmet.rs → Example/src/app/elements/damaged_helmet.rs

@@ -1,7 +1,7 @@
 use orbital::{
     async_trait::async_trait,
     cgmath::Vector3,
-    game::{Element, ElementRegistration, Message, WorldChange},
+    world::{Element, ElementRegistration, Message, WorldChange},
     input::InputState,
     loader::{GLTFLoader, GLTFWorkerMode},
     transform::Transform,

Example/src/game/elements/debug_world_environment.rs → Example/src/app/elements/debug_world_environment.rs

@@ -2,7 +2,7 @@ use std::time::Instant;
 
 use orbital::{
     async_trait::async_trait,
-    game::{Element, ElementRegistration, Message, WorldChange},
+    world::{Element, ElementRegistration, Message, WorldChange},
     input::InputState,
     log::debug,
     resources::descriptors::SkyboxType,

Example/src/game/elements/lights.rs → Example/src/app/elements/lights.rs

@@ -1,7 +1,7 @@
 use orbital::{
     cgmath::Vector3,
-    game::{Element, ElementRegistration, WorldChange},
     resources::{descriptors::LightDescriptor, realizations::PointLight},
+    world::{Element, ElementRegistration, WorldChange},
 };
 
 #[derive(Debug)]

Example/src/app/elements/mod.rs

@@ -0,0 +1,17 @@
+mod camera;
+pub use camera::*;
+
+mod damaged_helmet;
+pub use damaged_helmet::*;
+
+mod debug_world_environment;
+pub use debug_world_environment::*;
+
+mod lights;
+pub use lights::*;
+
+mod pbr_spheres;
+pub use pbr_spheres::*;
+
+mod ping_pong;
+pub use ping_pong::*;

Example/src/game/elements/pbr_spheres.rs → Example/src/app/elements/pbr_spheres.rs

@@ -1,5 +1,5 @@
 use orbital::{
-    game::{Element, ElementRegistration, WorldChange},
+    world::{Element, ElementRegistration, WorldChange},
     loader::{GLTFLoader, GLTFWorkerMode},
 };
 

Example/src/game/elements/ping_pong.rs → Example/src/app/elements/ping_pong.rs

@@ -1,6 +1,6 @@
 use orbital::{
     async_trait::async_trait,
-    game::{Element, ElementRegistration, Message, WorldChange},
+    world::{Element, ElementRegistration, Message, WorldChange},
     hashbrown::HashMap,
     input::InputState,
     variant::Variant,

Example/src/app/mod.rs

@@ -3,19 +3,20 @@ use std::time::Instant;
 use orbital::{
     app::{App, AppChange},
     cgmath::Vector2,
-    game::{CacheSettings, World, WorldChange},
     input::InputState,
     log::{debug, info, warn},
     renderer::Renderer,
     resources::realizations::{Material, Pipeline},
     timer::Timer,
     wgpu::{Device, Queue, SurfaceConfiguration, TextureView},
+    world::{World, WorldChange},
 };
 
-use crate::game::elements::{
-    camera::Camera, damaged_helmet::DamagedHelmet, debug_world_environment::DebugWorldEnvironment,
-    lights::Lights, pbr_spheres::PBRSpheres, ping_pong::PingPongElement,
-};
+mod cache_settings;
+pub use cache_settings::*;
+
+mod elements;
+use elements::*;
 
 pub struct MyApp<RendererImpl: Renderer + Send> {
     renderer: Option<RendererImpl>,

Example/src/entrypoint.rs

@@ -1,8 +1,11 @@
 use orbital::{
-    app::{AppRuntime, AppSettings}, game::CacheSettings, logging, renderer::StandardRenderer, winit::{error::EventLoopError, event_loop::EventLoop}
+    app::{AppRuntime, AppSettings},
+    logging,
+    renderer::StandardRenderer,
+    winit::{error::EventLoopError, event_loop::EventLoop},
 };
 
-use crate::app::MyApp;
+use crate::app::{CacheSettings, MyApp};
 
 pub fn entrypoint(event_loop_result: Result<EventLoop<()>, EventLoopError>) {
     logging::init();

Example/src/lib.rs

@@ -1,5 +1,4 @@
 pub mod app;
-pub mod game;
 
 pub mod entrypoint;
 

Orbital/Cargo.toml

@@ -7,20 +7,9 @@ edition = "2021"
 crate-type = ["lib", "cdylib"]
 
 [features]
-default = [
-    "gltf",
-    "game_runtime",
-    "gamepad_input",
-    "gamepad_input_poll",
-    "auto_request_redraw",
-]
+default = ["gltf", "gamepad_input", "gamepad_input_poll", "auto_request_redraw"]
 # Enables glTF support.
 gltf = ["dep:easy-gltf", "easy-gltf/names"]
-# Enables the game runtime and integrates it into the app runtime. 
-# This will make many things easier to implement as many things will be handled by the game runtime automatically, while the game-dev can focus on the game.
-# However, this can be too restrictive for a few games.
-# Disabling this feature will give you full control over everything, or, just to implement a simple app, rather than a full game.
-game_runtime = []
 # Enables gamepad inputs from being polled and processed.
 # Note: Winit _does_ have _some_ gamepad input support, but it's not very good at the moment, gilrs takes a much better approach (for now?).
 gamepad_input = ["dep:gilrs"]

Orbital/src/app/mod.rs

@@ -269,9 +269,9 @@ use crate::input::InputState;
 /// [EventLoop]: crate::winit::event_loop::EventLoop
 /// [EventLoops]: crate::winit::event_loop::EventLoop
 /// [Apps]: crate::app::App
-/// [Game]: crate::game::Game
-/// [Games]: crate::game::Game
-/// [GameRuntime]: crate::game::GameRuntime
+/// [Game]: crate::world::Game
+/// [Games]: crate::world::Game
+/// [GameRuntime]: crate::world::GameRuntime
 /// [winit]: crate::winit
 pub trait App {
     /// Gets called upon the [App] getting resumed _OR_ when the [App] got initiated first time and we know have access to the GPU via [Device] & [Queue].