templated colours

Author: Martin Klang

LibSource/ColourScreenPatch.cpp

@@ -6,11 +6,9 @@
 #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){
+static void onDrawCallback(uint8_t* pixels, uint16_t width, uint16_t height){
   ColourScreenPatch* patch = (ColourScreenPatch*)getInitialisingPatchProcessor()->patch;
   if(patch != NULL){
     ColourScreenBuffer screen(width, height);
@@ -26,56 +24,36 @@ ColourScreenPatch::ColourScreenPatch(){
 
 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){
+template<>
+Colour ColourScreenBuffer::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){
+template<>
+void ColourScreenBuffer::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){
+template<>
+void ColourScreenBuffer::invertPixel(unsigned int x, unsigned int y){
   if(x < width && y < height)
     pixels[y*width+x] ^= WHITE;
 }
 
-void ScreenBuffer::fade(uint16_t steps){
+template<>
+void ColourScreenBuffer::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) {
+template<>
+void ColourScreenBuffer::fill(Colour c) {
   for(int i=0; i<height*width; ++i)
     pixels[i] = c;
 }

LibSource/ColourScreenPatch.h

@@ -1,14 +1,23 @@
 #include "Patch.h"
 #include "ScreenBuffer.h"
 
+#define BLACK    0x0000
+#define BLUE     0x001F
+#define RED      0xF800
+#define GREEN    0x07E0
+#define CYAN     0x07FF
+#define MAGENTA  0xF81F
+#define YELLOW   0xFFE0  
+#define WHITE    0xFFFF
+
 typedef uint16_t Colour;
-typedef ScreenBuffer<uint16_t> ColourScreenBuffer;
+typedef ScreenBuffer<uint16_t, BLACK, WHITE> ColourScreenBuffer;
 
 class ColourScreenPatch : public Patch {
 public:
   ColourScreenPatch();
   virtual ~ColourScreenPatch();
   uint16_t getScreenWidth();
   uint16_t getScreenHeight();
-  virtual void processScreen(ColourScreenBuffer& screen);
+  virtual void processScreen(ColourScreenBuffer& screen) = 0;
 };

LibSource/MonochromeScreenPatch.cpp

@@ -10,7 +10,7 @@
 
 PatchProcessor* getInitialisingPatchProcessor();
 
-void onDrawCallback(uint8_t* pixels, uint16_t width, uint16_t height){
+static void onDrawCallback(uint8_t* pixels, uint16_t width, uint16_t height){
   MonochromeScreenPatch* patch = (MonochromeScreenPatch*)getInitialisingPatchProcessor()->patch;
   if(patch != NULL){
     MonochromeScreenBuffer screen(width, height);
@@ -26,31 +26,6 @@ MonochromeScreenPatch::MonochromeScreenPatch(){
 
 MonochromeScreenPatch::~MonochromeScreenPatch(){}
 
-void drawMessage(MonochromeScreenBuffer& 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, MonochromeScreenBuffer& screen){
-  // draw title
-  screen.setTextSize(2);
-  screen.print(0, 16, title);
-}
-
-void MonochromeScreenPatch::processScreen(MonochromeScreenBuffer& 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);
-}
-
-
 template<>
 Colour MonochromeScreenBuffer::getPixel(unsigned int x, unsigned int y){
   if(x >= width || y >= height)

LibSource/MonochromeScreenPatch.h

@@ -1,14 +1,17 @@
 #include "Patch.h"
 #include "ScreenBuffer.h"
 
+#define	BLACK           0
+#define	WHITE           1
+
 typedef uint8_t Colour;
-typedef ScreenBuffer<uint8_t> MonochromeScreenBuffer;
+typedef ScreenBuffer<uint8_t, BLACK, WHITE> MonochromeScreenBuffer;
 
 class MonochromeScreenPatch : public Patch {
 public:
   MonochromeScreenPatch();
   virtual ~MonochromeScreenPatch();
   uint16_t getScreenWidth();
   uint16_t getScreenHeight();
-  virtual void processScreen(MonochromeScreenBuffer& screen);
+  virtual void processScreen(MonochromeScreenBuffer& screen) = 0;
 };

LibSource/ScreenBuffer.h

@@ -5,9 +5,6 @@
 #include "device.h"
 #include "message.h"
 
-#define	BLACK           0
-#define	WHITE           1
-
 #define swap(a, b) { int16_t t = a; a = b; b = t; }
 #ifndef min
 #define min(a,b) ((a)<(b)?(a):(b))
@@ -19,7 +16,7 @@
 #define abs(x) ((x)>0?(x):-(x))
 #endif
 
-template<typename Colour>
+template<typename Colour, Colour BLACK, Colour WHITE>
 class ScreenBuffer {
 private:
   const uint16_t width;

compile.mk

@@ -11,7 +11,7 @@ CPP_SRC += SmoothValue.cpp PatchParameter.cpp
 CPP_SRC += PatchProgram.cpp 
 # CPP_SRC += ShortPatchProgram.cpp 
 # CPP_SRC += ScreenBuffer.cpp ScreenBufferDevice.cpp
-CPP_SRC += MonochromeScreenPatch.cpp
+CPP_SRC += MonochromeScreenPatch.cpp ColourScreenPatch.cpp
 
 SOURCE       = $(BUILDROOT)/Source
 LIBSOURCE    = $(BUILDROOT)/LibSource