Added gfx_Lighten and gfx_Darken

Author: mateoconlechuga

CEdev/include/lib/ce/graphx.h

@@ -83,7 +83,7 @@ gfx_image_t *gfx_AllocSprite(uint8_t width, uint8_t height, void *malloc_routine
                                             gfx_image_t *name = (gfx_image_t *)name##_data
 
 typedef enum gfx_mode {
-	gfx_8bpp = 0x27
+    gfx_8bpp = 0x27
 } gfx_mode_t;
 
 /**
@@ -108,7 +108,7 @@ extern uint16_t gfx_palette[256];
  * Array of the LCD VRAM
  */
 extern uint8_t gfx_vram[2][240][320];
-#define gfx_vbuffer (*(uint8_t (*)[240][320])0xE30014)
+#define gfx_vbuffer (**(uint8_t(**)[240][320])0xE30014)
 
 /* Type for the clip region */
 typedef struct gfx_region {
@@ -477,7 +477,7 @@ unsigned int gfx_GetStringWidth(const char *string);
  */
 unsigned int gfx_GetCharWidth(const char c);
 #define gfx_GetCharHeight(c) 8
-#define gfx_FontHeight() 8
+#define gfx_FontHeight()     8
 
 /**
  * Sets the clipping window for clipped routines
@@ -501,18 +501,16 @@ void gfx_ShiftLeft(uint24_t pixels);
 void gfx_ShiftRight(uint24_t pixels);
 
 /**
- * Produces a random integer value
+ * Lightens a given 1555 color; useful for palette color conversions.
+ * amt as 0 means full white, 255 returns original color, in between returns lightened color
  */
-#define gfx_RandInt(min, max) ((unsigned)rand() % ((max) - (min) + 1) + (min))
+uint16_t gfx_Lighten(uint16_t color, uint8_t amt);
 
 /**
- * Checks if we are currently in a rectangular hotspot area
+ * Darkens a given 1555 color; useful for palette color conversions.
+ * amt as 0 returns full black, 255 returns original color, in between returns darkened color
  */
-#define gfx_CheckRectangleHotspot(master_x, master_y, master_width, master_height, test_x, test_y, test_width, test_height) \
-           (((test_x) < ((master_x) + (master_width))) && \
-           (((test_x) + (test_width)) > (master_x)) && \
-           ((test_y) < ((master_y) + (master_height))) && \
-           (((test_y) + (test_height)) > (master_y)))
+uint16_t gfx_Darken(uint16_t color, uint8_t amt);
 
 /**
  * Converts an RGB value to a palette color
@@ -522,6 +520,15 @@ void gfx_ShiftRight(uint24_t pixels);
                              (((uint8_t)(g) >> 3) << 5) | \
                              ((uint8_t)(b) >> 3))
 
+/**
+ * Checks if we are currently in a rectangular hotspot area
+ */
+#define gfx_CheckRectangleHotspot(master_x, master_y, master_width, master_height, test_x, test_y, test_width, test_height) \
+           (((test_x) < ((master_x) + (master_width))) && \
+           (((test_x) + (test_width)) > (master_x)) && \
+           ((test_y) < ((master_y) + (master_height))) && \
+           (((test_y) + (test_height)) > (master_y)))
+
 #define gfx_lcdWidth    320
 #define gfx_lcdHeight   240
 

CEdev/include/lib/ce/keypadc.h

@@ -45,22 +45,22 @@ typedef uint8_t kb_key_t;
 typedef uint16_t kb_lkey_t;
 
 /**
- * Scans the given keyboard row and returns the row value
+ * Scans the keyboard to update data values
  * Note: Disables interrupts
  */
-uint8_t kb_ScanGroup(uint8_t row);
+void kb_Scan(void);
 
 /**
- * Scans the keyboard quickly to tell if any key was pressed
+ * Scans the given keyboard row and returns the row value
  * Note: Disables interrupts
  */
-uint8_t kb_AnyKey(void);
+kb_key_t kb_ScanGroup(uint8_t row);
 
 /**
- * Scans the keyboard to update data values
+ * Scans the keyboard quickly to tell if any key was pressed
  * Note: Disables interrupts
  */
-void kb_Scan(void);
+uint8_t kb_AnyKey(void);
 
 /**
  * Resets the keyboard
@@ -74,20 +74,20 @@ void kb_Reset(void);
 #define kb_SetMode(mode)		(kb_Config = ((kb_Config & ~3)|(mode)))
 #define kb_GetMode()			(kb_Config & 3)
 
-#define MODE_0_IDLE			(0)
-#define MODE_1_INDISCRIMINATE		(1)
-#define MODE_2_SINGLE			(2)
-#define MODE_3_CONTINUOUS		(3)
+#define MODE_0_IDLE             (0)
+#define MODE_1_INDISCRIMINATE   (1)
+#define MODE_2_SINGLE           (2)
+#define MODE_3_CONTINUOUS       (3)
 
-#define kb_EnableInt			(*(uint8_t*)0xF5000C)
-#define kb_IntAcknowledge		(*(volatile uint8_t*)0xF50008)
-#define kb_IntStatus			(*(volatile uint8_t*)0xF50008)
-#define kb_Config			(*(uint8_t*)0xF50000)
-#define kb_DataArray			((uint16_t*)0xF50010)
+#define kb_EnableInt            (*(uint8_t*)0xF5000C)
+#define kb_IntAcknowledge       (*(volatile uint8_t*)0xF50008)
+#define kb_IntStatus            (*(volatile uint8_t*)0xF50008)
+#define kb_Config               (*(uint8_t*)0xF50000)
+#define kb_Data                 ((uint16_t*)0xF50010)
 
-#define KB_SCAN_COMPLETE		(1<<0)
-#define KB_DATA_CHANGED			(1<<1)
-#define KB_MODE_1_PRESS			(1<<2)
+#define KB_SCAN_COMPLETE        (1<<0)
+#define KB_DATA_CHANGED         (1<<1)
+#define KB_MODE_1_PRESS         (1<<2)
 
 /**
  * Keyboard group 0 (Unused)
@@ -178,8 +178,6 @@ void kb_Reset(void);
 #define kb_Right      1<<2
 #define kb_Up         1<<3
 
-#define kb_dataArray ((uint16_t*)0xF50010)
-
 /**
 * Keyboard group 1
 */
@@ -257,4 +255,10 @@ void kb_Reset(void);
 #define kb_KeyRight          (kb_lkey_t)(7 << 8 | 1<<2)
 #define kb_KeyUp             (kb_lkey_t)(7 << 8 | 1<<3)
 
+/**
+ * Compatibility defines
+ */
+#define kb_DataArray ((uint16_t*)0xF50010)
+#define kb_dataArray ((uint16_t*)0xF50010)
+ 
 #endif

CEdev/lib/src/graphics/graphx/v3/build.bat

@@ -4,7 +4,7 @@
 :: Set LIB_SRC to the assembly source of your library
 
 set LIB_NAME=GRAPHX
-set LIB_SRC=graphics_lib.asm
+set LIB_SRC=graphics_lib_old.asm
 
 echo Assembling Library...
 mkdir lib

CEdev/lib/src/graphics/graphx/v3/graphics_lib.asm renamed to CEdev/lib/src/graphics/graphx/v3/graphics_lib_old.asm

@@ -0,0 +1,34 @@
+@echo off
+
+:: Set LIB_NAME to the name of your library
+:: Set LIB_SRC to the assembly source of your library
+
+set LIB_NAME=GRAPHX
+set LIB_SRC=graphics_lib.asm
+
+echo Assembling Library...
+mkdir lib
+set LIB_LIB=%LIB_NAME%.lib
+set LIB_ASM=%LIB_NAME%.asm
+set LIB_8XV=%LIB_NAME%.8xv
+set LIB_JMP=%LIB_NAME%.jmp
+set ASM_SRC=*.src
+set BIN=%CEDEV%\bin
+set ASM=%BIN%\ez80asm.exe
+set LIB=%BIN%\ez80lib.exe
+set ASM_FLG=-genobj -NOigcase -NOlist -NOlistmac -pagelen:56 -pagewidth:100 -quiet -sdiopt -cpu:EZ80F91 -NOdebug
+..\..\..\include\spasm -E %LIB_SRC% %LIB_NAME%.8xv
+echo Building library...
+if exist *.obj del *.obj
+if exist %LIB_LIB% del %LIB_LIB%
+for %%i in (%ASM_SRC%) do %ASM% %ASM_FLG% %%i
+for %%i in (%ASM_SRC%) do %LIB% -quiet -warn %LIB_LIB%=+%%~ni.obj
+if exist *.obj del *.obj
+if exist *.src del *.src
+if exist relocation_table del relocation_table
+move /Y %LIB_LIB% lib > nul
+move /Y %LIB_ASM% lib > nul
+move /Y %LIB_8XV% lib > nul
+move /Y %LIB_JMP% lib > nul
+cd lib
+for /F %%a in ('dir /L /B') do rename %%a %%a