aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorbnewbold <bnewbold@robocracy.org>2016-06-20 23:33:48 -0400
committerbnewbold <bnewbold@robocracy.org>2016-06-20 23:34:21 -0400
commit5d99c766dcacb264eee551e27eb24b1423f7d427 (patch)
treed00f84f13cf1555dc531d3ecba306ff6f7ad52dc /src
parentec0599a07389a444cd2a05ca48abf17e0783ae36 (diff)
downloadexuberant-hacks-5d99c766dcacb264eee551e27eb24b1423f7d427.tar.gz
exuberant-hacks-5d99c766dcacb264eee551e27eb24b1423f7d427.zip
rename to 'exuberant_hacks'; bump to 0.2
Repo and project is named "exuberant-hacks"; Rust module can't have '-', so it's "exuberant_hacks". Also bumped version to 0.2.
Diffstat (limited to 'src')
-rw-r--r--src/bin/exuberantbovines.rs13
-rw-r--r--src/bin/exuberantplasma.rs10
-rw-r--r--src/lib.rs2
3 files changed, 13 insertions, 12 deletions
diff --git a/src/bin/exuberantbovines.rs b/src/bin/exuberantbovines.rs
index e07f28c..6cb51f4 100644
--- a/src/bin/exuberantbovines.rs
+++ b/src/bin/exuberantbovines.rs
@@ -1,11 +1,12 @@
-extern crate exuberant;
+extern crate exuberant_hacks;
extern crate getopts;
#[macro_use]
extern crate glium;
-use exuberant::ExuberantHack;
+use exuberant_hacks::{ExuberantHack, run_hack, main_helper, make_display};
+use exuberant_hacks::util;
use getopts::Options;
use glium::Surface;
@@ -131,7 +132,7 @@ impl ExuberantHack for ExuberantBovines {
let light = [-1.0, 0.4, 0.9f32];
- let view = exuberant::util::view_matrix(&[2.0, -1.0, 1.0], &[-2.0, 1.0, 1.0], &[0.0, 1.0, 0.0]);
+ let view = util::view_matrix(&[2.0, -1.0, 1.0], &[-2.0, 1.0, 1.0], &[0.0, 1.0, 0.0]);
let uniforms = uniform! {
model: [
[ 0.3, 0.0, 0.0, 0.0 ],
@@ -181,12 +182,12 @@ fn main() {
opts.optopt("s", "speed", "how fast? ratio, with 1.0 as normal (IGNORED)", "NUM");
opts.optflag("", "wireframe", "wireframe mode (IGNORED)");
- let conf = exuberant::main_helper(opts);
- let dislpay = exuberant::make_display(&conf);
+ let conf = main_helper(opts);
+ let dislpay = make_display(&conf);
let mut hack = ExuberantBovines::new(dislpay);
// Here is where you would configure the hack based on command line options
// Ok, actually run it (loops forever)
- exuberant::run(&mut hack, &conf);
+ run_hack(&mut hack, &conf);
}
diff --git a/src/bin/exuberantplasma.rs b/src/bin/exuberantplasma.rs
index 5d49a56..3607693 100644
--- a/src/bin/exuberantplasma.rs
+++ b/src/bin/exuberantplasma.rs
@@ -1,11 +1,11 @@
-extern crate exuberant;
+extern crate exuberant_hacks;
extern crate getopts;
#[macro_use]
extern crate glium;
-use exuberant::ExuberantHack;
+use exuberant_hacks::{ExuberantHack, run_hack, main_helper, make_display};
use getopts::Options;
use glium::Surface;
@@ -123,12 +123,12 @@ fn main() {
opts.optopt("s", "speed", "how fast? ratio, with 1.0 as normal (IGNORED)", "NUM");
opts.optflag("", "wireframe", "wireframe mode (IGNORED)");
- let conf = exuberant::main_helper(opts);
- let dislpay = exuberant::make_display(&conf);
+ let conf = main_helper(opts);
+ let dislpay = make_display(&conf);
let mut hack = ExuberantPlasma::new(dislpay);
// Here is where you would configure the hack based on command line options
// Ok, actually run it (loops forever)
- exuberant::run(&mut hack, &conf);
+ run_hack(&mut hack, &conf);
}
diff --git a/src/lib.rs b/src/lib.rs
index 73b4249..82b2851 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -28,7 +28,7 @@ pub fn print_usage(opts: &Options) {
}
/// Executes a hack
-pub fn run(hack: &mut ExuberantHack, conf: &Matches) {
+pub fn run_hack(hack: &mut ExuberantHack, conf: &Matches) {
loop {
hack.draw_frame(time::precise_time_s()).ok();