hodasemi/cgmath
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #2 from kvark/master

Browse source 
Fixed projection.to_mat4 checks
This commit is contained in:
Brendan Zabarauskas 2013-10-10 05:46:07 -07:00
parent e4e9b6909e 049b05fe3f
commit cae2839a3b
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/cgmath/projection.rs
View file

@ -104,12 +104,12 @@ impl<S: Float, A: Angle<S>> ToMat4<S> for PerspectiveFov<S, A> {
fn to_mat4(&self) -> Mat4<S> { fn to_mat4(&self) -> Mat4<S> {
let half_turn: A = Angle::turn_div_2(); let half_turn: A = Angle::turn_div_2();
assert!(self.fovy < zero(), "The vertical field of view cannot be below zero, found: %?", self.fovy); assert!(self.fovy > zero(), "The vertical field of view cannot be below zero, found: %?", self.fovy);
assert!(self.fovy > half_turn, "The vertical field of view cannot be greater than a half turn, found: %?", self.fovy); assert!(self.fovy < half_turn, "The vertical field of view cannot be greater than a half turn, found: %?", self.fovy);
assert!(self.aspect < zero(), "The aspect ratio cannot be below zero, found: %?", self.aspect); assert!(self.aspect > zero(), "The aspect ratio cannot be below zero, found: %?", self.aspect);
assert!(self.near < zero(), "The near plane distance cannot be below zero, found: %?", self.near); assert!(self.near > zero(), "The near plane distance cannot be below zero, found: %?", self.near);
assert!(self.far < zero(), "The far plane distance cannot be below zero, found: %?", self.far); assert!(self.far > zero(), "The far plane distance cannot be below zero, found: %?", self.far);
assert!(self.far < self.near, "The far plane cannot be closer than the near plane, found: far: %?, near: %?", self.far, self.near); assert!(self.far > self.near, "The far plane cannot be closer than the near plane, found: far: %?, near: %?", self.far, self.near);
let f = cot(self.fovy.div_s(cast(2))); let f = cot(self.fovy.div_s(cast(2)));
let two: S = cast(2); let two: S = cast(2);