diff --git a/CHANGELOG.md b/CHANGELOG.md index c7710c8..004c315 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ ### Features - Added `PreloadScripts` component for specifying JavaScript to be executed when the page is initialized. +- Enables GPU when debugging. ### Bug Fixes diff --git a/Makefile b/Makefile index 2964840..ffe5343 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,19 @@ +.PHONY: fix install + +BIN := bevy_cef_debug_render_process +CEF_LIB := $(HOME)/.local/share/cef/Chromium Embedded Framework.framework/Libraries + + +.PHONY: fix install + +BIN := bevy_cef_debug_render_process +CEF_LIB := $(HOME)/.local/share/cef/Chromium Embedded Framework.framework/Libraries +CARGO_BIN := $(HOME)/.cargo/bin + fix: cargo clippy --fix --allow-dirty --allow-staged --workspace --all --all-features cargo fmt --all install: - cargo install --path ./crates/bevy_cef_debug_render_process --force \ No newline at end of file + cargo install --path ./crates/bevy_cef_debug_render_process --force + mv "$(CARGO_BIN)/$(BIN)" "$(CEF_LIB)/$(BIN)" \ No newline at end of file diff --git a/crates/bevy_cef_core/src/browser_process/app.rs b/crates/bevy_cef_core/src/browser_process/app.rs index 1a6579c..a0bf34a 100644 --- a/crates/bevy_cef_core/src/browser_process/app.rs +++ b/crates/bevy_cef_core/src/browser_process/app.rs @@ -53,12 +53,6 @@ impl ImplApp for BrowserProcessAppBuilder { return; }; command_line.append_switch(Some(&"use-mock-keychain".into())); - #[cfg(feature = "debug")] - { - command_line.append_switch(Some(&"disable-gpu".into())); - command_line.append_switch(Some(&"disable-gpu-compositing".into())); - command_line.append_switch(Some(&"disable-software-rasterizer".into())); - } } fn browser_process_handler(&self) -> Option { diff --git a/crates/bevy_cef_core/src/browser_process/localhost/headers_responser.rs b/crates/bevy_cef_core/src/browser_process/localhost/headers_responser.rs index 7abad8e..11c3214 100644 --- a/crates/bevy_cef_core/src/browser_process/localhost/headers_responser.rs +++ b/crates/bevy_cef_core/src/browser_process/localhost/headers_responser.rs @@ -18,6 +18,12 @@ impl HeadersResponser { }; self.headers.clear(); self.response_length = obtain_response_length(&cef_response.data, range); + self.headers + .push(("Access-Control-Allow-Origin".to_string(), "*".to_string())); + self.headers + .push(("Access-Control-Allow-Methods".to_string(), "*".to_string())); + self.headers + .push(("Access-Control-Allow-Headers".to_string(), "*".to_string())); if let Some(content_range) = content_range_header_value(&cef_response.data, range) { self.headers .push(("Content-Range".to_string(), content_range)); diff --git a/crates/bevy_cef_core/src/util.rs b/crates/bevy_cef_core/src/util.rs index 277262c..cc7e709 100644 --- a/crates/bevy_cef_core/src/util.rs +++ b/crates/bevy_cef_core/src/util.rs @@ -12,8 +12,8 @@ use cef::{ }; use cef_dll_sys::_cef_string_utf16_t; use cef_dll_sys::cef_scheme_options_t::{ - CEF_SCHEME_OPTION_CORS_ENABLED, CEF_SCHEME_OPTION_LOCAL, CEF_SCHEME_OPTION_SECURE, - CEF_SCHEME_OPTION_STANDARD, + CEF_SCHEME_OPTION_CORS_ENABLED, CEF_SCHEME_OPTION_FETCH_ENABLED, CEF_SCHEME_OPTION_LOCAL, + CEF_SCHEME_OPTION_SECURE, CEF_SCHEME_OPTION_STANDARD, }; use std::env::home_dir; use std::path::PathBuf; @@ -27,6 +27,7 @@ pub fn cef_scheme_flags() -> u32 { | CEF_SCHEME_OPTION_SECURE as u32 | CEF_SCHEME_OPTION_LOCAL as u32 | CEF_SCHEME_OPTION_CORS_ENABLED as u32 + | CEF_SCHEME_OPTION_FETCH_ENABLED as u32 } pub fn debug_chromium_libraries_path() -> PathBuf { @@ -42,11 +43,7 @@ pub fn debug_cef_path() -> PathBuf { } pub fn debug_render_process_path() -> PathBuf { - cargo_bin_path().join("bevy_cef_debug_render_process") -} - -pub fn cargo_bin_path() -> PathBuf { - home_dir().unwrap().join(".cargo").join("bin") + debug_chromium_libraries_path().join("bevy_cef_debug_render_process") } pub trait IntoString {