Fix collision of omath::vec and core::vec
This commit is contained in:
parent
9c3dbc2658
commit
5d8319fff0
8 changed files with 19 additions and 19 deletions
|
@ -1,8 +1,8 @@
|
|||
use std::cmp::FuzzyEq;
|
||||
use cmp::Eq;
|
||||
use math::Sqrt;
|
||||
use quat::Quat;
|
||||
use vec::*;
|
||||
use quaternion::Quat;
|
||||
use vector::*;
|
||||
|
||||
//
|
||||
// NxN Matrix
|
12
src/omath.rc
12
src/omath.rc
|
@ -7,17 +7,17 @@
|
|||
|
||||
extern mod std;
|
||||
|
||||
pub mod mat;
|
||||
pub mod matrix;
|
||||
pub mod math;
|
||||
pub mod projection;
|
||||
pub mod quat;
|
||||
pub mod vec;
|
||||
pub mod quaternion;
|
||||
pub mod vector;
|
||||
|
||||
#[test]
|
||||
pub mod test {
|
||||
pub mod test_mat;
|
||||
pub mod test_matrix;
|
||||
pub mod test_math;
|
||||
pub mod test_projection;
|
||||
pub mod test_quat;
|
||||
pub mod test_vec;
|
||||
pub mod test_quaternion;
|
||||
pub mod test_vector;
|
||||
}
|
|
@ -1,6 +1,6 @@
|
|||
use float::consts::pi;
|
||||
use float::tan;
|
||||
use mat::Mat4;
|
||||
use matrix::Mat4;
|
||||
|
||||
//
|
||||
// Create a perspective projection matrix
|
||||
|
|
|
@ -1,11 +1,11 @@
|
|||
use cast::transmute;
|
||||
use core::vec::raw::buf_as_slice; // for some reason we need to specify the core module here
|
||||
use vec::raw::buf_as_slice;
|
||||
use ptr::to_unsafe_ptr;
|
||||
use cmp::Eq;
|
||||
use std::cmp::FuzzyEq;
|
||||
use math::*;
|
||||
use mat::{Mat3, Mat4};
|
||||
use vec::Vec3;
|
||||
use matrix::{Mat3, Mat4};
|
||||
use vector::Vec3;
|
||||
|
||||
//
|
||||
// Quaternion
|
|
@ -1,5 +1,5 @@
|
|||
use mat::*;
|
||||
use vec::*;
|
||||
use matrix::*;
|
||||
use vector::*;
|
||||
|
||||
// TODO
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
use mat::*;
|
||||
use quat::*;
|
||||
use vec::*;
|
||||
use matrix::*;
|
||||
use quaternion::*;
|
||||
use vector::*;
|
||||
|
||||
// TODO
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
use std::cmp::FuzzyEq;
|
||||
use vec::*;
|
||||
use vector::*;
|
||||
|
||||
// TODO
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
use cast::transmute;
|
||||
use core::vec::raw::buf_as_slice; // for some reason we need to specify the core module here
|
||||
use vec::raw::buf_as_slice;
|
||||
use ptr::to_unsafe_ptr;
|
||||
use cmp::Eq;
|
||||
use std::cmp::FuzzyEq;
|
Loading…
Reference in a new issue