From 5d99c766dcacb264eee551e27eb24b1423f7d427 Mon Sep 17 00:00:00 2001 From: bnewbold Date: Mon, 20 Jun 2016 23:33:48 -0400 Subject: 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. --- Cargo.lock | 4 ++-- Cargo.toml | 4 ++-- README.md | 15 +++++++-------- src/bin/exuberantbovines.rs | 13 +++++++------ src/bin/exuberantplasma.rs | 10 +++++----- src/lib.rs | 2 +- 6 files changed, 24 insertions(+), 24 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 384881e..e55cfd0 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1,6 +1,6 @@ [root] -name = "exuberant" -version = "0.1.0" +name = "exuberant_hacks" +version = "0.2.0" dependencies = [ "getopts 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)", "glium 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/Cargo.toml b/Cargo.toml index 1652bad..fabd392 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] -name = "exuberant" -version = "0.1.0" +name = "exuberant_hacks" +version = "0.2.0" authors = ["bnewbold "] [dependencies] diff --git a/README.md b/README.md index 4f33caa..feec517 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,10 @@ - _ _ _ _ _ - _____ ___ _| |__ ___ _ __ __ _ _ __ | |_ | |__ _____ _(_)_ __ ___ ___| | - / _ \ \/ / | | | '_ \ / _ \ '__/ _` | '_ \| __| | '_ \ / _ \ \ / / | '_ \ / _ \/ __| | -| __/> <| |_| | |_) | __/ | | (_| | | | | |_ | |_) | (_) \ V /| | | | | __/\__ \_| - \___/_/\_\\__,_|_.__/ \___|_| \__,_|_| |_|\__| |_.__/ \___/ \_/ |_|_| |_|\___||___(_) - - +
+                 _                          _     _                _        _ 
+  _____  ___   _| |__   ___ _ __ __ _ _ __ | |_  | |__   __ _  ___| | _____| |
+ / _ \ \/ / | | | '_ \ / _ \ '__/ _` | '_ \| __| | '_ \ / _` |/ __| |/ / __| |
+|  __/>  <| |_| | |_) |  __/ | | (_| | | | | |_  | | | | (_| | (__|   <\__ \_|
+ \___/_/\_\\__,_|_.__/ \___|_|  \__,_|_| |_|\__| |_| |_|\__,_|\___|_|\_\___(_)
### Build Dependencies and Installation @@ -44,7 +43,7 @@ As a workaround until there is a solution in upstream `glutin`, use the "depende Checkout the `feature-existing` branch from `https://github.com/bnewbold/glutin`, then, under this directory -(exuberant-bovines), create a `.cargo/config` file with a path like: +(exuberant-hacks), create a `.cargo/config` file with a path like: paths = ["/home/bnewbold/src/glutin"] 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(); -- cgit v1.2.3