Revision 50:c293d29e035a, committed 2019-04-17

Comitter:

rottenegg

Date:

Wed Apr 17 05:11:04 2019 +0000

Parent:

49:93355c01e261

Commit message:

Upgraded Bitmap to Have an Image loader

Changed in this revision

diff -r 93355c01e261 -r c293d29e035a Bitmap.cpp
--- a/Bitmap.cpp	Mon Mar 19 13:44:23 2018 +0000
+++ b/Bitmap.cpp	Wed Apr 17 05:11:04 2019 +0000
@@ -1,96 +1,59 @@
 #include "Bitmap.h"
 
-#include <iostream>
-
-#include "N5110.h"
-
-Bitmap::Bitmap(int const               *contents,
-               unsigned int const       height,
-               unsigned int const       width)
-    :
-    _contents(std::vector<int>(height*width)),
-    _height(height),
-    _width(width)
-{
-    // Perform a quick sanity check of the dimensions
-    if (_contents.size() != height * width) {
-        std::cerr << "Contents of bitmap has size " << _contents.size()
-                  << " pixels, but its dimensions were specified as "
-                  << width << " * " << height << " = " << width * height << std::endl;
-    }
-
-    for(unsigned int i = 0; i < height*width; ++i) _contents[i] = contents[i];
-}
-
-/**
- * @returns the value of the pixel at the given position
- */
-int Bitmap::get_pixel(unsigned int const row,
-                      unsigned int const column) const
-{
-    // First check that row and column indices are within bounds
-    if(column >= _width || row >= _height)
-    {
-        std::cerr << "The requested pixel with index " << row << "," << column
-                  << "is outside the bitmap dimensions: " << _width << ","
-                  << _height << std::endl;
+void Bitmap::renderBMP(const char *path, N5110 &lcd, unsigned int const x, unsigned int const y) {
+    FILE *bmp = fopen(path,"r");
+    if (bmp == NULL) {
+        std::cerr << "File Not Found" << std::endl;
     }
-
-    // Now return the pixel value, using row-major indexing
-    return _contents[row * _width + column];
-}
-
-/**
- * @brief Prints the contents of the bitmap to the terminal
- */
-void Bitmap::print() const
-{
-    for (unsigned int row = 0; row < _height; ++row)
-    {
-        // Print each element of the row
-        for (unsigned int column = 0; column < _width; ++column)
-        {
-            int pixel = get_pixel(row, column);
-            std::cout << pixel;
-        }
-
-        // And then terminate with a new-line character
-        std::cout << std::endl;
-    }
-}
-
-/**
- * @brief Renders the contents of the bitmap onto an N5110 screen
- *
- * @param[in] lcd The screen to use for rendering
- * @param[in] x0  The horizontal position in pixels at which to render the bitmap
- * @param[in] y0  The vertical position in pixels at which to render the bitmap
- *
- * @details Note that x0, y0 gives the location of the top-left of the bitmap on
- *          the screen.
- *          This function only updates the buffer on the screen.  You still need
- *          to refresh the screen in order to actually see the bitmap.
- */
-void Bitmap::render(N5110 &lcd,
-                    unsigned int const x0,
-                    unsigned int const y0) const
-{
-    // Loop through each row of the bitmap image
-    for (unsigned int bitmap_row = 0; bitmap_row < _height; ++bitmap_row)
-    {
-        // Row index on the screen for rendering the row of pixels
-        unsigned int screen_row = y0 + bitmap_row;
-                
-        // Render each pixel in the row
-        for (unsigned int bitmap_col = 0; bitmap_col < _width; ++bitmap_col)
-        {
-            // Column index on the screen for rendering this pixel
-            int screen_col = x0 + bitmap_col;
-
-            // Find the required value of the pixel at the given location within
-            // the bitmap data and then write it to the LCD screen
-            int pixel = get_pixel(bitmap_row, bitmap_col);
-            lcd.setPixel(screen_col, screen_row, pixel);
+    unsigned char *buffer = (unsigned char*)std::malloc(4 * sizeof(unsigned char));
+    unsigned long offbits;
+    unsigned long height;
+    unsigned long width;
+    std::fseek(bmp,10,SEEK_SET);
+    std::fread(&offbits,4,1,bmp);
+    std::fseek(bmp,18,SEEK_SET);
+    std::fread(&width,4,1,bmp);
+    std::fseek(bmp,22,SEEK_SET);
+    std::fread(&height,4,1,bmp);
+    unsigned short int dcount = (width / 32) + 1;
+    fseek(bmp,offbits,SEEK_SET);
+    std::bitset<32> bits;
+    int row = 0;
+    offbits = 0;
+    int colomn = 0;
+    bool state;
+    //NEW ENGINENE CORE
+    for (unsigned int dwcount = 1; dwcount < ((dcount*height) + 1); dwcount++) {
+        std::fread(buffer,1,4,bmp);
+        //endian swap
+        bits = buffer[0];
+        bits = (bits << 8) | (std::bitset<32>)buffer[1];
+        bits = (bits << 8) | (std::bitset<32>)buffer[2];
+        bits = (bits << 8) | (std::bitset<32>)buffer[3];
+        //bit loop adaptive
+        if (dwcount % dcount == 0) {
+            for (offbits = 0; offbits < (width % 32); offbits++){
+                if (bits[31 - offbits] == 1) {
+                    state = false;
+                } else {
+                    state = true;
+                }
+                lcd.setPixel((colomn + x) ,(row + y),state);
+                colomn++;
+            }
+            row++;
+            colomn = 0;
+        } else {
+            for (offbits = 0; offbits < 32; offbits++) {
+                if (bits[31 - offbits] == 1) {
+                    state = false;
+                } else {
+                    state = true;
+                }
+                lcd.setPixel((colomn + x) ,(row + y),state);
+                colomn++;
+            }
         }
     }
-}
\ No newline at end of file
+    std::fclose(bmp);
+}

diff -r 93355c01e261 -r c293d29e035a Bitmap.h
--- a/Bitmap.h	Mon Mar 19 13:44:23 2018 +0000
+++ b/Bitmap.h	Wed Apr 17 05:11:04 2019 +0000
@@ -1,65 +1,20 @@
 #ifndef BITMAP_H
 #define BITMAP_H
 
-#include <vector>
+//Best BMP Image at W = 84, H = 48
+//MONOCHROME ONLY
 
-// Forward declarations
+#include "N5110.h"
+#include <bitset>
+#include <iostream>
+
 class N5110;
 
-/**
- * @brief  A black & white bitmap that can be rendered on an N5110 screen
- * @author Alex Valavanis <a.valavanis@leeds.ac.uk>
- * 
- * @code
-  // First declare the pixel map data using '1' for black,
-  // or '0' for white pixels
-  static int sprite_data[] = {
-    0,0,1,0,0,
-    0,1,1,1,0,
-    0,0,1,0,0,
-    0,1,1,1,0,
-    1,1,1,1,1,
-    1,1,1,1,1,
-    1,1,0,1,1,
-    1,1,0,1,1
-  };
-
-  // Instantiate the Bitmap object using the data above
-  Bitmap sprite(sprite_data, 8, 5); // Specify rows and columns in sprite
-  
-  // We can render the bitmap wherever we want on the screen
-  sprite.render(lcd, 20, 6); // x and y locations for rendering
-  sprite.render(lcd, 30, 10);
-  
-  // We can also print its values to the terminal
-  sprite.print();
- * @endcode
- */
-class Bitmap
-{
-private:
-    /**
-     * @brief The contents of the drawing, with pixels stored in row-major order
-     * @details '1' represents a black pixel; '0' represents white
-     */
-    std::vector<int> _contents;
-    
-    unsigned int _height; ///< The height of the drawing in pixels
-    unsigned int _width;  ///< The width of the drawing in pixels
+class Bitmap {
     
 public:
-    Bitmap(int const          *contents,
-           unsigned int const  height,
-           unsigned int const  width);
+    static void renderBMP(const char *path, N5110 &lcd ,unsigned int const  x, unsigned int const  y);            
 
-    int get_pixel(unsigned int const row,
-                  unsigned int const column) const;
-
-    void print() const;
-
-    void render(N5110 &lcd,
-                unsigned int const x0,
-                unsigned int const y0) const;
 };
 
-#endif // BITMAP_H
\ No newline at end of file
+#endif 
\ No newline at end of file