From 784b9d8fa1df8098b052eaf25c1eaf8abf28c828 Mon Sep 17 00:00:00 2001 From: Ben Foppa Date: Fri, 18 Jul 2014 11:55:53 -0400 Subject: [PATCH 1/2] Fix inverted asserts --- src/projection.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/projection.rs b/src/projection.rs index 7f05663..9ed41c0 100644 --- a/src/projection.rs +++ b/src/projection.rs @@ -159,9 +159,9 @@ impl Projection for Perspective { impl ToMatrix4 for Perspective { fn to_matrix4(&self) -> Matrix4 { - assert!(self.left > self.right, "`left` cannot be greater than `right`, found: left: {} right: {}", self.left, self.right); - assert!(self.bottom > self.top, "`bottom` cannot be greater than `top`, found: bottom: {} top: {}", self.bottom, self.top); - assert!(self.near > self.far, "`near` cannot be greater than `far`, found: near: {} far: {}", self.near, self.far); + assert!(self.left <= self.right, "`left` cannot be greater than `right`, found: left: {} right: {}", self.left, self.right); + assert!(self.bottom <= self.top, "`bottom` cannot be greater than `top`, found: bottom: {} top: {}", self.bottom, self.top); + assert!(self.near <= self.far, "`near` cannot be greater than `far`, found: near: {} far: {}", self.near, self.far); let two: S = cast(2i).unwrap(); From 44f3647b9a3a98f4b27bb5f91a1ad505efb4a073 Mon Sep 17 00:00:00 2001 From: Ben Foppa Date: Mon, 21 Jul 2014 17:08:43 -0400 Subject: [PATCH 2/2] fix travis build --- .travis.yml | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7342796..6205c56 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,12 +21,8 @@ before_install: - yes | sudo add-apt-repository ppa:cmrx64/cargo - sudo apt-get update install: - # cargo - - sudo apt-get install cargo - # rustc - - curl http://static.rust-lang.org/cargo-dist/cargo-nightly-linux.tar.gz | - sudo tar --strip-components 1 -C /usr -xzf - - - curl http://www.rust-lang.org/rustup.sh | sudo sh - + - wget http://www.rust-lang.org/rustup.sh + - sudo sh ./rustup.sh - rustc -v script: - cargo build @@ -36,4 +32,6 @@ script: - make clean - make doc after_script: - - curl http://www.rust-ci.org/artifacts/put?t=$RUSTCI_TOKEN | sh + - wget -O after_script.sh http://www.rust-ci.org/artifacts/put?t=$RUSTCI_TOKEN + - chmod +x after_script.sh + - sh ./after_script.sh