Merge branch 'ring'
This commit is contained in:
commit
531e149209
116
Cargo.lock
generated
116
Cargo.lock
generated
|
|
@ -349,6 +349,7 @@ dependencies = [
|
|||
"futures-io",
|
||||
"futures-lite",
|
||||
"js-sys",
|
||||
"notify-debouncer-full",
|
||||
"parking_lot",
|
||||
"ron",
|
||||
"serde",
|
||||
|
|
@ -1716,6 +1717,27 @@ dependencies = [
|
|||
"simd-adler32",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "file-id"
|
||||
version = "0.2.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "6584280525fb2059cba3db2c04abf947a1a29a45ddae89f3870f8281704fafc9"
|
||||
dependencies = [
|
||||
"windows-sys 0.48.0",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "filetime"
|
||||
version = "0.2.23"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd"
|
||||
dependencies = [
|
||||
"cfg-if",
|
||||
"libc",
|
||||
"redox_syscall 0.4.1",
|
||||
"windows-sys 0.52.0",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "fixedbitset"
|
||||
version = "0.4.2"
|
||||
|
|
@ -1759,6 +1781,15 @@ version = "0.3.1"
|
|||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "aa9a19cbb55df58761df49b23516a86d432839add4af60fc256da840f66ed35b"
|
||||
|
||||
[[package]]
|
||||
name = "fsevent-sys"
|
||||
version = "4.1.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "76ee7a02da4d231650c7cea31349b889be2f45ddb3ef3032d2ec8185f6313fd2"
|
||||
dependencies = [
|
||||
"libc",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "futures-core"
|
||||
version = "0.3.30"
|
||||
|
|
@ -2062,6 +2093,26 @@ version = "1.1.1"
|
|||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "a257582fdcde896fd96463bf2d40eefea0580021c0712a0e2b028b60b47a837a"
|
||||
|
||||
[[package]]
|
||||
name = "inotify"
|
||||
version = "0.9.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f8069d3ec154eb856955c1c0fbffefbf5f3c40a104ec912d4797314c1801abff"
|
||||
dependencies = [
|
||||
"bitflags 1.3.2",
|
||||
"inotify-sys",
|
||||
"libc",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "inotify-sys"
|
||||
version = "0.1.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e05c02b5e89bff3b946cedeca278abc628fe811e604f027c45a8aa3cf793d0eb"
|
||||
dependencies = [
|
||||
"libc",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "itertools"
|
||||
version = "0.12.1"
|
||||
|
|
@ -2140,6 +2191,26 @@ version = "3.1.0"
|
|||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e2db585e1d738fc771bf08a151420d3ed193d9d895a36df7f6f8a9456b911ddc"
|
||||
|
||||
[[package]]
|
||||
name = "kqueue"
|
||||
version = "1.0.8"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "7447f1ca1b7b563588a205fe93dea8df60fd981423a768bc1c0ded35ed147d0c"
|
||||
dependencies = [
|
||||
"kqueue-sys",
|
||||
"libc",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "kqueue-sys"
|
||||
version = "1.0.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "ed9625ffda8729b85e45cf04090035ac368927b8cebc34898e7c120f52e4838b"
|
||||
dependencies = [
|
||||
"bitflags 1.3.2",
|
||||
"libc",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "ktx2"
|
||||
version = "0.3.0"
|
||||
|
|
@ -2311,6 +2382,18 @@ dependencies = [
|
|||
"simd-adler32",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "mio"
|
||||
version = "0.8.11"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c"
|
||||
dependencies = [
|
||||
"libc",
|
||||
"log",
|
||||
"wasi",
|
||||
"windows-sys 0.48.0",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "naga"
|
||||
version = "0.19.2"
|
||||
|
|
@ -2426,6 +2509,39 @@ version = "0.5.5"
|
|||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "610a5acd306ec67f907abe5567859a3c693fb9886eb1f012ab8f2a47bef3db51"
|
||||
|
||||
[[package]]
|
||||
name = "notify"
|
||||
version = "6.1.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "6205bd8bb1e454ad2e27422015fb5e4f2bcc7e08fa8f27058670d208324a4d2d"
|
||||
dependencies = [
|
||||
"bitflags 2.4.2",
|
||||
"crossbeam-channel",
|
||||
"filetime",
|
||||
"fsevent-sys",
|
||||
"inotify",
|
||||
"kqueue",
|
||||
"libc",
|
||||
"log",
|
||||
"mio",
|
||||
"walkdir",
|
||||
"windows-sys 0.48.0",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "notify-debouncer-full"
|
||||
version = "0.3.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "49f5dab59c348b9b50cf7f261960a20e389feb2713636399cd9082cd4b536154"
|
||||
dependencies = [
|
||||
"crossbeam-channel",
|
||||
"file-id",
|
||||
"log",
|
||||
"notify",
|
||||
"parking_lot",
|
||||
"walkdir",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "ntapi"
|
||||
version = "0.4.1"
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ rust-version = "1.76.0"
|
|||
|
||||
[dependencies]
|
||||
regex = "1"
|
||||
bevy = { version = "0.13.1", default-features = false, features = ["jpeg", "bevy_asset", "bevy_audio", "bevy_scene", "bevy_winit", "bevy_core_pipeline", "bevy_pbr", "bevy_gltf", "bevy_render", "bevy_text", "bevy_ui", "multi-threaded", "png", "vorbis", "x11", "tonemapping_luts"]}
|
||||
bevy = { version = "0.13.1", default-features = false, features = ["jpeg", "bevy_asset", "bevy_audio", "bevy_scene", "bevy_winit", "bevy_core_pipeline", "bevy_pbr", "bevy_gltf", "bevy_render", "bevy_text", "bevy_ui", "file_watcher", "multi-threaded", "png", "vorbis", "x11", "tonemapping_luts"]}
|
||||
bevy_xpbd_3d = { version = "0.4", default-features = false, features = ["3d", "f32", "parry-f32", "parallel", "async-collider"] }
|
||||
bevy_embedded_assets = "0.10.2"
|
||||
|
||||
|
|
|
|||
85
assets/shaders/jupiters_rings.wgsl
Normal file
85
assets/shaders/jupiters_rings.wgsl
Normal file
|
|
@ -0,0 +1,85 @@
|
|||
#import bevy_pbr::{
|
||||
mesh_view_bindings::globals,
|
||||
forward_io::VertexOutput,
|
||||
}
|
||||
|
||||
@group(2) @binding(0) var<uniform> ring_radius: f32;
|
||||
@group(2) @binding(1) var<uniform> jupiter_radius: f32;
|
||||
|
||||
const jupiter_radius_Mm: f32 = 71.492;
|
||||
|
||||
fn smooth_edge(start: f32, end: f32, value: f32) -> f32 {
|
||||
var x: f32 = (value - start) / (end - start);
|
||||
return 4 * x * x * (1 - x * x);
|
||||
}
|
||||
|
||||
fn ring_density(radius: f32) -> f32 {
|
||||
let halo_inner: f32 = 92.0;
|
||||
let halo_outer: f32 = 122.5;
|
||||
let main_inner: f32 = 122.5;
|
||||
let main_outer: f32 = 129.0;
|
||||
let amalthea_inner: f32 = 129.0;
|
||||
let amalthea_outer: f32 = 182.0;
|
||||
let thebe_inner: f32 = 129.0;
|
||||
let thebe_outer: f32 = 229.0;
|
||||
let metis_notch_center: f32 = 128.0;
|
||||
let metis_notch_width: f32 = 0.6;
|
||||
|
||||
let halo_brightness: f32 = 0.3;
|
||||
let main_brightness: f32 = 1.0;
|
||||
let almathea_brightness: f32 = 0.2;
|
||||
let thebe_brightness: f32 = 0.2;
|
||||
|
||||
let inner_smooth_factor: f32 = 2.0; // Smooth inner edges
|
||||
let outer_smooth_factor: f32 = 1.5; // Rougher outer edges
|
||||
|
||||
var density: f32 = 0.0;
|
||||
|
||||
if (radius >= halo_inner && radius <= halo_outer) {
|
||||
density = halo_brightness * smooth_edge(halo_inner, halo_outer, radius);
|
||||
} else if (radius >= main_inner && radius <= main_outer) {
|
||||
var metis_notch_effect: f32 = 1.0;
|
||||
if (radius > metis_notch_center - metis_notch_width * 0.5 && radius < metis_notch_center + metis_notch_width * 0.5) {
|
||||
metis_notch_effect = 0.5 * (1.0 - smooth_edge(metis_notch_center - metis_notch_width * 0.5, metis_notch_center + metis_notch_width * 0.5, radius));
|
||||
}
|
||||
density = main_brightness * metis_notch_effect * smooth_edge(main_inner, main_outer, radius);
|
||||
} else {
|
||||
if (radius >= amalthea_inner && radius <= amalthea_outer) {
|
||||
density = almathea_brightness * smooth_edge(amalthea_inner, amalthea_outer, radius);
|
||||
}
|
||||
if (radius >= thebe_inner && radius <= thebe_outer) {
|
||||
density += thebe_brightness * smooth_edge(thebe_inner, thebe_outer, radius);
|
||||
}
|
||||
}
|
||||
|
||||
return density;
|
||||
}
|
||||
|
||||
@fragment
|
||||
fn fragment(in: VertexOutput) -> @location(0) vec4<f32> {
|
||||
let jupiter_percent = jupiter_radius / ring_radius;
|
||||
let color = vec3<f32>(0.3, 0.3, 0.3);
|
||||
var alpha = 0.02;
|
||||
let r_uv = 2 * distance(in.uv, vec2<f32>(0.5));
|
||||
let r = r_uv * ring_radius / jupiter_radius * jupiter_radius_Mm;
|
||||
|
||||
alpha *= ring_density(r);
|
||||
if alpha <= 0.0 {
|
||||
return vec4<f32>(color, alpha);
|
||||
}
|
||||
|
||||
if in.uv[0] < 0.5 {
|
||||
let dist = (0.5 - in.uv[0]) * 2.0; // 0.0=jupiter's center, 1.0=edge of the ring
|
||||
let side_dist = abs(in.uv[1] - 0.5);
|
||||
|
||||
let cutoff = 0.5 * jupiter_percent * cos(dist);
|
||||
if side_dist < cutoff {
|
||||
return vec4<f32>(color, 0.0);
|
||||
}
|
||||
let fuzzy_boundary = 0.01;
|
||||
if side_dist < cutoff + fuzzy_boundary {
|
||||
return vec4<f32>(color, alpha * (side_dist - cutoff) / fuzzy_boundary);
|
||||
}
|
||||
}
|
||||
return vec4<f32>(color, alpha);
|
||||
}
|
||||
60
src/world.rs
60
src/world.rs
|
|
@ -4,6 +4,7 @@ use bevy::prelude::*;
|
|||
//use bevy::asset::LoadState;
|
||||
//use bevy::render::render_resource::{TextureViewDescriptor, TextureViewDimension};
|
||||
use bevy::pbr::CascadeShadowConfigBuilder;
|
||||
use bevy::render::render_resource::{AsBindGroup, ShaderRef};
|
||||
use bevy_xpbd_3d::prelude::*;
|
||||
use std::f32::consts::PI;
|
||||
|
||||
|
|
@ -39,11 +40,30 @@ impl Plugin for WorldPlugin {
|
|||
//app.add_systems(Update, asset_loaded.after(load_cubemap_asset));
|
||||
//app.add_systems(Update, swap_world_on_ar_toggle);
|
||||
app.add_plugins(PhysicsPlugins::default());
|
||||
app.add_plugins(MaterialPlugin::<RingMaterial>::default());
|
||||
//app.add_plugins(PhysicsDebugPlugin::default());
|
||||
app.insert_resource(Gravity(Vec3::splat(0.0)));
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(Asset, TypePath, AsBindGroup, Debug, Clone)]
|
||||
pub struct RingMaterial {
|
||||
alpha_mode: AlphaMode,
|
||||
#[uniform(0)]
|
||||
ring_radius: f32,
|
||||
#[uniform(1)]
|
||||
jupiter_radius: f32,
|
||||
}
|
||||
|
||||
impl Material for RingMaterial {
|
||||
fn fragment_shader() -> ShaderRef {
|
||||
"shaders/jupiters_rings.wgsl".into()
|
||||
}
|
||||
fn alpha_mode(&self) -> AlphaMode {
|
||||
self.alpha_mode
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(Component)]
|
||||
pub struct Star;
|
||||
|
||||
|
|
@ -68,6 +88,7 @@ pub fn setup(
|
|||
mut commands: Commands,
|
||||
mut meshes: ResMut<Assets<Mesh>>,
|
||||
mut materials: ResMut<Assets<StandardMaterial>>,
|
||||
mut materials_custom: ResMut<Assets<RingMaterial>>,
|
||||
asset_server: Res<AssetServer>,
|
||||
) {
|
||||
// let cubemap_handle = asset_server.load(ASSET_CUBEMAP);
|
||||
|
|
@ -162,6 +183,45 @@ pub fn setup(
|
|||
}
|
||||
info!("Generated {starcount} stars");
|
||||
|
||||
// Add shaded ring
|
||||
let ring_radius = 640000.0;
|
||||
let jupiter_radius = 200000.0;
|
||||
commands.spawn(MaterialMeshBundle {
|
||||
mesh: meshes.add(Mesh::from(Cylinder::new(ring_radius, 1.0))),
|
||||
transform: Transform::from_xyz(300000.0, -1000.0, 500000.0)
|
||||
.with_rotation(Quat::from_rotation_z(1f32.to_radians()))
|
||||
,
|
||||
//transform: Transform::from_xyz(300000.0, 0.0, 500000.0)),
|
||||
material: materials_custom.add(RingMaterial {
|
||||
alpha_mode: AlphaMode::Blend,
|
||||
ring_radius: ring_radius,
|
||||
jupiter_radius: jupiter_radius,
|
||||
}),
|
||||
..default()
|
||||
});
|
||||
//let max = 20;
|
||||
//for i in 0..max {
|
||||
// let f = i as f32;
|
||||
// let maxf = max as f32;
|
||||
// let ringmesh = Mesh::from(Cylinder::new(400000.0 + f * 10000.0, 5000.0 - 150.0 * f));
|
||||
// let clr = 0.4 + (f/maxf).clamp(0.0,0.6);
|
||||
// commands.spawn(MaterialMeshBundle {
|
||||
// mesh: meshes.add(ringmesh),
|
||||
// transform: Transform::from_xyz(300000.0, 0.0, 500000.0),
|
||||
// material: materials_custom.add(RingMaterial {
|
||||
// alpha_mode: AlphaMode::Blend,
|
||||
// }),
|
||||
// material: materials.add(StandardMaterial {
|
||||
// base_color: Color::rgba(clr, clr, clr, 0.0001),
|
||||
// unlit: true,
|
||||
// cull_mode: None,
|
||||
// alpha_mode: AlphaMode::Blend,
|
||||
// ..default()
|
||||
// }),
|
||||
// ..default()
|
||||
// });
|
||||
//}
|
||||
|
||||
// Add Light from the Sun
|
||||
commands.spawn(DirectionalLightBundle {
|
||||
directional_light: DirectionalLight {
|
||||
|
|
|
|||
Loading…
Reference in a new issue