From d727f52ff09a2535448249ee75d5ba5f129e6247 Mon Sep 17 00:00:00 2001
From: annieversary <annnnnie@protonmail.com>
Date: Fri, 1 Oct 2021 14:30:23 +0200
Subject: [PATCH] move some stuff or idk

---
 src/camera.rs          | 33 +++++++++++++++++++++++++++++++++
 src/main.rs            |  7 +++----
 src/player.rs          | 35 ++---------------------------------
 src/rendering/pbr.frag |  2 +-
 4 files changed, 39 insertions(+), 38 deletions(-)
 create mode 100644 src/camera.rs

diff --git a/src/camera.rs b/src/camera.rs
new file mode 100644
index 0000000..f5c21dd
--- /dev/null
+++ b/src/camera.rs
@@ -0,0 +1,33 @@
+use bevy::prelude::*;
+
+use crate::player::*;
+
+pub struct Camera;
+pub fn camera_follow_player(
+    player: Query<(&Transform, &Player), Without<Camera>>,
+    mut camera: Query<(&mut Transform, &Camera), Without<Player>>,
+    time: Res<Time>,
+) {
+    let player_pos = if let Some(player) = player.iter().next() {
+        player.0.translation
+    } else {
+        return;
+    };
+
+    let ds = time.delta_seconds() * 5.0;
+    for (mut trans, _) in camera.iter_mut() {
+        trans.look_at(player_pos, Vec3::Y);
+
+        // keep a distance to the player
+        if trans.translation.distance(player_pos) > 170.0 {
+            let mut d = trans.rotation * Vec3::Z * ds;
+            d.y = 0.0;
+            trans.translation -= d;
+        }
+        if trans.translation.distance(player_pos) < 130.0 {
+            let mut d = trans.rotation * Vec3::Z * ds;
+            d.y = 0.0;
+            trans.translation += d;
+        }
+    }
+}
diff --git a/src/main.rs b/src/main.rs
index 44e298d..5a5e8a9 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -6,6 +6,8 @@ mod light_balls;
 use light_balls::*;
 mod player;
 use player::*;
+mod camera;
+use camera::*;
 mod columns;
 use columns::*;
 
@@ -23,9 +25,6 @@ fn main() {
         .run();
 }
 
-pub struct Camera;
-
-/// set up a simple 3D scene
 fn setup(
     mut commands: Commands,
     mut meshes: ResMut<Assets<Mesh>>,
@@ -33,7 +32,7 @@ fn setup(
     mut ambient: ResMut<AmbientLight>,
     light_ball_materials: Res<LightBallMaterials>,
 ) {
-    // set ambient light to 0
+    // set ambient light to very low
     ambient.color = Color::rgb(0.3, 0.3, 0.3);
     ambient.brightness = 0.02;
 
diff --git a/src/player.rs b/src/player.rs
index ef24cdf..6eed3eb 100644
--- a/src/player.rs
+++ b/src/player.rs
@@ -1,7 +1,5 @@
 use bevy::prelude::*;
 
-use crate::Camera;
-
 pub struct Player;
 pub struct PlayerLight {
     i: u8,
@@ -31,7 +29,7 @@ pub fn spawn_player(
             light_material.emissive = Color::rgb(15.0, 15.0, 15.0);
             let light_material = materials.add(light_material);
 
-            for i in 0..10 {
+            for i in 0..6 {
                 parent
                     .spawn_bundle(PbrBundle {
                         mesh: meshes.add(Mesh::from(shape::Icosphere {
@@ -59,7 +57,7 @@ pub fn light_movement(mut query: Query<(&mut Transform, &PlayerLight)>, time: Re
     for (mut trans, light) in query.iter_mut() {
         let i = light.i as f64;
         let i2 = i / 2.0;
-        trans.translation.y = 6.0 * (t * 1.1 * i2 + i).sin() as f32 + 7.0;
+        trans.translation.y = 3.0 * (t * 1.1 * i2 + i).sin() as f32 + 4.0;
         trans.translation.x = 5.0 * i2 as f32 * (t * 0.4 * i2 + i).cos() as f32;
         trans.translation.z = 5.0 * (t * 0.4 * i + i).sin() as f32;
     }
@@ -90,32 +88,3 @@ pub fn move_player(
         }
     }
 }
-
-pub fn camera_follow_player(
-    player: Query<(&Transform, &Player), Without<Camera>>,
-    mut camera: Query<(&mut Transform, &Camera), Without<Player>>,
-    time: Res<Time>,
-) {
-    let player_pos = if let Some(player) = player.iter().next() {
-        player.0.translation
-    } else {
-        return;
-    };
-
-    let ds = time.delta_seconds() * 5.0;
-    for (mut trans, _) in camera.iter_mut() {
-        trans.look_at(player_pos, Vec3::Y);
-
-        // keep a distance to the player
-        if trans.translation.distance(player_pos) > 170.0 {
-            let mut d = trans.rotation * Vec3::Z * ds;
-            d.y = 0.0;
-            trans.translation -= d;
-        }
-        if trans.translation.distance(player_pos) < 100.0 {
-            let mut d = trans.rotation * Vec3::Z * ds;
-            d.y = 0.0;
-            trans.translation += d;
-        }
-    }
-}
diff --git a/src/rendering/pbr.frag b/src/rendering/pbr.frag
index 790b50a..6a77023 100644
--- a/src/rendering/pbr.frag
+++ b/src/rendering/pbr.frag
@@ -34,7 +34,7 @@
 
 #version 450
 
-const int MAX_LIGHTS = 10;
+const int MAX_LIGHTS = 30;
 
 struct Light {
     mat4 proj;