X-Git-Url: http://git.dolda2000.com/gitweb/?a=blobdiff_plain;f=src%2Fcore%2Flevel%2Fmod.rs;h=cccd2538a4a1a69eafd3ddeed08ea2b3ed00ba60;hb=8065e2645a936275c7d69c6068d80ece598d6e57;hp=488cae16885769960ae2996215a359eb137283b1;hpb=8012f86b052f550fe6644ec33a2713f381fc4347;p=kaka%2Frust-sdl-test.git

diff --git a/src/core/level/mod.rs b/src/core/level/mod.rs
index 488cae1..cccd253 100644
--- a/src/core/level/mod.rs
+++ b/src/core/level/mod.rs
@@ -1,4 +1,4 @@
-use common::{Point, Dimension, Intersection, supercover_line};
+use common::{Point, Dimension, Intersection, Radians, supercover_line};
 use core::render::Renderer;
 use sprites::SpriteManager;
 use std::rc::Rc;
@@ -14,15 +14,15 @@ pub use self::lvlgen::LevelGenerator;
 pub struct Level {
     pub gravity: Point<f64>,
     pub grid: Grid<bool>,
-    walls: Vec<Rc<WallRegion>>,
+    walls: Vec<WallRegion>,
     wall_grid: Grid<Vec<Rc<WallEdge>>>,
 }
 
 impl Level {
-    pub fn new(gravity: Point<f64>, grid: Grid<bool>, mut walls: Vec<Rc<WallRegion>>) -> Self {
+    pub fn new(gravity: Point<f64>, grid: Grid<bool>, mut walls: Vec<WallRegion>) -> Self {
 	let size = (2560, 1440); // TODO: get actual size from walls or something
 	let wall_grid = Level::build_wall_grid(&mut walls, &size.into());
-	dbg!(&wall_grid.cell_size);
+	dbg!(&wall_grid.scale);
 	Level {
 	    gravity,
 	    grid,
@@ -32,14 +32,14 @@ impl Level {
     }
 
     /// Creates a grid of wall edges for fast lookup
-    fn build_wall_grid(walls: &mut Vec<Rc<WallRegion>>, lvlsize: &Dimension<usize>) -> Grid<Vec<Rc<WallEdge>>> {
+    fn build_wall_grid(walls: &mut Vec<WallRegion>, lvlsize: &Dimension<usize>) -> Grid<Vec<Rc<WallEdge>>> {
 	let size = dimen!(lvlsize.width / 20, lvlsize.height / 20); // TODO: make sure all walls fit within the grid bounds
 	let cs = point!(lvlsize.width / size.width, lvlsize.height / size.height);
-	//let cs = point!(cell_size.width as f64, cell_size.height as f64);
+	//let cs = point!(scale.width as f64, scale.height as f64);
 	let mut grid = Grid {
 	    cells: vec!(vec!(vec!(); size.height); size.width),
 	    size,
-	    cell_size: dimen!(cs.x, cs.y),
+	    scale: dimen!(cs.x as f64, cs.y as f64),
 	};
 
 	for wall in walls {
@@ -56,7 +56,7 @@ impl Level {
     pub fn render(&mut self, renderer: &mut Renderer, _sprites: &SpriteManager) {
 	// original grid
 	renderer.canvas().set_draw_color((64, 64, 64));
-	let size = &self.grid.cell_size;
+	let size = &self.grid.scale;
 	for x in 0..self.grid.size.width {
 	    for y in 0..self.grid.size.height {
 		if self.grid.cells[x][y] {
@@ -71,7 +71,7 @@ impl Level {
 
 	// wall grid
 	renderer.canvas().set_draw_color((0, 32, 0));
-	let size = &self.wall_grid.cell_size;
+	let size = &self.wall_grid.scale;
 	for x in 0..self.wall_grid.size.width {
 	    for y in 0..self.wall_grid.size.height {
 		if !self.wall_grid.cells[x][y].is_empty() {
@@ -89,6 +89,15 @@ impl Level {
 	// walls
 	for wall in &self.walls {
 	    for e in &wall.edges {
+		let c = (e.p1 + e.p2) / 2.0;
+		let mut rad = (e.p2 - e.p1).to_radians();
+		rad.0 += std::f64::consts::FRAC_PI_2;
+
+		renderer.draw_line(
+		    <(i32, i32)>::from(c.to_i32()),
+		    <(i32, i32)>::from((c + Point::from(rad) * 10.0).to_i32()),
+		    (255, 128, 0));
+
 		renderer.draw_line(
 		    <(i32, i32)>::from(e.p1.to_i32()),
 		    <(i32, i32)>::from(e.p2.to_i32()),
@@ -99,15 +108,13 @@ impl Level {
 
     pub fn intersect_walls(&self, p1: Point<f64>, p2: Point<f64>) -> IntersectResult {
 	for c in self.wall_grid.grid_coordinates_on_line(p1, p2) {
-	    if let walls = &self.wall_grid.cells[c.x][c.y] {
-		for w in walls {
-		    if let Intersection::Point(p) = Intersection::lines(p1, p2, w.p1, w.p2) {
-			let wall = Wall {
-			    region: &self.walls[w.region],
-			    edge: Rc::clone(&w),
-			};
-			return IntersectResult::Intersection(wall, p)
-		    }
+	    for w in &self.wall_grid.cells[c.x][c.y] {
+		if let Intersection::Point(p) = Intersection::lines(p1, p2, w.p1, w.p2) {
+		    let wall = Wall {
+			region: &self.walls[w.region],
+			edge: w,
+		    };
+		    return IntersectResult::Intersection(wall, p)
 		}
 	    }
 	}
@@ -115,8 +122,8 @@ impl Level {
     }
 }
 
-pub enum IntersectResult {
-    Intersection(Wall, Point<f64>),
+pub enum IntersectResult<'a> {
+    Intersection(Wall<'a>, Point<f64>),
     None
 }
 
@@ -125,7 +132,7 @@ pub enum IntersectResult {
 #[derive(Debug, Default)]
 pub struct Grid<T> {
     pub size: Dimension<usize>,
-    pub cell_size: Dimension<usize>,
+    pub scale: Dimension<f64>,
     pub cells: Vec<Vec<T>>,
 }
 
@@ -154,8 +161,7 @@ impl<T> Grid<T> {
 
     /// Returns a list of grid coordinates that a line in world coordinates passes through.
     pub fn grid_coordinates_on_line(&self, p1: Point<f64>, p2: Point<f64>) -> Vec<Point<usize>> {
-	let scale = (self.cell_size.width as f64, self.cell_size.height as f64);
-	supercover_line(p1 / scale, p2 / scale)
+	supercover_line(p1 / self.scale, p2 / self.scale)
 	    .iter()
 	    .map(|c| self.to_grid_coordinate(*c))
 	    .flatten()
@@ -171,46 +177,80 @@ pub struct WallRegion {
 }
 
 impl WallRegion {
-    pub fn new(points: Vec<Point<f64>>) -> Rc<Self> {
+    pub fn new(points: Vec<Point<f64>>) -> Self {
+	let index: RegionIndex = 0; // use as param
 	let mut edges = Vec::with_capacity(points.len());
 
 	for i in 0..points.len() {
 	    let edge = Rc::new(WallEdge {
-		index: i,
+		region: index,
+		id: i,
 		p1: points[i],
 		p2: points[(i + 1) % points.len()],
 	    });
 	    edges.push(edge);
 	}
 
-	Rc::new(WallRegion { edges })
+	WallRegion { edges }
     }
 
-    #[allow(dead_code)]
-    fn next(&self, index: usize) -> Rc<WallEdge> {
-	let index = (index + 1) % self.edges.len();
-	Rc::clone(&self.edges[index])
-    }
+    // #[allow(dead_code)]
+    // fn next(&self, index: EdgeIndex) -> Rc<WallEdge> {
+    // 	let index = (index + 1) % self.edges.len();
+    // 	Rc::clone(&self.edges[index])
+    // }
 
-    #[allow(dead_code)]
-    fn previous(&self, index: usize) -> Rc<WallEdge> {
-	let index = (index + self.edges.len() + 1) % self.edges.len();
-	Rc::clone(&self.edges[index])
-    }
+    // #[allow(dead_code)]
+    // fn previous(&self, index: EdgeIndex) -> Rc<WallEdge> {
+    // 	let index = (index + self.edges.len() + 1) % self.edges.len();
+    // 	Rc::clone(&self.edges[index])
+    // }
 }
 
 ////////// WALL EDGE ///////////////////////////////////////////////////////////
 
+type RegionIndex = usize;
+type EdgeIndex = usize;
+
 #[derive(Debug, Default)]
 struct WallEdge {
-    index: usize,
+    region: RegionIndex,
+    id: EdgeIndex,
     pub p1: Point<f64>,
     pub p2: Point<f64>,
 }
 
 ////////// WALL ////////////////////////////////////////////////////////////////
 
-pub struct Wall {
-//    region: Rc<WallRegion>,
-    edge: Rc<WallEdge>,
+/// kommer det här att fungera ifall nåt objekt ska spara en referens till Wall?
+/// kanske istället ska lägga Vec<WallRegion> i en Rc<Walls> och skicka med en klon av den, samt id:n till regionen och väggen?
+pub struct Wall<'a> {
+    region: &'a WallRegion,
+    edge: &'a WallEdge,
+}
+
+impl<'a> Wall<'a> {
+    pub fn next(&self) -> Wall<'a> {
+	let next = (self.edge.id + 1) % self.region.edges.len();
+	let edge = &self.region.edges[next];
+	Wall {
+	    region: self.region,
+	    edge,
+	}
+    }
+
+    pub fn previous(&self) -> Wall<'a> {
+	let prev = (self.edge.id + self.region.edges.len() - 1) % self.region.edges.len();
+	let edge = &self.region.edges[prev];
+	Wall {
+	    region: self.region,
+	    edge,
+	}
+    }
+
+    pub fn normal(&self) -> Radians {
+	let mut rad = (self.edge.p2 - self.edge.p1).to_radians();
+	rad.0 += std::f64::consts::FRAC_PI_2;
+	rad
+    }
 }