Add BRP to render app

crates/bevy_ecs/src/schedule/schedule.rs

@@ -46,7 +46,9 @@ pub struct Schedules {
     inner: HashMap<InternedScheduleLabel, Schedule>,
     /// List of [`ComponentId`]s to ignore when reporting system order ambiguity conflicts
     pub ignored_scheduling_ambiguities: BTreeSet<ComponentId>,
+    /// Set of schedule labels that have been removed to execute in [`World::try_schedule_scope`].
     temporarily_removed: HashSet<InternedScheduleLabel>,
+    /// Set of schedule labels that have attempted to be read in [`World::try_schedule_scope`].
     empty_labels: HashSet<InternedScheduleLabel>,
 }
 

crates/bevy_internal/Cargo.toml

@@ -358,20 +358,23 @@ reflect_functions = [
   "bevy_reflect/functions",
   "bevy_app/reflect_functions",
   "bevy_ecs/reflect_functions",
+  "bevy_render?/reflect_functions",
 ]
 
 # Enable automatic reflect registration using inventory.
 reflect_auto_register = [
   "bevy_reflect/auto_register_inventory",
   "bevy_app/reflect_auto_register",
   "bevy_ecs/reflect_auto_register",
+  "bevy_render?/reflect_auto_register",
 ]
 
 # Enable automatic reflect registration without inventory. See `reflect::load_type_registrations` for more info.
 reflect_auto_register_static = [
   "bevy_reflect/auto_register_static",
   "bevy_app/reflect_auto_register",
   "bevy_ecs/reflect_auto_register",
+  "bevy_render?/reflect_auto_register",
 ]
 
 # Enables bevy_reflect to access documentation comments of rust code at runtime

crates/bevy_remote/Cargo.toml

@@ -9,18 +9,21 @@ license = "MIT OR Apache-2.0"
 keywords = ["bevy"]
 
 [features]
-default = ["http", "bevy_asset"]
+default = ["http", "bevy_asset", "bevy_render"]
 http = ["dep:async-io", "dep:smol-hyper", "bevy_tasks/async-io"]
 bevy_asset = ["dep:bevy_asset"]
+bevy_render = ["dep:bevy_render"]
 
 [dependencies]
 # bevy
 bevy_app = { path = "../bevy_app", version = "0.19.0-dev" }
+bevy_color = { path = "../bevy_color", version = "0.19.0-dev" }
 bevy_derive = { path = "../bevy_derive", version = "0.19.0-dev" }
 bevy_ecs = { path = "../bevy_ecs", version = "0.19.0-dev", features = [
   "serialize",
 ] }
 bevy_reflect = { path = "../bevy_reflect", version = "0.19.0-dev" }
+bevy_render = { path = "../bevy_render", version = "0.19.0-dev", optional = true }
 bevy_tasks = { path = "../bevy_tasks", version = "0.19.0-dev" }
 bevy_utils = { path = "../bevy_utils", version = "0.19.0-dev", features = [
   "debug",

crates/bevy_remote/src/http.rs

@@ -3,11 +3,15 @@
 //! Adding the [`RemoteHttpPlugin`] to your [`App`] causes Bevy to accept
 //! connections over HTTP (by default, on port 15702) while your app is running.
 //!
+//! When `bevy_render` is enabled, a second port is available to query the render subapp.
+//!
 //! Clients are expected to `POST` JSON requests to the root URL; see the `client`
 //! example for a trivial example of use.
 
 #![cfg(not(target_family = "wasm"))]
 
+#[cfg(feature = "bevy_render")]
+use crate::setup_mailbox_channel;
 use crate::{
     error_codes, BrpBatch, BrpError, BrpMessage, BrpRequest, BrpResponse, BrpResult, BrpSender,
 };
@@ -16,7 +20,11 @@ use async_channel::{Receiver, Sender};
 use async_io::Async;
 use bevy_app::{App, Plugin, Startup};
 use bevy_ecs::resource::Resource;
+#[cfg(feature = "bevy_render")]
+use bevy_ecs::schedule::IntoScheduleConfigs as _;
 use bevy_ecs::system::Res;
+#[cfg(feature = "bevy_render")]
+use bevy_render::{RenderApp, RenderStartup};
 use bevy_tasks::{futures_lite::StreamExt, IoTaskPool};
 use core::{
     convert::Infallible,
@@ -43,6 +51,11 @@ use std::{
 /// This value was chosen randomly.
 pub const DEFAULT_PORT: u16 = 15702;
 
+/// The default port that Bevy will listen on for the render subapp.
+///
+/// The render subapp is available for requests if the `bevy_render` feature is enabled.
+pub const DEFAULT_RENDER_PORT: u16 = 15703;
+
 /// The default host address that Bevy will use for its server.
 pub const DEFAULT_ADDR: IpAddr = IpAddr::V4(Ipv4Addr::new(127, 0, 0, 1));
 
@@ -95,12 +108,15 @@ impl Default for Headers {
 /// The defaults are:
 /// - [`DEFAULT_ADDR`] : 127.0.0.1.
 /// - [`DEFAULT_PORT`] : 15702.
+/// - [`DEFAULT_RENDER_PORT`] : 15703. (when `bevy_render` is enabled)
 ///
 pub struct RemoteHttpPlugin {
     /// The address that Bevy will bind to.
     address: IpAddr,
     /// The port that Bevy will listen on.
     port: u16,
+    /// The port that Bevy will listen on for render subapp.
+    render_port: u16,
     /// The headers that Bevy will include in its HTTP responses
     headers: Headers,
 }
@@ -110,6 +126,7 @@ impl Default for RemoteHttpPlugin {
         Self {
             address: DEFAULT_ADDR,
             port: DEFAULT_PORT,
+            render_port: DEFAULT_RENDER_PORT,
             headers: Headers::new(),
         }
     }
@@ -121,6 +138,26 @@ impl Plugin for RemoteHttpPlugin {
             .insert_resource(HostPort(self.port))
             .insert_resource(HostHeaders(self.headers.clone()))
             .add_systems(Startup, start_http_server);
+
+        #[cfg(feature = "bevy_render")]
+        {
+            use bevy_ecs::schedule::common_conditions::run_once;
+
+            let Some(render_app) = app.get_sub_app_mut(RenderApp) else {
+                return;
+            };
+
+            render_app
+                .insert_resource(HostAddress(self.address))
+                .insert_resource(HostPort(self.render_port))
+                .insert_resource(HostHeaders(self.headers.clone()))
+                .add_systems(
+                    RenderStartup,
+                    start_http_server
+                        .run_if(run_once)
+                        .after(setup_mailbox_channel),
+                );
+        }
     }
 }