From efdb86c0811c655c2a5835c140c9bb10511b0f70 Mon Sep 17 00:00:00 2001
From: WanderingPenwing <nicolas.pinson31@gmail.com>
Date: Mon, 7 Oct 2024 09:28:32 +0200
Subject: [PATCH] wasm + include json

---
 src/end_state.rs   | 28 +++++++-----------
 src/game_state.rs  | 71 ++++++++++++++++++----------------------------
 src/main.rs        | 20 ++++---------
 src/start_state.rs | 31 ++++++++------------
 4 files changed, 56 insertions(+), 94 deletions(-)

diff --git a/src/end_state.rs b/src/end_state.rs
index 4d43fb1..aa505f0 100644
--- a/src/end_state.rs
+++ b/src/end_state.rs
@@ -9,14 +9,13 @@ pub fn setup(
 	mut player_query: Query<&mut Player>
 ) {
 	if let Ok(player) = player_query.get_single_mut() {
-	    // Create a container node that places its children (text areas) in a vertical column and centers them
 	    let container_node = NodeBundle {
 	        style: Style {
-	            width: Val::Percent(100.0),  // Full width of the screen
-	            height: Val::Percent(100.0), // Full height of the screen
-	            flex_direction: FlexDirection::Column, // Arrange children in a column (vertical)
-	            justify_content: JustifyContent::Center, // Center vertically
-	            align_items: AlignItems::Center, // Center horizontally
+	            width: Val::Percent(100.0), 
+	            height: Val::Percent(100.0),
+	            flex_direction: FlexDirection::Column,
+	            justify_content: JustifyContent::Center,
+	            align_items: AlignItems::Center,
 	            ..default()
 	        },
 	        ..default()
@@ -24,35 +23,30 @@ pub fn setup(
 
 	    let container = commands.spawn(container_node).id();
 
-	    // TextStyle for the top text (larger font)
 	    let top_text_style = TextStyle {
-	        font_size: 50.0, // Larger font size
+	        font_size: 50.0, 
 	        color: Color::WHITE,
-	        // font: asset_server.load("fonts/FiraSans-Bold.ttf"), // Load font if needed
+	        // font: asset_server.load("fonts/FiraSans-Bold.ttf"),
 	        ..default()
 	    };
 
-	    // TextStyle for the bottom text (smaller font)
 	    let bottom_text_style = TextStyle {
-	        font_size: 30.0, // Smaller font size
+	        font_size: 30.0, 
 	        color: Color::WHITE,
-	        // font: asset_server.load("fonts/FiraSans-Regular.ttf"), // Load font if needed
+	        // font: asset_server.load("fonts/FiraSans-Regular.ttf"), 
 	        ..default()
 	    };
 
-	    // TextBundle for the top text
 	    let top_text_node = TextBundle::from_section(
-	        "Game Over", // Text for the top section
+	        "Game Over", 
 	        top_text_style,
 	    );
 
-	    // TextBundle for the bottom text
 	    let bottom_text_node = TextBundle::from_section(
-	        format!("final score : {}", player.score), // Text for the bottom section
+	        format!("final score : {}", player.score), 
 	        bottom_text_style,
 	    );
 
-	    // Spawn the text nodes and add them as children to the container
 	    let top_text = commands.spawn((top_text_node, GameOver)).id();
 	    let bottom_text = commands.spawn((bottom_text_node, GameOver)).id();
 
diff --git a/src/game_state.rs b/src/game_state.rs
index bc82407..5e5dc74 100644
--- a/src/game_state.rs
+++ b/src/game_state.rs
@@ -30,35 +30,31 @@ pub struct ScoreLabel;
 pub struct HintLabel;
 
 pub fn setup(mut commands: Commands, _asset_server: Res<AssetServer>) {
-    // Create a container node that places its children (buttons) at the bottom of the screen
     let container_node = NodeBundle {
         style: Style {
-            width: Val::Percent(100.0), // Full width of the screen
-            height: Val::Percent(100.0), // Full height of the screen
-            flex_direction: FlexDirection::Row, // Arrange children in a row (horizontal)
-            justify_content: JustifyContent::Center, // Center horizontally
-            align_items: AlignItems::FlexEnd, // Place at the bottom of the screen
-            padding: UiRect::all(Val::Px(10.0)), // Optional padding
+            width: Val::Percent(100.0),
+            height: Val::Percent(100.0), 
+            flex_direction: FlexDirection::Row,
+            justify_content: JustifyContent::Center, 
+            align_items: AlignItems::FlexEnd,
+            padding: UiRect::all(Val::Px(10.0)),
             ..default()
         },
         ..default()
     };
 
-    // Button style (same for all buttons)
     let button_style = Style {
         width: Val::Px(150.0),
         height: Val::Px(65.0),
-        margin: UiRect::all(Val::Px(10.0)), // Add margin between buttons
-        justify_content: JustifyContent::Center, // Center text horizontally
-        align_items: AlignItems::Center, // Center text vertically
+        margin: UiRect::all(Val::Px(10.0)), 
+        justify_content: JustifyContent::Center,
+        align_items: AlignItems::Center, 
         border: UiRect::all(Val::Px(5.0)),
         ..default()
     };
 
-    // Create the container for the buttons
     let container = commands.spawn(container_node).id();
 
-    // Function to create buttons with different text
     for _i in 1..=4 {
         let button_node = ButtonBundle {
             style: button_style.clone(),
@@ -77,7 +73,6 @@ pub fn setup(mut commands: Commands, _asset_server: Res<AssetServer>) {
             },
         );
 
-        // Spawn the button and its text as children of the container
         let button = commands.spawn((button_node, MainGame)).id();
         let button_text = commands.spawn((button_text_node, AnswerButton, MainGame)).id();
 
@@ -85,12 +80,11 @@ pub fn setup(mut commands: Commands, _asset_server: Res<AssetServer>) {
         commands.entity(container).push_children(&[button]);
     }
 
-    // Label style for top corners
     let label_style = Style {
-        position_type: PositionType::Absolute, // Absolute positioning
-        width: Val::Auto, // Auto width to fit text
-        height: Val::Auto, // Auto height to fit text
-        margin: UiRect::all(Val::Px(10.0)), // Margin around the text
+        position_type: PositionType::Absolute,
+        width: Val::Auto, 
+        height: Val::Auto, 
+        margin: UiRect::all(Val::Px(10.0)), 
         ..default()
     };
 
@@ -103,7 +97,7 @@ pub fn setup(mut commands: Commands, _asset_server: Res<AssetServer>) {
             ..label_style.clone()
         },
         text: Text::from_section(
-            "* * *", // Text content
+            "* * *", 
             TextStyle {
                 // font: asset_server.load("fonts/FiraSans-Bold.ttf"),
                 font_size: 30.0,
@@ -123,7 +117,7 @@ pub fn setup(mut commands: Commands, _asset_server: Res<AssetServer>) {
             ..label_style.clone()
         },
         text: Text::from_section(
-            "0", // Text content
+            "0",
             TextStyle {
                 // font: asset_server.load("fonts/FiraSans-Bold.ttf"),
                 font_size: 30.0,
@@ -134,14 +128,13 @@ pub fn setup(mut commands: Commands, _asset_server: Res<AssetServer>) {
         ..default()
     };
 
-    // Centered container for the "Hint" label
     let centered_container_node = NodeBundle {
         style: Style {
             position_type: PositionType::Absolute,
-            width: Val::Percent(100.0), // Full width
-            top: Val::Px(20.0),         // Positioned at the top
-            justify_content: JustifyContent::Center, // Center horizontally
-            align_items: AlignItems::Center,         // Center vertically
+            width: Val::Percent(100.0),
+            top: Val::Px(20.0),
+            justify_content: JustifyContent::Center,
+            align_items: AlignItems::Center,
             ..default()
         },
         ..default()
@@ -158,11 +151,9 @@ pub fn setup(mut commands: Commands, _asset_server: Res<AssetServer>) {
         },
     );
     
-    // Spawn the top left and top right labels
     commands.spawn((top_left_label_node, MainGame, HealthLabel));
     commands.spawn((top_right_label_node, MainGame, ScoreLabel));
 
-	// Create a parent container and then spawn the hint label inside it
     let centered_container = commands.spawn(centered_container_node).id();
     let hint_label = commands.spawn((hint_label_node, MainGame, HintLabel)).id();
 
@@ -173,10 +164,10 @@ pub fn setup(mut commands: Commands, _asset_server: Res<AssetServer>) {
 
 pub fn player_interact(
     keys: Res<ButtonInput<KeyCode>>,
-    mut player_query: Query<(&mut Player, &mut Transform)>, // Query to get Player and Transform
-    sky: Res<Sky>, // Res to access the Sky resource
+    mut player_query: Query<(&mut Player, &mut Transform)>, 
+    sky: Res<Sky>, 
     text_query: Query<&mut Text, With<AnswerButton>>,
-    button_query: Query<(&mut BackgroundColor, &mut BorderColor), With<Button>>, // Query to reset button colors
+    button_query: Query<(&mut BackgroundColor, &mut BorderColor), With<Button>>, 
 	constellation_line_query : Query<(Entity, &ConstellationLine)>,
 	commands: Commands,
     game_state: ResMut<NextState<GameState>>,
@@ -184,7 +175,7 @@ pub fn player_interact(
     materials: ResMut<Assets<StandardMaterial>>,
 ) {
     if let Ok((mut player, mut transform)) = player_query.get_single_mut() {
-        // If the space key was just pressed
+    
         if keys.just_pressed(KeyCode::Space) || player.target_cons_name.is_none() {
             choose_constellation(&mut player, sky, text_query, button_query, constellation_line_query, commands, game_state);
 			return
@@ -192,14 +183,12 @@ pub fn player_interact(
 
         let mut rotation = Quat::IDENTITY;
         
-        // Rotate left when the A key is pressed
         if keys.pressed(KeyCode::KeyA) {
-            rotation *= Quat::from_rotation_y((PI / 60.0) as f32); // Rotate by 3 degrees (PI/60 radians)
+            rotation *= Quat::from_rotation_y((PI / 60.0) as f32); 
         }
 
-        // Rotate right when the D key is pressed
         if keys.pressed(KeyCode::KeyD) {
-            rotation *= Quat::from_rotation_y((-PI / 60.0) as f32); // Rotate by -3 degrees
+            rotation *= Quat::from_rotation_y((-PI / 60.0) as f32); 
         }
 
         if keys.pressed(KeyCode::KeyI) && player.state == PlayerState::Playing {
@@ -209,9 +198,8 @@ pub fn player_interact(
     		}
  		}
 
-        // Apply the rotation to the transform
         if rotation != Quat::IDENTITY {
-            transform.rotation *= rotation; // Apply the rotation
+            transform.rotation *= rotation; 
             player.target_rotation = None;
         }
 
@@ -238,12 +226,10 @@ pub fn ui_labels(
     mut player_query: Query<(&mut Player, &mut Transform)>,
 ) {
     if let Ok((player, _)) = player_query.get_single_mut() {
-        // Update the health label
         if let Ok(mut health_text) = param_set.p0().get_single_mut() {
             health_text.sections[0].value = "# ".repeat(player.health);
         }
 
-        // Update the score label
         if let Ok(mut score_text) = param_set.p1().get_single_mut() {
             score_text.sections[0].value = format!("{}", player.score);
         }
@@ -343,15 +329,14 @@ pub fn ui_buttons(
 
 fn choose_constellation(
 	player: &mut Player, 
-	sky: Res<Sky>, // Res to access the Sky resource
+	sky: Res<Sky>, 
     mut text_query: Query<&mut Text, With<AnswerButton>>,
-    mut button_query: Query<(&mut BackgroundColor, &mut BorderColor), With<Button>>, // Query to reset button colors
+    mut button_query: Query<(&mut BackgroundColor, &mut BorderColor), With<Button>>, 
 	constellation_line_query : Query<(Entity, &ConstellationLine)>,
 	mut commands: Commands,
     mut game_state: ResMut<NextState<GameState>>
 ) {
 	if player.health == 0 {
-		info!("dead");
 		game_state.set(GameState::End);
 	}
 	if sky.content.len() >= 4 {
diff --git a/src/main.rs b/src/main.rs
index d4d3611..2083765 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -2,8 +2,6 @@ use bevy::prelude::*;
 use bevy::math::*;
 use bevy::render::render_resource::PrimitiveTopology;
 use bevy::render::render_asset::RenderAssetUsages;
-use std::fs::File;
-use std::io::Read;
 use serde::{Deserialize, Serialize};
 use std::f64::consts::PI;
 
@@ -138,9 +136,8 @@ fn spawn_cons_lines(
     sky: Res<Sky>,
    	target_constellation_name: String,
 ) {
-    // Create a material for the line
     let line_material = materials.add(StandardMaterial {
-        emissive: LinearRgba::rgb(0.5, 0.5, 1.0), // Red color for the line
+        emissive: LinearRgba::rgb(0.5, 0.5, 1.0),
         ..default()
     });
 
@@ -160,7 +157,6 @@ fn spawn_cons_lines(
     	}
     }
 
-    // Create the mesh and add the vertices
     let mut mesh = Mesh::new(PrimitiveTopology::LineList, RenderAssetUsages::RENDER_WORLD);
     mesh.insert_attribute(Mesh::ATTRIBUTE_POSITION, vertices);
     
@@ -168,7 +164,7 @@ fn spawn_cons_lines(
 	    PbrBundle {
 	        mesh: meshes.add(mesh),
 	        material: line_material.clone(),
-	        transform: Transform::default(), // Position and scale for the line
+	        transform: Transform::default(),
 	        ..default()
 	    },
 	 	ConstellationLine,
@@ -181,14 +177,12 @@ fn star_setup(
     mut meshes: ResMut<Assets<Mesh>>,
     mut materials: ResMut<Assets<StandardMaterial>>,
 ) {
-    // plane
     commands.insert_resource(ClearColor(Color::BLACK));
 
 	let stars = get_stars().unwrap();
 
-    //let mesh = meshes.add(Cuboid::new(star_size, star_size, star_size));
 	let star_mesh = meshes.add(Sphere::new(1.0).mesh().ico(3).unwrap());
-    //let material = materials.add(Color::srgb(1.0, 1.0, 1.0));
+	
 	let star_material = materials.add(StandardMaterial {
             emissive: LinearRgba::rgb(1.0, 1.0, 1.0),
             ..default()
@@ -218,9 +212,7 @@ fn star_setup(
 }
 
 fn get_stars() -> std::io::Result<Vec<StarData>> {
-    let mut file = File::open("data/stars.json")?;
-    let mut data = String::new();
-    file.read_to_string(&mut data)?;
+    let data = include_str!("../data/stars.json");
 
     let stars: Vec<StarData> = serde_json::from_str(&data).unwrap();
 
@@ -266,9 +258,7 @@ fn cons_setup(mut sky: ResMut<Sky>) {
 }
 
 fn get_cons() -> std::io::Result<Vec<Constellation>> {
-	let mut file = File::open("data/constellations.json")?;
-    let mut data = String::new();
-    file.read_to_string(&mut data)?;
+	let data = include_str!("../data/constellations.json");
 
     let sky_data: Vec<Constellation> = serde_json::from_str(&data).unwrap();
 
diff --git a/src/start_state.rs b/src/start_state.rs
index 4657b3e..c9a6d91 100644
--- a/src/start_state.rs
+++ b/src/start_state.rs
@@ -15,51 +15,44 @@ pub fn audio_setup(asset_server: Res<AssetServer>, mut commands: Commands) {
 }
 
 pub fn setup(mut commands: Commands, _asset_server: Res<AssetServer>) {
-    // Create a container node that places its children (text areas) in a vertical column and centers them
     let container_node = NodeBundle {
         style: Style {
-            width: Val::Percent(100.0),  // Full width of the screen
-            height: Val::Percent(100.0), // Full height of the screen
-            flex_direction: FlexDirection::Column, // Arrange children in a column (vertical)
-            justify_content: JustifyContent::Center, // Center vertically
-            align_items: AlignItems::Center, // Center horizontally
+            width: Val::Percent(100.0), 
+            height: Val::Percent(100.0),
+            flex_direction: FlexDirection::Column, 
+            justify_content: JustifyContent::Center,
+            align_items: AlignItems::Center,
             ..default()
         },
         ..default()
     };
 
-    // Create the container for the text areas
     let container = commands.spawn(container_node).id();
 
-    // TextStyle for the top text (larger font)
     let top_text_style = TextStyle {
-        font_size: 50.0, // Larger font size
+        font_size: 50.0, 
         color: Color::WHITE,
         // font: asset_server.load("fonts/FiraSans-Bold.ttf"), // Load font if needed
         ..default()
     };
 
-    // TextStyle for the bottom text (smaller font)
     let bottom_text_style = TextStyle {
-        font_size: 30.0, // Smaller font size
+        font_size: 30.0, 
         color: Color::WHITE,
         // font: asset_server.load("fonts/FiraSans-Regular.ttf"), // Load font if needed
         ..default()
     };
 
-    // TextBundle for the top text
     let top_text_node = TextBundle::from_section(
-        "Astraea", // Text for the top section
+        "Astraea", 
         top_text_style,
     );
 
-    // TextBundle for the bottom text
     let bottom_text_node = TextBundle::from_section(
-        "Press Space to Begin", // Text for the bottom section
+        "Press Space to Begin", 
         bottom_text_style,
     );
 
-    // Spawn the text nodes and add them as children to the container
     let top_text = commands.spawn((top_text_node, StartMenu)).id();
     let bottom_text = commands.spawn((bottom_text_node, StartMenu)).id();
 
@@ -94,8 +87,8 @@ pub fn player_interact(
 
 	if let Ok((_player, mut transform)) = player_query.get_single_mut() {
 		let mut rotation = Quat::IDENTITY;
-		rotation *= Quat::from_rotation_y((PI / 6000.0) as f32); // Rotate by 3 degrees (PI/60 radians)
-	    rotation *= Quat::from_rotation_x((-PI / 2000.0) as f32); // Rotate by -3 degrees
-	    transform.rotation *= rotation; // Apply the rotation
+		rotation *= Quat::from_rotation_y((PI / 6000.0) as f32);
+	    rotation *= Quat::from_rotation_x((-PI / 2000.0) as f32);
+	    transform.rotation *= rotation; 
 	}
 }