Merge pull request #91 from cmr/master

Update for Cargo

.travis.yml

@@ -17,13 +17,16 @@ env:
   global:
     - secure: N41M4QTWbez7FRMh2HQqB3Z051FcruoRGLTdMdQJNMaZRqJiAfUBTO5NGXS5XGjIofknE4r/+WLv7KED2rTf6nvLFOHmGY2pL+agABcyD0DU0ltRLckjONWTxFN+SMTB0l38v3XIXxXX5y977Hl6wk3++kYZgCNVG3OTkJwWzQg=
 before_install:
+  - yes | sudo add-apt-repository ppa:cmrx64/cargo
   - sudo apt-get update
 install:
+  - sudo apt-get install cargo
   - wget http://static.rust-lang.org/dist/rust-nightly-x86_64-unknown-linux-gnu.tar.gz
   - tar xzf rust-nightly-x86_64-unknown-linux-gnu.tar.gz
   - export PATH=$PATH:$(pwd)/rust-nightly-x86_64-unknown-linux-gnu/bin
   - rustc -v
 script:
+  - cargo build
   - make
 #  - make check     # bench is too slow
   - make test

Cargo.toml

@@ -0,0 +1,18 @@
+[package]
+
+name = "cgmath-rs"
+version = "0.0.1"
+authors = ["Brendan Zabarauskas <bjzaba@yahoo.com.au>",
+        "Brian Heylin",
+        "Colin Sherratt",
+        "Dzmitry Malyshau",
+        "Erick Tryzelaar",
+        "Luqman Aden",
+        "Maik Klein",
+        "Mikko Perttunen",
+        "Tomasz Stachowiak"
+]
+
+[[lib]]
+
+name = "cgmath"

Makefile

@@ -17,7 +17,7 @@ RUSTC               = rustc
 RUSTDOC             = rustdoc
 
 SRC_DIR             = src
-LIB_FILE            = $(SRC_DIR)/cgmath/lib.rs
+LIB_FILE            = $(SRC_DIR)/cgmath.rs
 TEST_FILE           = $(SRC_DIR)/test/test.rs
 BENCH_FILE          = $(SRC_DIR)/bench/bench.rs
 

src/test/transform.rs

@@ -22,9 +22,13 @@ use cgmath::approx::ApproxEq;
 #[test]
 fn test_invert() {
 	let v = Vector3::new(1.0, 2.0, 3.0);
-	let t = Transform3D::new(1.5, Quaternion::new(0.5,0.5,0.5,0.5), Vector3::new(6.0,-7.0,8.0));
+	let t = Decomposed {
-	let ti = t.get().invert().expect("Expected successful inversion");
+        scale: 1.5,
-	let vt = t.get().transform_vector( &v );
+        rot: Quaternion::new(0.5,0.5,0.5,0.5),
+        disp: Vector3::new(6.0,-7.0,8.0)
+    };
+	let ti = t.invert().expect("Expected successful inversion");
+	let vt = t.transform_vector( &v );
     assert!(v.approx_eq( &ti.transform_vector( &vt ) ));
 }