Skip to content

Commit e95f0f2

Browse files
author
Dacode45
authored
Merge pull request #192 from raylib-rs/master
Sync sample changes
2 parents 4fc75d4 + 3659002 commit e95f0f2

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+33
-31
lines changed

.gitmodules

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
[submodule "raylib-sys/raylib"]
22
path = raylib-sys/raylib
33
url = https://github.com/raysan5/raylib
4-
branch = "5.0"

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
[workspace]
22
members = ["raylib", "raylib-sys"]
3-
exclude = ["raylib-test"]
3+
exclude = ["raylib-test", "samples"]

README.md

Lines changed: 1 addition & 1 deletion

raylib-sys/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "raylib-sys"
3-
version = "5.0.0"
3+
version = "5.0.1"
44
authors = ["DeltaPHC <phclem@protonmail.com>"]
55
license = "Zlib"
66
description = "Raw FFI bindings for Raylib"

raylib-test/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "raylib-test"
3-
version = "5.0.0"
3+
version = "5.0.1"
44
authors = ["David Ayeke"]
55
edition = "2018"
66
license = "Zlib"

raylib/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "raylib"
3-
version = "5.0.0"
3+
version = "5.0.1"
44
authors = ["DeltaPHC <phclem@protonmail.com>"]
55
license = "Zlib"
66
readme = "../README.md"

samples/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/target

samples/3d_camera_first_person.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@ struct Column {
1414
impl Column {
1515
fn create_random() -> Column {
1616
let mut rng = rand::thread_rng();
17-
let height: f32 = rng.gen_range(1.0..12.0);
17+
let height: f32 = rng.gen_range(1.0, 12.0);
1818
let position = Vector3::new(
19-
rng.gen_range(-15.0..15.0),
19+
rng.gen_range(-15.0, 15.0),
2020
height / 2.0,
21-
rng.gen_range(-15.0..15.0),
21+
rng.gen_range(-15.0, 15.0),
2222
);
23-
let color = Color::new(rng.gen_range(20..255), rng.gen_range(10..55), 30, 255);
23+
let color = Color::new(rng.gen_range(20, 255), rng.gen_range(10, 55), 30, 255);
2424

2525
Column {
2626
height,

samples/Cargo.toml

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "raylib-examples"
3-
version = "3.7.0"
3+
version = "5.0.1"
44
authors = ["David Ayeke"]
55
edition = "2018"
66
license = "Zlib"
@@ -9,11 +9,11 @@ repository = "https://github.com/raylib-rs/raylib-rs"
99

1010

1111
[dependencies]
12-
raylib = { version = "3.7", path = "../raylib" }
12+
raylib = { version = "5.0", path = "../raylib" }
1313
structopt = "0.2"
1414
specs-derive = "0.4.1"
1515
rand = "0.7"
16-
tcod = "0.15"
16+
#tcod = "0.14"
1717
serde = { version = "1.0", features = ["derive"] }
1818
serde_json = "1.0"
1919
arr_macro = "0.1.3"
@@ -64,10 +64,6 @@ path = "./texture.rs"
6464
name = "yaw_pitch_roll"
6565
path = "yaw_pitch_roll.rs"
6666

67-
[[bin]]
68-
name = "roguelike"
69-
path = "roguelike.rs"
70-
7167
[[bin]]
7268
name = "input"
7369
path = "input.rs"

samples/raymarch.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ use structopt::StructOpt;
44

55
mod options;
66

7-
const SHADER: &str = include_str!("../../static/raymarching.fs");
7+
const SHADER: &str = include_str!("static/raymarching.fs");
88

99
pub fn main() {
1010
let opt = options::Opt::from_args();

0 commit comments

Comments
 (0)