wip: colorful bevy shapes

berkus · Jan 29, 2024 · 63d3a71 · 63d3a71
1 parent 77abdce
commit 63d3a71
Show file tree

Hide file tree

Showing 4 changed files with 133 additions and 148 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -12,6 +12,7 @@ fehler = "1.0"
 bevy = "0.12"
 bevy_egui = "0.24"
 bevy_asset_loader = "0.19"
+smooth-bevy-cameras = "0.10"
 byteorder = "1.5"
 log = "0.4"
 derive_builder = "0.13"

diff --git a/bevy-test/Cargo.toml b/bevy-test/Cargo.toml
diff --git a/bevy-test/src/main.rs b/bevy-test/src/main.rs
diff --git a/src/main.rs b/src/main.rs
@@ -14,7 +14,10 @@ use {
         support::{camera::CameraState, car::Car, render_manager::RenderManager},
     },
     anyhow::{anyhow, Context, Error, Result},
-    bevy::prelude::*,
+    bevy::{
+        prelude::*,
+        render::render_resource::{Extent3d, TextureDimension, TextureFormat},
+    },
     cgmath::Vector3,
     fehler::throws,
     glium::{
@@ -25,7 +28,11 @@ use {
         Surface,
     },
     log::info,
-    std::path::Path,
+    smooth_bevy_cameras::{
+        controllers::unreal::{UnrealCameraBundle, UnrealCameraController, UnrealCameraPlugin},
+        LookTransformPlugin,
+    },
+    std::{f32::consts::PI, path::Path},
     support::visitor::visit_files,
 };
 
@@ -133,12 +140,17 @@ fn main() {
     // let mut camera = CameraState::new();
 
     let mut app = App::new();
-    app.add_plugins(DefaultPlugins.build())
+
+    // app.register_asset_loader(CarAssetLoader)
+    //     .init_asset::<CarAsset>();
+
+    app.add_plugins(DefaultPlugins.set(ImagePlugin::default_nearest()))
+        .add_plugins(LookTransformPlugin)
+        .add_plugins(UnrealCameraPlugin::default())
         .add_systems(Startup, setup_cars)
-        // .add_system(animate_camera)
-        ;
-    app.register_asset_loader(CarAssetLoader)
-        .init_asset::<CarAsset>();
+        .add_systems(Startup, setup)
+        .add_systems(Update, rotate);
+    // .add_system(animate_camera)
 
     app.run();
 
@@ -171,9 +183,122 @@ fn main() {
     // });
 }
 
+/// A marker component for our shapes so we can query them separately from the ground plane
+#[derive(Component)]
+struct Shape;
+
+const X_EXTENT: f32 = 14.;
+
 // fn setup() {
 //     commands.spawn(Camera3dBundle {
 //         transform: Transform::from_xyz(0.0, 6., 12.0).looking_at(Vec3::new(0., 1., 0.), Vec3::Y),
 //         ..default()
 //     });
 // }
+
+fn setup(
+    mut commands: Commands,
+    mut meshes: ResMut<Assets<Mesh>>,
+    mut images: ResMut<Assets<Image>>,
+    mut materials: ResMut<Assets<StandardMaterial>>,
+) {
+    let debug_material = materials.add(StandardMaterial {
+        base_color_texture: Some(images.add(uv_debug_texture())),
+        ..default()
+    });
+
+    let shapes = [
+        meshes.add(shape::Cube::default().into()),
+        meshes.add(shape::Box::default().into()),
+        meshes.add(shape::Capsule::default().into()),
+        meshes.add(shape::Torus::default().into()),
+        // meshes.add(shape::Icosphere::default().into()),
+        meshes.add(shape::UVSphere::default().into()),
+    ];
+
+    let num_shapes = shapes.len();
+
+    for (i, shape) in shapes.into_iter().enumerate() {
+        commands.spawn((
+            PbrBundle {
+                mesh: shape,
+                material: debug_material.clone(),
+                transform: Transform::from_xyz(
+                    -X_EXTENT / 2. + i as f32 / (num_shapes - 1) as f32 * X_EXTENT,
+                    2.0,
+                    0.0,
+                )
+                .with_rotation(Quat::from_rotation_x(-PI / 4.)),
+                ..default()
+            },
+            Shape,
+        ));
+    }
+
+    commands.spawn(PointLightBundle {
+        point_light: PointLight {
+            intensity: 9000.0,
+            range: 100.,
+            shadows_enabled: true,
+            ..default()
+        },
+        transform: Transform::from_xyz(8.0, 16.0, 8.0),
+        ..default()
+    });
+
+    // ground plane
+    commands.spawn(PbrBundle {
+        mesh: meshes.add(
+            shape::Plane {
+                size: 50.,
+                subdivisions: 2,
+            }
+            .into(),
+        ),
+        material: materials.add(Color::SILVER.into()),
+        ..default()
+    });
+
+    commands
+        .spawn(Camera3dBundle::default())
+        .insert(UnrealCameraBundle::new(
+            UnrealCameraController::default(),
+            Vec3::new(0.0, 6.0, 12.0),
+            Vec3::new(0., 1., 0.),
+            Vec3::Y,
+        ));
+}
+
+fn rotate(mut query: Query<&mut Transform, With<Shape>>, time: Res<Time>) {
+    for mut transform in &mut query {
+        transform.rotate_y(time.delta_seconds() / 2.);
+    }
+}
+
+/// Creates a colorful test pattern
+fn uv_debug_texture() -> Image {
+    const TEXTURE_SIZE: usize = 8;
+
+    let mut palette: [u8; 32] = [
+        255, 102, 159, 255, 255, 159, 102, 255, 236, 255, 102, 255, 121, 255, 102, 255, 102, 255,
+        198, 255, 102, 198, 255, 255, 121, 102, 255, 255, 236, 102, 255, 255,
+    ];
+
+    let mut texture_data = [0; TEXTURE_SIZE * TEXTURE_SIZE * 4];
+    for y in 0..TEXTURE_SIZE {
+        let offset = TEXTURE_SIZE * y * 4;
+        texture_data[offset..(offset + TEXTURE_SIZE * 4)].copy_from_slice(&palette);
+        palette.rotate_right(4);
+    }
+
+    Image::new_fill(
+        Extent3d {
+            width: TEXTURE_SIZE as u32,
+            height: TEXTURE_SIZE as u32,
+            depth_or_array_layers: 1,
+        },
+        TextureDimension::D2,
+        &texture_data,
+        TextureFormat::Rgba8UnormSrgb,
+    )
+}