projects
/
mandelwow.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Convert bounding_box to a struct.
[mandelwow.git]
/
main.rs
diff --git
a/main.rs
b/main.rs
index 9c223c90973673d8493c6d7b780642ecc2d933d6..8315a3b2fbe0dbe827e31419ce61d93ae94491f0 100644
(file)
--- a/
main.rs
+++ b/
main.rs
@@
-105,6
+105,7
@@
fn main() {
zmin: -1.1,
zmax: 1.1,
};
zmin: -1.1,
zmax: 1.1,
};
+ let mandelwow_bbox = bounding_box::BoundingBox::new(&display, &bounds, &bounding_box_program);
set_main_loop_callback(|| {
camera.update();
set_main_loop_callback(|| {
camera.update();
@@
-126,7
+127,7
@@
fn main() {
frame.clear_color_and_depth((0.0, 0.0, 0.0, 1.0), 1.0);
let rotation = cgmath::Matrix4::from(
frame.clear_color_and_depth((0.0, 0.0, 0.0, 1.0), 1.0);
let rotation = cgmath::Matrix4::from(
- Euler { x: Rad(t.sin() / 3.), y: Rad(t.sin() / 2.), z: Rad(t)});
+ Euler { x: Rad(t.sin() / 3.), y: Rad(t.sin() / 2.), z: Rad(t
/ 1.5
)});
let z_trans = -2.0; // Send the model back a little bit so it fits the screen.
let model2 =
Matrix4::from_translation(Vector3::unit_z() * z_trans) * rotation;
let z_trans = -2.0; // Send the model back a little bit so it fits the screen.
let model2 =
Matrix4::from_translation(Vector3::unit_z() * z_trans) * rotation;
@@
-140,7
+141,7
@@
fn main() {
view: camera.get_view(),
perspective: camera.get_perspective(),
};
view: camera.get_view(),
perspective: camera.get_perspective(),
};
-
bounding_box::draw(&display, &mut frame, &bounding_box_program, &uniforms, &bound
s);
+
mandelwow_bbox.draw(&mut frame, &uniform
s);
}
mandelwow::draw(&display, &mut frame, &mandelwow_program, model, &camera, &bounds, wow);
}
mandelwow::draw(&display, &mut frame, &mandelwow_program, model, &camera, &bounds, wow);