Skip to content

Commit

Permalink
made graphs start drawing from the right
Browse files Browse the repository at this point in the history
fixes #29
  • Loading branch information
mkhan45 committed Aug 22, 2020
1 parent c6347f5 commit 0b56c7b
Show file tree
Hide file tree
Showing 4 changed files with 35 additions and 22 deletions.
36 changes: 18 additions & 18 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[package]
name = "physics-engine-v2"
name = "simple_mechanics"
version = "1.0.1"
authors = ["Mikail Khan <[email protected]>"]
edition = "2018"
Expand Down
1 change: 1 addition & 0 deletions lua/collisionlab.lua
Original file line number Diff line number Diff line change
Expand Up @@ -25,3 +25,4 @@ make_row({elA = 0, elB = 0, mA = 1, mB = 1, vA = 5, vB = 0, y_pos = (rad * 2 + 1
make_row({elA = 0, elB = 0, mA = 1, mB = 5, vA = 5, vB = 0, y_pos = (rad * 2 + 1) * 4})

PAUSED = true
GRAVITY = 0
18 changes: 15 additions & 3 deletions src/gui/graphs.rs
Original file line number Diff line number Diff line change
Expand Up @@ -92,12 +92,24 @@ impl Graph for dyn LineGraph {
}),
};

let transformed_points = s0
let x_offset = {
let self_len = {
let points = self.points();
points.0.len() + points.1.len()
};
let frac_completed = self_len as f32 / self.max_len() as f32;

(1.0 - frac_completed) * 10.0
};

let mut transformed_points = s0
.iter()
.chain(s1.iter())
.map(|[x, v]| [*x, 5.5 - (v - midpoint) * scale_fac])
.map(|[x, v]| [x_offset + dbg!(*x), 5.5 - (v - midpoint) * scale_fac])
.collect::<Vec<[f32; 2]>>();

transformed_points.pop();

builder
.line(transformed_points.as_slice(), 0.1, color)
.unwrap();
Expand Down Expand Up @@ -137,7 +149,7 @@ macro_rules! create_linegraph {

fn add_val(&mut self, val: f32) {
let num_vals = self.data.len() + 1;
let step_incr = 10.0 / num_vals as f32;
let step_incr = 10.0 / self.max_len() as f32;

self.data.iter_mut().enumerate().for_each(|(i, [x, _])| {
*x = step_incr * i as f32;
Expand Down

0 comments on commit 0b56c7b

Please sign in to comment.