| changeset 14719 | abc6aaf481c4 |
| parent 14718 | 5915a199cb81 |
| child 15286 | 16bd389fc735 |
| 14718:5915a199cb81 | 14719:abc6aaf481c4 |
|---|---|
3 use vec2d::Vec2D; |
3 use vec2d::Vec2D; |
4 |
4 |
5 use super::{ |
5 use super::{ |
6 camera::Camera, |
6 camera::Camera, |
7 gl::{ |
7 gl::{ |
8 Buffer, InputElement, InputFormat, InputLayout, Shader, Texture2D, VariableBinding, |
8 Buffer, InputElement, InputFormat, InputLayout, PipelineState, Shader, Texture2D, |
9 } |
9 VariableBinding, |
10 }, |
|
10 }; |
11 }; |
11 |
12 |
12 // TODO: temp |
13 // TODO: temp |
13 const VERTEX_SHADER: &'static str = r#" |
14 const VERTEX_SHADER: &'static str = r#" |
14 #version 150 |
15 #version 150 |
275 ); |
276 ); |
276 |
277 |
277 let projection = camera.projection(); |
278 let projection = camera.projection(); |
278 |
279 |
279 self.tile_shader.bind(); |
280 self.tile_shader.bind(); |
280 self.tile_shader.set_matrix("Projection", projection.as_ptr()); |
281 self.tile_shader |
282 .set_matrix("Projection", projection.as_ptr()); |
|
283 |
|
284 let _state = PipelineState::new().with_blend(); |
|
281 |
285 |
282 let mut draw_offset = 0; |
286 let mut draw_offset = 0; |
283 for draw_call in &self.tile_draw_calls { |
287 for draw_call in &self.tile_draw_calls { |
284 unsafe { |
288 unsafe { |
285 self.tile_shader |
289 self.tile_shader |