Merge pull request #192 from raylib-rs/master

Sync sample changes

Author: Dacode45

.gitmodules

@@ -1,4 +1,3 @@
 [submodule "raylib-sys/raylib"]
 	path = raylib-sys/raylib
 	url = https://github.com/raysan5/raylib
-	branch = "5.0"

Cargo.toml

@@ -1,3 +1,3 @@
 [workspace]
 members = ["raylib", "raylib-sys"]
-exclude = ["raylib-test"]
+exclude = ["raylib-test", "samples"]

README.md

@@ -1,6 +1,6 @@
 [package]
 name = "raylib-sys"
-version = "5.0.0"
+version = "5.0.1"
 authors = ["DeltaPHC <[email protected]>"]
 license = "Zlib"
 description = "Raw FFI bindings for Raylib"

raylib-sys/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "raylib-test"
-version = "5.0.0"
+version = "5.0.1"
 authors = ["David Ayeke"]
 edition = "2018"
 license = "Zlib"

raylib-test/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "raylib"
-version = "5.0.0"
+version = "5.0.1"
 authors = ["DeltaPHC <[email protected]>"]
 license = "Zlib"
 readme = "../README.md"

raylib/Cargo.toml

@@ -0,0 +1 @@
+/target

samples/.gitignore

@@ -14,13 +14,13 @@ struct Column {
 impl Column {
     fn create_random() -> Column {
         let mut rng = rand::thread_rng();
-        let height: f32 = rng.gen_range(1.0..12.0);
+        let height: f32 = rng.gen_range(1.0, 12.0);
         let position = Vector3::new(
-            rng.gen_range(-15.0..15.0),
+            rng.gen_range(-15.0, 15.0),
             height / 2.0,
-            rng.gen_range(-15.0..15.0),
+            rng.gen_range(-15.0, 15.0),
         );
-        let color = Color::new(rng.gen_range(20..255), rng.gen_range(10..55), 30, 255);
+        let color = Color::new(rng.gen_range(20, 255), rng.gen_range(10, 55), 30, 255);
 
         Column {
             height,

samples/3d_camera_first_person.rs

@@ -1,6 +1,6 @@
 [package]
 name = "raylib-examples"
-version = "3.7.0"
+version = "5.0.1"
 authors = ["David Ayeke"]
 edition = "2018"
 license = "Zlib"
@@ -9,11 +9,11 @@ repository = "https://github.com/raylib-rs/raylib-rs"
 
 
 [dependencies]
-raylib = { version = "3.7", path = "../raylib" }
+raylib = { version = "5.0", path = "../raylib" }
 structopt = "0.2"
 specs-derive = "0.4.1"
 rand = "0.7"
-tcod = "0.15"
+#tcod = "0.14"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 arr_macro = "0.1.3"
@@ -64,10 +64,6 @@ path = "./texture.rs"
 name = "yaw_pitch_roll"
 path = "yaw_pitch_roll.rs"
 
-[[bin]]
-name = "roguelike"
-path = "roguelike.rs"
-
 [[bin]]
 name = "input"
 path = "input.rs"

samples/Cargo.toml

@@ -4,7 +4,7 @@ use structopt::StructOpt;
 
 mod options;
 
-const SHADER: &str = include_str!("../../static/raymarching.fs");
+const SHADER: &str = include_str!("static/raymarching.fs");
 
 pub fn main() {
     let opt = options::Opt::from_args();