From dcbd33e136e36a176685f115e73b9e737caeb72d Mon Sep 17 00:00:00 2001
From: Joey Pollack <jrpollack107@gmail.com>
Date: Fri, 17 May 2024 14:57:45 -0400
Subject: [PATCH] Adds ball and paddle to scene

---
 asset src/ball.blend    |  3 +++
 asset src/paddle.blend  |  3 +++
 assets/ball.glb         |  3 +++
 assets/paddle.glb       |  3 +++
 crates/core/src/core.rs | 31 +++++++++++++++++++++++++++----
 src/main.rs             |  2 +-
 6 files changed, 40 insertions(+), 5 deletions(-)
 create mode 100644 asset src/ball.blend
 create mode 100644 asset src/paddle.blend
 create mode 100644 assets/ball.glb
 create mode 100644 assets/paddle.glb

diff --git a/asset src/ball.blend b/asset src/ball.blend
new file mode 100644
index 0000000..095c4a4
--- /dev/null
+++ b/asset src/ball.blend	
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:413c3098db2dfde038d466960d2c7a9bcf3f9ff4c0b87b84910b151cb32c89e4
+size 939912
diff --git a/asset src/paddle.blend b/asset src/paddle.blend
new file mode 100644
index 0000000..0fb1b1f
--- /dev/null
+++ b/asset src/paddle.blend	
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3c66c6274a0f4c22f444ec0505616409ab0e65114ed3aceafef3322f1e4c7546
+size 856152
diff --git a/assets/ball.glb b/assets/ball.glb
new file mode 100644
index 0000000..3cc8f3d
--- /dev/null
+++ b/assets/ball.glb
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:cfa22d7859989f1ef2f043ae5481c98978dca090537e88cf17acc25d9d1c10f6
+size 24856
diff --git a/assets/paddle.glb b/assets/paddle.glb
new file mode 100644
index 0000000..6ecfa4b
--- /dev/null
+++ b/assets/paddle.glb
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:54453245c3ecb2fe0def48165490196583ff557794dae0c5ed0ad3dfa5df0823
+size 2024
diff --git a/crates/core/src/core.rs b/crates/core/src/core.rs
index c1dc75b..0e4c5ec 100644
--- a/crates/core/src/core.rs
+++ b/crates/core/src/core.rs
@@ -1,5 +1,5 @@
 
-use bevy::{prelude::*, scene::ron::de};
+use bevy::prelude::*;
 
 pub struct CorePlugin;
 
@@ -11,8 +11,10 @@ impl Plugin for CorePlugin
 	}
 }
 
-fn setup(mut commands: Commands, server: Res<AssetServer>)
+fn setup(mut commands: Commands, server: Res<AssetServer>, mut ambient_light: ResMut<AmbientLight>)
 {
+	ambient_light.brightness = 200.0;
+
 	// CAMERA
 	commands.spawn(Camera3dBundle {
 		transform: Transform::from_xyz(0.0, 0.0, -25.0).looking_at(Vec3::ZERO, Vec3::Y),
@@ -21,16 +23,37 @@ fn setup(mut commands: Commands, server: Res<AssetServer>)
 
 	// LIGHT
 	commands.spawn(PointLightBundle {
+		point_light: PointLight {
+			intensity: 2_000_000.0,
+			range: 100.0,
+			radius: 10.0,
+			..default()
+		},
         transform: Transform::from_xyz(0.0, 5.0, -5.0),
         ..default()
     });
 
 	// BRICK
 	let brick_handle: Handle<Scene> = server.load("brick.glb#Scene0");
-
 	commands.spawn(SceneBundle {
 		scene: brick_handle,
-		transform: Transform::from_xyz(0.0, 0.0, 0.0),
+		transform: Transform::from_xyz(0.0, 8.0, 0.0),
 		.. default()
 	});
+
+	// BALL
+	let ball_handle: Handle<Scene> = server.load("ball.glb#Scene0");
+	commands.spawn(SceneBundle {
+		scene: ball_handle,
+		transform: Transform::from_xyz(0.0, -7.75, 0.0),
+		..default()
+	});
+
+	// PADDLE
+	let paddle_handle: Handle<Scene> = server.load("paddle.glb#Scene0");
+	commands.spawn(SceneBundle {
+		scene: paddle_handle,
+		transform: Transform::from_xyz(0.0, -8.0, 0.0),
+		..default()
+	});
 }
\ No newline at end of file
diff --git a/src/main.rs b/src/main.rs
index 29f4796..538aaa9 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,7 +1,7 @@
 
 use bevy::prelude::*;
 
-use hello::hello::HelloPlugin;
+// use hello::hello::HelloPlugin;
 use core::core::CorePlugin;
 
 fn main()