added ColourScreenPatch

Author: Martin Klang

LibSource/ColourScreenPatch.cpp

@@ -0,0 +1,82 @@
+#include <cstddef>
+#include <string.h>
+#include "device.h"
+#include "ColourScreenPatch.h"
+#include "ProgramVector.h"
+#include "PatchProcessor.h"
+#include "ServiceCall.h"
+
+#include "font.c" // todo load as resource
+
+PatchProcessor* getInitialisingPatchProcessor();
+
+void onDrawCallback(uint8_t* pixels, uint16_t width, uint16_t height){
+  ColourScreenPatch* patch = (ColourScreenPatch*)getInitialisingPatchProcessor()->patch;
+  if(patch != NULL){
+    ColourScreenBuffer screen(width, height);
+    screen.setBuffer(pixels);
+    patch->processScreen(screen);
+  }
+}
+
+ColourScreenPatch::ColourScreenPatch(){
+  void* drawArgs[] = {(void*)SYSTEM_FUNCTION_DRAW, (void*)&onDrawCallback};
+  getProgramVector()->serviceCall(OWL_SERVICE_REGISTER_CALLBACK, drawArgs, 2);
+}
+
+ColourScreenPatch::~ColourScreenPatch(){}
+
+void drawMessage(ColourScreenBuffer& screen){
+  ProgramVector* pv = getProgramVector();
+  if(pv->message != NULL){
+    screen.setTextSize(1);
+    screen.setTextWrap(true);
+    screen.print(0, 26, pv->message);
+  }    
+}
+void drawTitle(const char* title, ColourScreenBuffer& screen){
+  // draw title
+  screen.setTextSize(2);
+  screen.print(0, 16, title);
+}
+
+void ColourScreenPatch::processScreen(ColourScreenBuffer& screen){
+  // screen.clear();
+  const char* title = getInitialisingPatchProcessor()->getPatchName();
+  drawTitle(title, screen);
+  drawMessage(screen);
+  // const char title[] = "KickBox";
+  // screen.setTextSize(2);
+  // screen.print(0, 16, title);
+}
+
+
+Colour ScreenBuffer::getPixel(unsigned int x, unsigned int y){
+  if(x >= width || y >= height)
+    return 0;
+  return pixels[y*width+x];
+}
+
+void ScreenBuffer::setPixel(unsigned int x, unsigned int y, Colour c){
+  if(x < width && y < height)
+    pixels[y*width+x] = c;
+}
+
+void ScreenBuffer::invertPixel(unsigned int x, unsigned int y){
+  if(x < width && y < height)
+    pixels[y*width+x] ^= WHITE;
+}
+
+void ScreenBuffer::fade(uint16_t steps){
+  for(int i=0; i<height*width; ++i)
+    pixels[i] = 
+      (((pixels[i] & RED) >> steps) & RED) | 
+      (((pixels[i] & GREEN) >> steps) & GREEN) |
+      (((pixels[i] & BLUE) >> steps) & BLUE);
+}
+
+void ScreenBuffer::fill(Colour c) {
+  for(int i=0; i<height*width; ++i)
+    pixels[i] = c;
+}
+

LibSource/ColourScreenPatch.h

@@ -0,0 +1,14 @@
+#include "Patch.h"
+#include "ScreenBuffer.h"
+
+typedef uint16_t Colour;
+typedef ScreenBuffer<uint16_t> ColourScreenBuffer;
+
+class ColourScreenPatch : public Patch {
+public:
+  ColourScreenPatch();
+  virtual ~ColourScreenPatch();
+  uint16_t getScreenWidth();
+  uint16_t getScreenHeight();
+  virtual void processScreen(ColourScreenBuffer& screen);
+};

LibSource/MonochromeScreenBuffer.h

@@ -119,76 +119,3 @@ void MonochromeScreenBuffer::fill(Colour c) {
   // for(unsigned int i=0; i<height*width; ++i)
   //   pixels[i] = c;
 }
-
-// Draw a character
-template<typename Colour>
-void ScreenBuffer<Colour>::drawChar(uint16_t x, uint16_t y, unsigned char ch,
-                            Colour c, Colour bg, uint8_t size) {
-  // if((x >= width)            || // Clip right
-  //    (y >= height)           || // Clip bottom
-  //    ((x + 6 * size - 1) < 0) || // Clip left
-  //    ((y + 8 * size - 1) < 0))   // Clip top
-  //   return;
-  y -= 8 * size; // set origin to bottom left
-  for(int8_t i=0; i<6; i++ ) {
-    uint8_t line;
-    if (i == 5) 
-      line = 0x0;
-    else 
-      line = font[(ch*5)+i];
-    for (int8_t j = 0; j<8; j++) {
-      if (line & 0x1) {
-        if (size == 1) // default size
-          setPixel(x+i, y+j, c);
-        else {  // big size
-          fillRectangle(x+(i*size), y+(j*size), size, size, c);
-        } 
-      } else if (bg != c) {
-        if (size == 1) // default size
-          setPixel(x+i, y+j, bg);
-        else {  // big size
-          fillRectangle(x+i*size, y+j*size, size, size, bg);
-        }
-      }
-      line >>= 1;
-    }
-  }
-}
-
-// Draw a character rotated 90 degrees
-template<typename Colour>
-void ScreenBuffer<Colour>::drawRotatedChar(uint16_t x, uint16_t y, unsigned char ch,
-                                   Colour c, Colour bg, uint8_t size) {
-  // if((x >= width)            || // Clip right
-  //    (y >= height)           || // Clip bottom
-  //    ((x + 8 * size - 1) < 0) || // Clip left
-  //    ((y + 6 * size - 1) < 0))   // Clip top
-  //   return;
-  // for (int8_t i=5; i>=0; i-- ) {
-  for (int8_t i=0; i<6; i++ ) {
-    uint8_t line;
-    if (i == 5)
-      line = 0x0;
-    else 
-      line = font[(ch*5)+i];
-    // for (int8_t j = 0; j<8; j++) {
-    for (int8_t j = 7; j>=0; j--) {
-      if (line & 0x1) {
-        if (size == 1) // default size
-          setPixel(y+i, x+j, c);
-        else {  // big size
-          // fillRectangle(x+(i*size), y+(j*size), size, size, c);
-          fillRectangle(y+(j*size), x+(i*size), size, size, c);
-        } 
-      } else if (bg != c) {
-        if (size == 1) // default size
-          setPixel(y+i, x+j, bg);
-        else {  // big size
-          // fillRectangle(x+i*size, y+j*size, size, size, bg);
-          fillRectangle(y+j*size, x+i*size, size, size, bg);
-        }
-      }
-      line >>= 1;
-    }
-  }
-}

LibSource/MonochromeScreenPatch.cpp

@@ -1,5 +1,8 @@
 #include "Patch.h"
-#include "MonochromeScreenBuffer.h"
+#include "ScreenBuffer.h"
+
+typedef uint8_t Colour;
+typedef ScreenBuffer<uint8_t> MonochromeScreenBuffer;
 
 class MonochromeScreenPatch : public Patch {
 public: