commit da262cf55556ba1dfc1751d641625dbe579ee66a · drubery.com/icfp2007

+76 -44

rna2bmp/src/bitmap.rs

···

       1
       1
       -
       // TODO: Better wrapper here

     

       2
       1
        
       pub const SIZE: usize = 600;

     

       3
       3
       -
       pub type Bitmap = [[(u8, u8, u8, u8); SIZE]; SIZE];

     

       4
       2
        
       

     

       5
       5
       -
       pub fn new_bitmap() -> Bitmap {

     

       6
       6
       -
           [[(0, 0, 0, 0); SIZE]; SIZE]

     

       3
       3
       +
       pub type Point = (usize, usize);

     

       4
       4
       +
       pub type Pixel = (u8, u8, u8, u8);

     

       5
       5
       +
       pub struct Bitmap {

     

       6
       6
       +
           data: [[Pixel; SIZE]; SIZE],

     

       7
       7
        
       }

     

       8
       8
        
       

     

       9
       9
       -
       fn output_u8(vec: &mut Vec<u8>, n: u8) {

     

       10
       10
       -
           vec.push(n);

     

       11
       11
       -
       }

     

       9
       9
       +
       impl Bitmap {

     

       10
       10
       +
           pub fn new() -> Bitmap {

     

       11
       11
       +
               Bitmap {

     

       12
       12
       +
                   data: [[(0, 0, 0, 0); SIZE]; SIZE],

     

       13
       13
       +
               }

     

       14
       14
       +
           }

     

       12
       15
        
       

     

       13
       13
       -
       fn output_u16(vec: &mut Vec<u8>, n: u16) {

     

       14
       14
       -
           vec.push(n as u8);

     

       15
       15
       -
           vec.push((n >> 8) as u8);

     

       16
       16
       +
           pub fn pixel_mut(&mut self, p: Point) -> &mut Pixel {

     

       17
       17
       +
               let (x, y) = p;

     

       18
       18
       +
               &mut self.data[x][y]

     

       19
       19
       +
           }

     

       20
       20
       +
       

     

       21
       21
       +
           pub fn pixel(&self, p: Point) -> &Pixel {

     

       22
       22
       +
               let (x, y) = p;

     

       23
       23
       +
               &self.data[x][y]

     

       24
       24
       +
           }

     

       25
       25
       +
       

     

       26
       26
       +
           pub fn to_data(&self) -> Vec<u8> {

     

       27
       27
       +
               let mut writer = Writer::new();

     

       28
       28
       +
               let row_padding = 3 - (3 * SIZE % 4);

     

       29
       29
       +
               writer.output_u16(0x4d42); // BM 

     

       30
       30
       +
               writer.output_u32((0x36 + SIZE * (3 * SIZE + row_padding)) as u32); // Size

     

       31
       31
       +
               writer.output_u16(0x0); // Reserved

     

       32
       32
       +
               writer.output_u16(0x0); // Reserved

     

       33
       33
       +
               writer.output_u32(0x36); // Offset of pixel array

     

       34
       34
       +
               writer.output_u32(0x28); // Length of DIB header

     

       35
       35
       +
               writer.output_u32(SIZE as u32); // Width

     

       36
       36
       +
               writer.output_u32(SIZE as u32); // Height

     

       37
       37
       +
               writer.output_u16(0x1); // Color planes

     

       38
       38
       +
               writer.output_u16(0x18); // Bits per pixel

     

       39
       39
       +
               writer.output_u32(0x0); // No pixel array compression

     

       40
       40
       +
               writer.output_u32(0x0); // Horizontal resolution

     

       41
       41
       +
               writer.output_u32(0x0); // Vertical resolution

     

       42
       42
       +
               writer.output_u32(0x0); // Colors in the palette

     

       43
       43
       +
               writer.output_u32(0x0); // All colors are important

     

       44
       44
       +
       

     

       45
       45
       +
               for y in (0..SIZE).rev() {

     

       46
       46
       +
                   for x in 0..SIZE {

     

       47
       47
       +
                       let (r, g, b, _) = self.data[x][y];

     

       48
       48
       +
                       writer.output_u8(b);

     

       49
       49
       +
                       writer.output_u8(g);

     

       50
       50
       +
                       writer.output_u8(r);

     

       51
       51
       +
                   }

     

       52
       52
       +
       

     

       53
       53
       +
                   for _ in 0..row_padding {

     

       54
       54
       +
                       writer.output_u8(0);

     

       55
       55
       +
                   }

     

       56
       56
       +
               }

     

       57
       57
       +
       

     

       58
       58
       +
               return writer.output();

     

       59
       59
       +
           }

     

       16
       60
        
       }

     

       17
       61
        
       

     

       18
       18
       -
       fn output_u32(vec: &mut Vec<u8>, n: u32) {

     

       19
       19
       -
           vec.push(n as u8);

     

       20
       20
       -
           vec.push((n >> 8) as u8);

     

       21
       21
       -
           vec.push((n >> 16) as u8);

     

       22
       22
       -
           vec.push((n >> 24) as u8);

     

       62
       62
       +
       struct Writer {

     

       63
       63
       +
           output: Vec<u8>,

     

       23
       64
        
       }

     

       24
       65
        
       

     

       25
       25
       -
       pub fn to_data(bmp: &Bitmap) -> Vec<u8> {

     

       26
       26
       -
           let mut ret = Vec::new();

     

       27
       27
       -
           let row_padding = 3 - (3 * SIZE % 4);

     

       28
       28
       -
           output_u16(&mut ret, 0x4d42); // BM 

     

       29
       29
       -
           output_u32(&mut ret, (0x36 + SIZE * (3 * SIZE + row_padding)) as u32); // Size

     

       30
       30
       -
           output_u16(&mut ret, 0x0); // Reserved

     

       31
       31
       -
           output_u16(&mut ret, 0x0); // Reserved

     

       32
       32
       -
           output_u32(&mut ret, 0x36); // Offset of pixel array

     

       33
       33
       -
           output_u32(&mut ret, 0x28); // Length of DIB header

     

       34
       34
       -
           output_u32(&mut ret, SIZE as u32); // Width

     

       35
       35
       -
           output_u32(&mut ret, SIZE as u32); // Height

     

       36
       36
       -
           output_u16(&mut ret, 0x1); // Color planes

     

       37
       37
       -
           output_u16(&mut ret, 0x18); // Bits per pixel

     

       38
       38
       -
           output_u32(&mut ret, 0x0); // No pixel array compression

     

       39
       39
       -
           output_u32(&mut ret, 0x0); // Horizontal resolution

     

       40
       40
       -
           output_u32(&mut ret, 0x0); // Vertical resolution

     

       41
       41
       -
           output_u32(&mut ret, 0x0); // Colors in the palette

     

       42
       42
       -
           output_u32(&mut ret, 0x0); // All colors are important

     

       66
       66
       +
       impl Writer {

     

       67
       67
       +
           fn new() -> Writer {

     

       68
       68
       +
               Writer { output: Vec::new() }

     

       69
       69
       +
           }

     

       43
       70
        
       

     

       44
       44
       -
           for y in (0..SIZE).rev() {

     

       45
       45
       -
               for x in 0..SIZE {

     

       46
       46
       -
                   let (r, g, b, _) = bmp[x][y];

     

       47
       47
       -
                   output_u8(&mut ret, b);

     

       48
       48
       -
                   output_u8(&mut ret, g);

     

       49
       49
       -
                   output_u8(&mut ret, r);

     

       50
       50
       -
               }

     

       71
       71
       +
           fn output_u8(&mut self, n: u8) {

     

       72
       72
       +
               self.output.push(n);

     

       73
       73
       +
           }

     

       51
       74
        
       

     

       52
       52
       -
               for _ in 0..row_padding {

     

       53
       53
       -
                   output_u8(&mut ret, 0);

     

       54
       54
       -
               }

     

       75
       75
       +
           fn output_u16(&mut self, n: u16) {

     

       76
       76
       +
               self.output.push(n as u8);

     

       77
       77
       +
               self.output.push((n >> 8) as u8);

     

       78
       78
       +
           }

     

       79
       79
       +
       

     

       80
       80
       +
           fn output_u32(&mut self, n: u32) {

     

       81
       81
       +
               self.output.push(n as u8);

     

       82
       82
       +
               self.output.push((n >> 8) as u8);

     

       83
       83
       +
               self.output.push((n >> 16) as u8);

     

       84
       84
       +
               self.output.push((n >> 24) as u8);

     

       55
       85
        
           }

     

       56
       86
        
       

     

       57
       57
       -
           return ret;

     

       87
       87
       +
           fn output(self) -> Vec<u8> {

     

       88
       88
       +
               self.output

     

       89
       89
       +
           }

     

       58
       90
        
       }

+1 -1

rna2bmp/src/main.rs

···

       17
       17
        
               let mut processor = RnaProcessor::new();

     

       18
       18
        
               processor.process_rna(rna.lines().collect());

     

       19
       19
        
               if let Some(bmp) = processor.bitmap() {

     

       20
       20
       -
                   if fs::write(&args[2], bitmap::to_data(bmp)).is_err() {

     

       20
       20
       +
                   if fs::write(&args[2], bmp.to_data()).is_err() {

     

       21
       21
        
                       println!("Could not write to {}", args[2]);

     

       22
       22
        
                   }

     

       23
       23
        
               }

+51 -54

rna2bmp/src/rna_processor.rs

···

       1
       1
        
       use crate::bitmap::Bitmap;

     

       2
       2
       +
       use crate::bitmap::Pixel;

     

       3
       3
       +
       use crate::bitmap::Point;

     

       2
       4
        
       use crate::bitmap::SIZE;

     

       3
       3
       -
       use crate::bitmap::new_bitmap;

     

       4
       5
        
       use std::cmp::max;

     

       5
       6
        
       

     

       6
       7
        
       struct Bucket {

     
···

       14
       15
        
       

     

       15
       16
        
       pub struct RnaProcessor {

     

       16
       17
        
           bucket: Bucket,

     

       17
       17
       -
           position: (usize, usize),

     

       18
       18
       -
           mark: (usize, usize),

     

       19
       19
       -
           dir: (usize, usize),

     

       18
       18
       +
           position: Point,

     

       19
       19
       +
           mark: Point,

     

       20
       20
       +
           dir: Point,

     

       20
       21
        
           bitmaps: Vec<Bitmap>,

     

       21
       22
        
       }

     

       22
       23
        
       

     
···

       32
       33
        
               }

     

       33
       34
        
           }

     

       34
       35
        
       

     

       35
       35
       -
           fn current_pixel(&self) -> (u8, u8, u8, u8) {

     

       36
       36
       -
               let r = if self.count_rgb == 0 {

     

       37
       37
       -
                   0

     

       36
       36
       +
           fn current_pixel(&self) -> Pixel {

     

       37
       37
       +
               let (r, g, b) = if self.count_rgb == 0 {

     

       38
       38
       +
                   (0, 0, 0)

     

       38
       39
        
               } else {

     

       39
       39
       -
                   self.total_r / self.count_rgb

     

       40
       40
       -
               };

     

       41
       41
       -
               let g = if self.count_rgb == 0 {

     

       42
       42
       -
                   0

     

       43
       43
       -
               } else {

     

       44
       44
       -
                   self.total_g / self.count_rgb

     

       45
       45
       -
               };

     

       46
       46
       -
               let b = if self.count_rgb == 0 {

     

       47
       47
       -
                   0

     

       48
       48
       -
               } else {

     

       49
       49
       -
                   self.total_b / self.count_rgb

     

       40
       40
       +
                   (

     

       41
       41
       +
                       self.total_r / self.count_rgb,

     

       42
       42
       +
                       self.total_g / self.count_rgb,

     

       43
       43
       +
                       self.total_b / self.count_rgb,

     

       44
       44
       +
                   )

     

       50
       45
        
               };

     

       51
       46
        
               let a = if self.count_a == 0 {

     

       52
       47
        
                   255

     
···

       95
       90
        
               }

     

       96
       91
        
           }

     

       97
       92
        
       

     

       98
       98
       -
           fn set_pixel(&mut self, x: usize, y: usize) {

     

       93
       93
       +
           fn set_pixel(&mut self, p: Point) {

     

       99
       94
        
               if let Some(b) = self.bitmaps.last_mut() {

     

       100
       100
       -
                   b[x][y] = self.bucket.current_pixel();

     

       95
       95
       +
                   *b.pixel_mut(p) = self.bucket.current_pixel();

     

       101
       96
        
               }

     

       102
       97
        
           }

     

       103
       98
        
       

     
···

       138
       133
        
                   } else if r == "PCCIFFP" {

     

       139
       134
        
                       self.mark = self.position;

     

       140
       135
        
                   } else if r == "PFFICCP" {

     

       136
       136
       +
       	        // TODO: Can I rework this to reduce casts or locals?

     

       141
       137
        
                       let x0 = self.position.0 as isize;

     

       142
       138
        
                       let y0 = self.position.1 as isize;

     

       143
       139
        
                       let x1 = self.mark.0 as isize;

     
···

       149
       145
        
                       let mut x = x0 * d + (d - c) / 2;

     

       150
       146
        
                       let mut y = x0 * d + (d - c) / 2;

     

       151
       147
        
                       for _ in 0..d {

     

       152
       152
       -
                           self.set_pixel((x / d) as usize, (y / d) as usize);

     

       148
       148
       +
                           self.set_pixel(((x / d) as usize, (y / d) as usize));

     

       153
       149
        
                           x += dx;

     

       154
       150
        
                           y += dy;

     

       155
       151
        
                       }

     

       156
       156
       -
                       self.set_pixel(x1 as usize, y1 as usize);

     

       152
       152
       +
                       self.set_pixel((x1 as usize, y1 as usize));

     

       157
       153
        
                   } else if r == "PIIPIIP" {

     

       158
       158
       -
                       let (x, y) = self.position;

     

       159
       154
        
                       if let Some(b) = self.bitmaps.last_mut() {

     

       160
       160
       -
                           let old = b[x][y];

     

       155
       155
       +
                           let old = *b.pixel(self.position);

     

       161
       156
        
                           let new = self.bucket.current_pixel();

     

       162
       157
        
                           let mut to_fill = Vec::new();

     

       163
       158
        
                           to_fill.push(self.position);

     

       164
       164
       -
                           while let Some((x, y)) = to_fill.pop() {

     

       165
       165
       -
                               if b[x][y] == old {

     

       166
       166
       -
                                   b[x][y] = new;

     

       159
       159
       +
                           while let Some(p) = to_fill.pop() {

     

       160
       160
       +
                               if *b.pixel(p) == old {

     

       161
       161
       +
                                   *b.pixel_mut(p) = new;

     

       162
       162
       +
       

     

       163
       163
       +
                                   let (x, y) = p;

     

       167
       164
        
                                   if x > 0 {

     

       168
       165
        
                                       to_fill.push((x - 1, y));

     

       169
       166
        
                                   }

     
···

       181
       178
        
                       }

     

       182
       179
        
                   } else if r == "PCCPFFP" {

     

       183
       180
        
                       if self.bitmaps.len() < 10 {

     

       184
       184
       -
                           self.bitmaps.push(new_bitmap());

     

       181
       181
       +
                           self.bitmaps.push(Bitmap::new());

     

       185
       182
        
                       }

     

       186
       183
        
                   } else if r == "PFFPCCP" {

     

       187
       187
       -
                       if self.bitmaps.len() >= 2 {

     

       188
       188
       -
                           let bmp0 = self.bitmaps[self.bitmaps.len() - 1];

     

       189
       189
       -
                           let mut bmp1 = self.bitmaps[self.bitmaps.len() - 2];

     

       190
       190
       -
                           for x in 0..SIZE {

     

       191
       191
       -
                               for y in 0..SIZE {

     

       192
       192
       -
                                   let (r0, b0, g0, a0) = bmp0[x][y];

     

       193
       193
       -
                                   let (r1, b1, g1, a1) = bmp1[x][y];

     

       194
       194
       -
                                   let r = r0 + (((r1 as usize) * (255 - a0 as usize) / 255) as u8);

     

       195
       195
       -
                                   let g = g0 + (((g1 as usize) * (255 - a0 as usize) / 255) as u8);

     

       196
       196
       -
                                   let b = b0 + (((b1 as usize) * (255 - a0 as usize) / 255) as u8);

     

       197
       197
       -
                                   let a = a0 + (((a1 as usize) * (255 - a0 as usize) / 255) as u8);

     

       198
       198
       -
                                   bmp1[x][y] = (r, g, b, a);

     

       184
       184
       +
                       if let Some(bmp0) = self.bitmaps.pop() {

     

       185
       185
       +
                           if let Some(mut bmp1) = self.bitmaps.pop() {

     

       186
       186
       +
                               for x in 0..SIZE {

     

       187
       187
       +
                                   for y in 0..SIZE {

     

       188
       188
       +
                                       let (r0, b0, g0, a0) = *bmp0.pixel((x, y));

     

       189
       189
       +
                                       let (r1, b1, g1, a1) = *bmp1.pixel((x, y));

     

       190
       190
       +
                                       let r = r0 + ((r1 as usize) * (255 - a0 as usize) / 255) as u8;

     

       191
       191
       +
                                       let g = g0 + ((g1 as usize) * (255 - a0 as usize) / 255) as u8;

     

       192
       192
       +
                                       let b = b0 + ((b1 as usize) * (255 - a0 as usize) / 255) as u8;

     

       193
       193
       +
                                       let a = a0 + ((a1 as usize) * (255 - a0 as usize) / 255) as u8;

     

       194
       194
       +
                                       *bmp1.pixel_mut((x, y)) = (r, g, b, a);

     

       195
       195
       +
                                   }

     

       199
       196
        
                               }

     

       197
       197
       +
                               self.bitmaps.push(bmp1);

     

       200
       198
        
                           }

     

       201
       201
       -
                           self.bitmaps.pop();

     

       202
       199
        
                       }

     

       203
       200
        
                   } else if r == "PFFICCF" {

     

       204
       204
       -
                       if self.bitmaps.len() >= 2 {

     

       205
       205
       -
                           let bmp0 = self.bitmaps[self.bitmaps.len() - 1];

     

       206
       206
       -
                           let mut bmp1 = self.bitmaps[self.bitmaps.len() - 2];

     

       207
       207
       -
                           for x in 0..SIZE {

     

       208
       208
       -
                               for y in 0..SIZE {

     

       209
       209
       -
                                   let (_, _, _, a0) = bmp0[x][y];

     

       210
       210
       -
                                   let (r1, b1, g1, a1) = bmp1[x][y];

     

       211
       211
       -
                                   let r = ((r1 as usize) * (a0 as usize) / 255) as u8;

     

       212
       212
       -
                                   let g = ((g1 as usize) * (a0 as usize) / 255) as u8;

     

       213
       213
       -
                                   let b = ((b1 as usize) * (a0 as usize) / 255) as u8;

     

       214
       214
       -
                                   let a = ((a1 as usize) * (a0 as usize) / 255) as u8;

     

       215
       215
       -
                                   bmp1[x][y] = (r, g, b, a);

     

       201
       201
       +
                       if let Some(bmp0) = self.bitmaps.pop() {

     

       202
       202
       +
                           if let Some(mut bmp1) = self.bitmaps.pop() {

     

       203
       203
       +
                               for x in 0..SIZE {

     

       204
       204
       +
                                   for y in 0..SIZE {

     

       205
       205
       +
                                       let (_, _, _, a0) = *bmp0.pixel((x, y));

     

       206
       206
       +
                                       let (r1, b1, g1, a1) = *bmp1.pixel((x, y));

     

       207
       207
       +
                                       let r = ((r1 as usize) * (a0 as usize) / 255) as u8;

     

       208
       208
       +
                                       let g = ((g1 as usize) * (a0 as usize) / 255) as u8;

     

       209
       209
       +
                                       let b = ((b1 as usize) * (a0 as usize) / 255) as u8;

     

       210
       210
       +
                                       let a = ((a1 as usize) * (a0 as usize) / 255) as u8;

     

       211
       211
       +
                                       *bmp1.pixel_mut((x, y)) = (r, g, b, a);

     

       212
       212
       +
                                   }

     

       216
       213
        
                               }

     

       214
       214
       +
                               self.bitmaps.push(bmp1);

     

       217
       215
        
                           }

     

       218
       218
       -
                           self.bitmaps.pop();

     

       219
       216
        
                       }

     

       220
       217
        
                   }

     

       221
       218
        
               }