diff --git a/Cargo.lock b/Cargo.lock index 904c668..251868a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -5889,7 +5889,7 @@ dependencies = [ [[package]] name = "space_bevy_xpbd_plugin" version = "0.4.0" -source = "git+https://github.com/rewin123/space_editor?rev=0e27774697ffc8d9006736f8f0a5b939d55de53a#0e27774697ffc8d9006736f8f0a5b939d55de53a" +source = "git+https://github.com/rewin123/space_editor?rev=e191880bdfc7498a1c93d6efd98393c462990dea#e191880bdfc7498a1c93d6efd98393c462990dea" dependencies = [ "bevy", "bevy-inspector-egui", @@ -5900,7 +5900,7 @@ dependencies = [ [[package]] name = "space_editor" version = "0.4.0" -source = "git+https://github.com/rewin123/space_editor?rev=0e27774697ffc8d9006736f8f0a5b939d55de53a#0e27774697ffc8d9006736f8f0a5b939d55de53a" +source = "git+https://github.com/rewin123/space_editor?rev=e191880bdfc7498a1c93d6efd98393c462990dea#e191880bdfc7498a1c93d6efd98393c462990dea" dependencies = [ "bevy", "space_bevy_xpbd_plugin", @@ -5911,7 +5911,7 @@ dependencies = [ [[package]] name = "space_editor_core" version = "0.4.0" -source = "git+https://github.com/rewin123/space_editor?rev=0e27774697ffc8d9006736f8f0a5b939d55de53a#0e27774697ffc8d9006736f8f0a5b939d55de53a" +source = "git+https://github.com/rewin123/space_editor?rev=e191880bdfc7498a1c93d6efd98393c462990dea#e191880bdfc7498a1c93d6efd98393c462990dea" dependencies = [ "bevy", "bevy_egui", @@ -5926,7 +5926,7 @@ dependencies = [ [[package]] name = "space_editor_ui" version = "0.4.0" -source = "git+https://github.com/rewin123/space_editor?rev=0e27774697ffc8d9006736f8f0a5b939d55de53a#0e27774697ffc8d9006736f8f0a5b939d55de53a" +source = "git+https://github.com/rewin123/space_editor?rev=e191880bdfc7498a1c93d6efd98393c462990dea#e191880bdfc7498a1c93d6efd98393c462990dea" dependencies = [ "anyhow", "bevy", @@ -5954,7 +5954,7 @@ dependencies = [ [[package]] name = "space_persistence" version = "0.4.0" -source = "git+https://github.com/rewin123/space_editor?rev=0e27774697ffc8d9006736f8f0a5b939d55de53a#0e27774697ffc8d9006736f8f0a5b939d55de53a" +source = "git+https://github.com/rewin123/space_editor?rev=e191880bdfc7498a1c93d6efd98393c462990dea#e191880bdfc7498a1c93d6efd98393c462990dea" dependencies = [ "bevy", "ron", @@ -5964,7 +5964,7 @@ dependencies = [ [[package]] name = "space_prefab" version = "0.4.0" -source = "git+https://github.com/rewin123/space_editor?rev=0e27774697ffc8d9006736f8f0a5b939d55de53a#0e27774697ffc8d9006736f8f0a5b939d55de53a" +source = "git+https://github.com/rewin123/space_editor?rev=e191880bdfc7498a1c93d6efd98393c462990dea#e191880bdfc7498a1c93d6efd98393c462990dea" dependencies = [ "bevy", "bevy-inspector-egui", @@ -5978,7 +5978,7 @@ dependencies = [ [[package]] name = "space_shared" version = "0.4.0" -source = "git+https://github.com/rewin123/space_editor?rev=0e27774697ffc8d9006736f8f0a5b939d55de53a#0e27774697ffc8d9006736f8f0a5b939d55de53a" +source = "git+https://github.com/rewin123/space_editor?rev=e191880bdfc7498a1c93d6efd98393c462990dea#e191880bdfc7498a1c93d6efd98393c462990dea" dependencies = [ "anyhow", "bevy", @@ -5991,7 +5991,7 @@ dependencies = [ [[package]] name = "space_undo" version = "0.4.0" -source = "git+https://github.com/rewin123/space_editor?rev=0e27774697ffc8d9006736f8f0a5b939d55de53a#0e27774697ffc8d9006736f8f0a5b939d55de53a" +source = "git+https://github.com/rewin123/space_editor?rev=e191880bdfc7498a1c93d6efd98393c462990dea#e191880bdfc7498a1c93d6efd98393c462990dea" dependencies = [ "bevy", "pretty-type-name", diff --git a/editor.ron b/editor.ron index 326bbf0..ad6d42b 100644 --- a/editor.ron +++ b/editor.ron @@ -1,8 +1,8 @@ { - "space_persistence::PersistenceSettings": "{\"space_persistence::PersistenceSettings\":(load_on_startup:true,save_on_close:true)}", - "space_undo::ChangeChainSettings": "{\"space_undo::ChangeChainSettings\":(max_change_chain_size:200)}", - "space_editor_core::hotkeys::HotkeySet": "{\"space_editor_core::hotkeys::HotkeySet\":(bindings:{Rotate:[R],Translate:[G],Scale:[S],Multiple:[ShiftLeft],Clone:[AltLeft],Delete:[X]},name:\"GizmoHotkey\")}", - "space_editor_ui::sizing::Sizing": "{\"space_editor_ui::sizing::Sizing\":(icon:Regular,gizmos:Gizmos,text:14.0)}", "space_editor_ui::settings::GameModeSettings": "{\"space_editor_ui::settings::GameModeSettings\":(mode:Game3D)}", + "space_persistence::PersistenceSettings": "{\"space_persistence::PersistenceSettings\":(load_on_startup:true,save_on_close:true)}", + "space_editor_core::hotkeys::HotkeySet": "{\"space_editor_core::hotkeys::HotkeySet\":(bindings:{Clone:[AltLeft],Rotate:[KeyR],Multiple:[ShiftLeft],Delete:[KeyX],Translate:[KeyG],Scale:[KeyS]},name:\"GizmoHotkey\")}", "space_editor_ui::settings::NewWindowSettings": "{\"space_editor_ui::settings::NewWindowSettings\":(new_tab:SameNode)}", + "space_undo::ChangeChainSettings": "{\"space_undo::ChangeChainSettings\":(max_change_chain_size:200)}", + "space_editor_ui::sizing::Sizing": "{\"space_editor_ui::sizing::Sizing\":(icon:Regular,gizmos:Gizmos,text:14.0)}", } \ No newline at end of file diff --git a/studio/Cargo.toml b/studio/Cargo.toml index 6478b59..d34ae4f 100644 --- a/studio/Cargo.toml +++ b/studio/Cargo.toml @@ -46,7 +46,7 @@ futures-lite = "2.2.0" futures = "0.3.30" image = "0.24.8" bytemuck = "1.14.1" -space_editor = {git = "https://github.com/rewin123/space_editor", rev = "0e27774697ffc8d9006736f8f0a5b939d55de53a"} +space_editor = {git = "https://github.com/rewin123/space_editor", rev = "e191880bdfc7498a1c93d6efd98393c462990dea"} anyhow.workspace = true serde_repr = "0.1.18" diff --git a/studio/assets/skyboxes/test_scene.hdr.meta b/studio/assets/skyboxes/test_scene.hdr.meta deleted file mode 100644 index 24764c1..0000000 --- a/studio/assets/skyboxes/test_scene.hdr.meta +++ /dev/null @@ -1,7 +0,0 @@ -( - meta_format_version: "1.0", - asset: Load( - loader: "bevy_render::texture::hdr_texture_loader::HdrTextureLoader", - settings: (), - ), -) \ No newline at end of file diff --git a/studio/src/debug.rs b/studio/src/debug.rs index 0e7058b..86a8b19 100644 --- a/studio/src/debug.rs +++ b/studio/src/debug.rs @@ -70,7 +70,7 @@ impl Plugin for DebugPlugin { .disable::() // .disable::() // .disable::() - // .disable::(), + .disable::(), ); app.add_systems(Update, sync_editor_camera); diff --git a/studio/src/lib.rs b/studio/src/lib.rs index ddc51fb..6125879 100644 --- a/studio/src/lib.rs +++ b/studio/src/lib.rs @@ -86,7 +86,7 @@ impl PluginGroup for CommonPlugins { .add(InspectorPlugin) .add(InterpolationPlugin) .add(ScenePlugin) - .add(SkyboxPlugin) + // .add(SkyboxPlugin) .add(StudioInputPlugin) .add(UiLayerPlugin) .add(WorldGridPlugin) diff --git a/studio/src/scene.rs b/studio/src/scene.rs index 8fcaad5..7d3a3d1 100644 --- a/studio/src/scene.rs +++ b/studio/src/scene.rs @@ -175,7 +175,9 @@ fn check_loading( if let Some((load_state, dep_load_state, rec_load_state)) = asset_server.get_load_states(h.id()) { - let is_loaded = dep_load_state == DependencyLoadState::Loaded; + let is_loaded = dep_load_state == DependencyLoadState::Loaded + || rec_load_state == RecursiveDependencyLoadState::Loaded + || load_state == LoadState::Loaded; let is_failed = dep_load_state == DependencyLoadState::Failed || rec_load_state == RecursiveDependencyLoadState::Failed diff --git a/studio/src/skybox.rs b/studio/src/skybox.rs index 12b8644..9e386ad 100644 --- a/studio/src/skybox.rs +++ b/studio/src/skybox.rs @@ -47,12 +47,20 @@ fn load_skybox(mut cmd: Commands, assets: Res, id: Res) { brightness: 1.0, }) } else { - let paths = SkyboxPaths::new(id); - cmd.insert_resource(SkyboxAssets { - cubemap: assets.load(paths.cubemap), - env_diffuse: assets.load(paths.env_diffuse), - env_specular: assets.load(paths.env_specular), + + let color = Color::hex("AAAAAA").unwrap(); + cmd.insert_resource(ClearColor(color)); + cmd.insert_resource(AmbientLight { + color, + brightness: 1.0, }); + + // let paths = SkyboxPaths::new(id); + // cmd.insert_resource(SkyboxAssets { + // cubemap: assets.load(paths.cubemap), + // env_diffuse: assets.load(paths.env_diffuse), + // env_specular: assets.load(paths.env_specular), + // }); } } @@ -86,31 +94,31 @@ fn spawn_skybox( skybox_assets: Res, q_camera: Query>, ) { - // Configure the skybox texture as a cubemap - let image = images.get_mut(&skybox_assets.cubemap).unwrap(); - if image.texture_descriptor.array_layer_count() == 1 { - image.reinterpret_stacked_2d_as_array(6); - image.texture_view_descriptor = Some(TextureViewDescriptor { - dimension: Some(TextureViewDimension::Cube), - ..default() - }); - } + // // Configure the skybox texture as a cubemap + // let image = images.get_mut(&skybox_assets.cubemap).unwrap(); + // if image.texture_descriptor.array_layer_count() == 1 { + // image.reinterpret_stacked_2d_as_array(6); + // image.texture_view_descriptor = Some(TextureViewDescriptor { + // dimension: Some(TextureViewDimension::Cube), + // ..default() + // }); + // } - // Add components to the scene camera - cmd.entity(q_camera.single()).insert(( - Skybox { - image: skybox_assets.cubemap.clone(), - brightness: 1.0, - }, - EnvironmentMapLight { - diffuse_map: skybox_assets.env_diffuse.clone(), - specular_map: skybox_assets.env_specular.clone(), - intensity: 1.0, - }, - )); + // // Add components to the scene camera + // cmd.entity(q_camera.single()).insert(( + // Skybox { + // image: skybox_assets.cubemap.clone(), + // brightness: 10.0, + // }, + // EnvironmentMapLight { + // diffuse_map: skybox_assets.env_diffuse.clone(), + // specular_map: skybox_assets.env_specular.clone(), + // intensity: 10.0, + // }, + // )); - // Remove the intermediate resource - cmd.remove_resource::(); + // // Remove the intermediate resource + // cmd.remove_resource::(); } struct SkyboxPaths {