StardustXR/server
1
0
Fork 0
Code Issues 11 Pull Requests 3 Actions Packages Projects Releases 5 Wiki Activity

fix(sky): update bevy-equirect to fix skytex

Browse Source 
Signed-off-by: Schmarni <marnistromer@gmail.com>
This commit is contained in:
Schmarni
2025-08-26 18:47:27 +02:00
parent 1c6b42e69a
commit 712678a666
4 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Cargo.lock generated
View File

@@ -607,9 +607,9 @@ dependencies = [
[[package]] [[package]]
name = "bevy-equirect" name = "bevy-equirect"
version = "0.1.0" version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c0a4903e9341281cc79e69f5e9706a1800bfeb1a41b01a4d1c8b50cd2fe21d97" checksum = "e487dd34daffb090aa0b32581664d760bd907db60a426b195f63b5cfa9ef6bcf"
dependencies = [ dependencies = [
"bevy_app", "bevy_app",
"bevy_asset", "bevy_asset",

2
Cargo.toml
View File

@@ -128,6 +128,7 @@ bevy_mod_openxr = "0.3"
bevy_sk = { git = "https://github.com/technobaboo/bevy_sk", branch = "stochastic" } bevy_sk = { git = "https://github.com/technobaboo/bevy_sk", branch = "stochastic" }
# bevy-dmabuf = "0.2.0" # bevy-dmabuf = "0.2.0"
bevy-dmabuf.git = "https://github.com/Schmarni-Dev/bevy-dmabuf" bevy-dmabuf.git = "https://github.com/Schmarni-Dev/bevy-dmabuf"
bevy-equirect = "0.1.1"
# bevy-mesh-text-3d.git = "https://github.com/terhechte/bevy-mesh-text-3d" # bevy-mesh-text-3d.git = "https://github.com/terhechte/bevy-mesh-text-3d"
# use my fork until my pr to use minimal bevy features was merged # use my fork until my pr to use minimal bevy features was merged
@@ -163,7 +164,6 @@ vulkano = { git = "https://github.com/Schmarni-Dev/vulkano", branch = "0_35_dmab
wgpu-hal = { version = "24", optional = true, features = ["vulkan"] } wgpu-hal = { version = "24", optional = true, features = ["vulkan"] }
ash = { version = "0.38.0", optional = true, default-features = false } ash = { version = "0.38.0", optional = true, default-features = false }
rustix = { version = "1.0.8", features = ["time"] } rustix = { version = "1.0.8", features = ["time"] }
bevy-equirect = "0.1.0"
[dependencies.stardust-xr] [dependencies.stardust-xr]
workspace = true workspace = true

2
src/main.rs
View File

@@ -382,7 +382,7 @@ fn bevy_loop(
app.add_plugins(bevy_sk::hand::HandPlugin); app.add_plugins(bevy_sk::hand::HandPlugin);
app.add_plugins(bevy_equirect::EquirectangularPlugin); app.add_plugins(bevy_equirect::EquirectangularPlugin);
// app.add_plugins(HandGizmosPlugin); // app.add_plugins(HandGizmosPlugin);
app.world_mut().resource_mut::<AmbientLight>().brightness = 1000.0; // app.world_mut().resource_mut::<AmbientLight>().brightness = 1000.0;
if let Some(priority) = args.overlay_priority { if let Some(priority) = args.overlay_priority {
app.insert_resource(OxrOverlaySettings { app.insert_resource(OxrOverlaySettings {
session_layer_placement: priority, session_layer_placement: priority,

3
src/nodes/drawable/mod.rs
View File

@@ -14,7 +14,6 @@ use color_eyre::eyre::eyre;
use model::ModelPart; use model::ModelPart;
use parking_lot::Mutex; use parking_lot::Mutex;
use stardust_xr::values::ResourceID; use stardust_xr::values::ResourceID;
use tracing::info;
use std::{ffi::OsStr, path::PathBuf, sync::Arc}; use std::{ffi::OsStr, path::PathBuf, sync::Arc};
static QUEUED_SKYLIGHT: Mutex<Option<Option<PathBuf>>> = Mutex::new(None); static QUEUED_SKYLIGHT: Mutex<Option<Option<PathBuf>>> = Mutex::new(None);
@@ -53,7 +52,6 @@ impl InterfaceAspect for Interface {
calling_client: Arc<Client>, calling_client: Arc<Client>,
tex: Option<ResourceID>, tex: Option<ResourceID>,
) -> Result<()> { ) -> Result<()> {
info!("setting sky tex");
let resource_path = tex let resource_path = tex
.map(|tex| { .map(|tex| {
get_resource_file(&tex, &calling_client, &[OsStr::new("hdr")]) get_resource_file(&tex, &calling_client, &[OsStr::new("hdr")])
@@ -69,7 +67,6 @@ impl InterfaceAspect for Interface {
calling_client: Arc<Client>, calling_client: Arc<Client>,
light: Option<ResourceID>, light: Option<ResourceID>,
) -> Result<()> { ) -> Result<()> {
info!("setting sky light");
let resource_path = light let resource_path = light
.map(|light| { .map(|light| {
get_resource_file(&light, &calling_client, &[OsStr::new("hdr")]) get_resource_file(&light, &calling_client, &[OsStr::new("hdr")])