#include "settings.h"
#include "tom.h"
#include "video.h"
+#include "clock.h"
#include "font1.h"
+#include "font14pt.h" // Also 15, 16, 17, 18
+#include "guielements.h"
#include "crc32.h"
#include "zlib.h"
#include "unzip.h"
+#include "sdlemu_opengl.h"
#include "gui.h"
using namespace std; // For STL stuff
class Window; // Forward declaration...
-//void DrawTransparentBitmap(int16 * screen, uint32 x, uint32 y, uint16 * bitmap, uint8 * alpha = NULL);
-//void DrawStringTrans(int16 * screen, uint32 x, uint32 y, uint16 color, uint8 opacity, const char * text, ...);
-//void DrawStringOpaque(int16 * screen, uint32 x, uint32 y, uint16 color1, uint16 color2, const char * text, ...);
-//void DrawString(int16 * screen, uint32 x, uint32 y, bool invert, const char * text, ...);
-void DrawTransparentBitmap(uint32 * screen, uint32 x, uint32 y, uint32 * bitmap, uint8 * alpha = NULL);
+//void DrawTransparentBitmap(uint32 * screen, uint32 x, uint32 y, uint32 * bitmap, uint8 * alpha = NULL);
+void DrawTransparentBitmap(uint32 * screen, uint32 x, uint32 y, uint32 * bitmap);
void DrawStringTrans(uint32 * screen, uint32 x, uint32 y, uint32 color, uint8 opacity, const char * text, ...);
void DrawStringOpaque(uint32 * screen, uint32 x, uint32 y, uint32 color1, uint32 color2, const char * text, ...);
void DrawString(uint32 * screen, uint32 x, uint32 y, bool invert, const char * text, ...);
bool exitGUI = false; // GUI (emulator) done variable
int mouseX, mouseY;
-//uint16 background[1280 * 256]; // GUI background buffer
uint32 background[1280 * 256]; // GUI background buffer
-//NOTE: 32-bit pixels are in the format of ABGR...
-uint32 mousePic[] = {
- 6, 8,
-
- 0xFF00FF00,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000, // +
- 0xFF00C600,0xFF00FF00,0x00000000,0x00000000,0x00000000,0x00000000, // @+
- 0xFF00C600,0xFF00FF00,0xFF00FF00,0x00000000,0x00000000,0x00000000, // @++
- 0xFF00C600,0xFF00C600,0xFF00FF00,0xFF00FF00,0x00000000,0x00000000, // @@++
- 0xFF00C600,0xFF00C600,0xFF00FF00,0xFF00FF00,0xFF00FF00,0x00000000, // @@+++
- 0xFF00C600,0xFF00C600,0xFF00C600,0xFF00FF00,0xFF00FF00,0xFF00FF00, // @@@+++
- 0xFF00C600,0xFF00C600,0xFF00C600,0x00000000,0x00000000,0x00000000, // @@@
- 0xFF00C600,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000 // @
-/*
- 0x03E0,0x0000,0x0000,0x0000,0x0000,0x0000, // +
- 0x0300,0x03E0,0x0000,0x0000,0x0000,0x0000, // @+
- 0x0300,0x03E0,0x03E0,0x0000,0x0000,0x0000, // @++
- 0x0300,0x0300,0x03E0,0x03E0,0x0000,0x0000, // @@++
- 0x0300,0x0300,0x03E0,0x03E0,0x03E0,0x0000, // @@+++
- 0x0300,0x0300,0x0300,0x03E0,0x03E0,0x03E0, // @@@+++
- 0x0300,0x0300,0x0300,0x0000,0x0000,0x0000, // @@@
- 0x0300,0x0000,0x0000,0x0000,0x0000,0x0000 // @
-*/
-/*
- 0xFFFF,0x0000,0x0000,0x0000,0x0000,0x0000, // +
- 0xE318,0xFFFF,0x0000,0x0000,0x0000,0x0000, // @+
- 0xE318,0xFFFF,0xFFFF,0x0000,0x0000,0x0000, // @++
- 0xE318,0xE318,0xFFFF,0xFFFF,0x0000,0x0000, // @@++
- 0xE318,0xE318,0xFFFF,0xFFFF,0xFFFF,0x0000, // @@+++
- 0xE318,0xE318,0xE318,0xFFFF,0xFFFF,0xFFFF, // @@@+++
- 0xE318,0xE318,0xE318,0x0000,0x0000,0x0000, // @@@
- 0xE318,0x0000,0x0000,0x0000,0x0000,0x0000 // @
-*/
-};
-// 1 111 00 11 100 1 1100 -> F39C
-// 1 100 00 10 000 1 0000 -> C210
-// 1 110 00 11 000 1 1000 -> E318
-// 0 000 00 11 111 0 0000 -> 03E0
-// 0 000 00 11 000 0 0000 -> 0300 -> FF00C600
-
-uint32 closeBox[] = {
- 7, 7,
-
-//4B5E -> 010010 11010 11110 -> 0100 1001 1101 0110 1111 0111 -> 49 D6 F7
-//0217 -> 000000 10000 10111 -> 0000 0000 1000 0100 1011 1101 -> 00 84 BD
- 0x00000000,0xFFF7D649,0xFFF7D649,0xFFF7D649,0xFFF7D649,0xFFF7D649,0x00000000, // +++++
- 0xFFF7D649,0xFFFFFFFF,0x00000000,0x00000000,0x00000000,0xFFFFFFFF,0xFFBD8400, // +@ @.
- 0xFFF7D649,0x00000000,0xFFFFFFFF,0x00000000,0xFFFFFFFF,0x00000000,0xFFBD8400, // + @ @ .
- 0xFFF7D649,0x00000000,0x00000000,0xFFFFFFFF,0x00000000,0x00000000,0xFFBD8400, // + @ .
- 0xFFF7D649,0x00000000,0xFFFFFFFF,0x00000000,0xFFFFFFFF,0x00000000,0xFFBD8400, // + @ @ .
- 0xFFF7D649,0xFFFFFFFF,0x00000000,0x00000000,0x00000000,0xFFFFFFFF,0xFFBD8400, // +@ @.
- 0x00000000,0xFFBD8400,0xFFBD8400,0xFFBD8400,0xFFBD8400,0xFFBD8400,0x00000000 // .....
-/*
- 0x0000,0x4B5E,0x4B5E,0x4B5E,0x4B5E,0x4B5E,0x0000, // +++++
- 0x4B5E,0xFFFF,0x0000,0x0000,0x0000,0xFFFF,0x0217, // +@ @.
- 0x4B5E,0x0000,0xFFFF,0x0000,0xFFFF,0x0000,0x0217, // + @ @ .
- 0x4B5E,0x0000,0x0000,0xFFFF,0x0000,0x0000,0x0217, // + @ .
- 0x4B5E,0x0000,0xFFFF,0x0000,0xFFFF,0x0000,0x0217, // + @ @ .
- 0x4B5E,0xFFFF,0x0000,0x0000,0x0000,0xFFFF,0x0217, // +@ @.
- 0x0000,0x0217,0x0217,0x0217,0x0217,0x0217,0x0000 // .....
-*/
-};
-
-uint32 upArrowBox[] = {
- 8, 8,
-
- 0xFFF7D649,0xFFF7D649,0xFFF7D649,0xFFF7D649,0xFFF7D649,0xFFF7D649,0xFFF7D649,0xFFF7D649, // ++++++++
- 0xFFF7D649,0x00000000,0x00000000,0xFFFFFFFF,0xFFFFFFFF,0x00000000,0x00000000,0xFFBD8400, // + @@ .
- 0xFFF7D649,0x00000000,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0x00000000,0xFFBD8400, // + @@@@ .
- 0xFFF7D649,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0xFFBD8400, // +@@@@@@.
- 0xFFF7D649,0x00000000,0x00000000,0xFFFFFFFF,0xFFFFFFFF,0x00000000,0x00000000,0xFFBD8400, // + @@ .
- 0xFFF7D649,0x00000000,0x00000000,0xFFFFFFFF,0xFFFFFFFF,0x00000000,0x00000000,0xFFBD8400, // + @@ .
- 0xFFF7D649,0x00000000,0x00000000,0xFFFFFFFF,0xFFFFFFFF,0x00000000,0x00000000,0xFFBD8400, // + @@ .
- 0xFFBD8400,0xFFBD8400,0xFFBD8400,0xFFBD8400,0xFFBD8400,0xFFBD8400,0xFFBD8400,0xFFBD8400 // ........
-};
-
-uint32 downArrowBox[] = {
- 8, 8,
-
- 0xFFF7D649,0xFFF7D649,0xFFF7D649,0xFFF7D649,0xFFF7D649,0xFFF7D649,0xFFF7D649,0xFFF7D649, // ++++++++
- 0xFFF7D649,0x00000000,0x00000000,0xFFFFFFFF,0xFFFFFFFF,0x00000000,0x00000000,0xFFBD8400, // + @@ .
- 0xFFF7D649,0x00000000,0x00000000,0xFFFFFFFF,0xFFFFFFFF,0x00000000,0x00000000,0xFFBD8400, // + @@ .
- 0xFFF7D649,0x00000000,0x00000000,0xFFFFFFFF,0xFFFFFFFF,0x00000000,0x00000000,0xFFBD8400, // + @@ .
- 0xFFF7D649,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0xFFBD8400, // +@@@@@@.
- 0xFFF7D649,0x00000000,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0x00000000,0xFFBD8400, // + @@@@ .
- 0xFFF7D649,0x00000000,0x00000000,0xFFFFFFFF,0xFFFFFFFF,0x00000000,0x00000000,0xFFBD8400, // + @@ .
- 0xFFBD8400,0xFFBD8400,0xFFBD8400,0xFFBD8400,0xFFBD8400,0xFFBD8400,0xFFBD8400,0xFFBD8400 // ........
-};
-
-uint32 pushButtonUp[] = {
- 8, 8,
-
- 0x00000000, 0xFF1B1B1B, 0xFF545477, 0xFF525292, 0xFF474787, 0xFF363659, 0xFF0F0F0F, 0x00000000,
- 0xFF1B1B1C, 0xFF6666A7, 0xFF393995, 0xFF343492, 0xFF2F2F90, 0xFF2C2C90, 0xFF3B3B7E, 0xFF0F0F0F,
- 0xFF555578, 0xFF3A3A95, 0xFF353594, 0xFF303091, 0xFF2D2D8F, 0xFF2B2B90, 0xFF2A2A92, 0xFF333358,
- 0xFF545493, 0xFF343492, 0xFF303092, 0xFF2D2D8B, 0xFF2B2B8A, 0xFF2A2A8D, 0xFF292994, 0xFF3D3D83,
- 0xFF484889, 0xFF2F2F90, 0xFF2D2D8F, 0xFF2B2B8A, 0xFF2A2A89, 0xFF29298E, 0xFF292998, 0xFF3D3D84,
- 0xFF37375A, 0xFF2C2C90, 0xFF2B2B90, 0xFF2A2A8D, 0xFF29298E, 0xFF292995, 0xFF29299D, 0xFF34345B,
- 0xFF0E0E0E, 0xFF3E3E7F, 0xFF2A2A92, 0xFF292994, 0xFF292998, 0xFF29299D, 0xFF3C3C88, 0xFF0E0E0E,
- 0x00000000, 0xFF0D0D0D, 0xFF343456, 0xFF3D3D80, 0xFF3D3D82, 0xFF333358, 0xFF0D0D0D, 0x00000000
-};
-
-uint8 pbuAlpha[] = {
- 0xFF, 0xE4, 0xA0, 0x99, 0xA4, 0xBE, 0xF0, 0xFF,
- 0xE3, 0x85, 0x00, 0x00, 0x00, 0x00, 0xAF, 0xF0,
- 0x9F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC0,
- 0x98, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xAD,
- 0xA3, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xAC,
- 0xBD, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xBF,
- 0xF1, 0xAD, 0x00, 0x00, 0x00, 0x00, 0xAC, 0xF1,
- 0xFF, 0xF2, 0xC0, 0xAD, 0xAD, 0xC0, 0xF2, 0xFF
-};
-
-uint32 pushButtonDown[] = {
- 8, 8,
-
- 0x00000000, 0xFF1B1B1B, 0xFF8B8B90, 0xFF8C8CAF, 0xFF767699, 0xFF56565B, 0xFF0F0F0F, 0x00000000,
- 0xFF1B1B1B, 0xFFB8B8D6, 0xFF5555E4, 0xFF4444F2, 0xFF4040F1, 0xFF4141D5, 0xFF626282, 0xFF0F0F0F,
- 0xFF8C8C91, 0xFF5555E4, 0xFF4444EF, 0xFF3E3EDC, 0xFF3B3BDB, 0xFF3D3DEC, 0xFF3E3ED4, 0xFF4B4B51,
- 0xFF8D8DB1, 0xFF4444F2, 0xFF3E3EDC, 0xFF3E3EDD, 0xFF3C3CDC, 0xFF3939D9, 0xFF3C3CF3, 0xFF59597E,
- 0xFF77779B, 0xFF4141F1, 0xFF3B3BDB, 0xFF3C3CDC, 0xFF3B3BDC, 0xFF3838D9, 0xFF3C3CF5, 0xFF595980,
- 0xFF57575D, 0xFF4242D8, 0xFF3D3DEC, 0xFF3939D9, 0xFF3838D9, 0xFF3C3CEF, 0xFF3D3DDC, 0xFF4C4C52,
- 0xFF101010, 0xFF636385, 0xFF3E3ED8, 0xFF3D3DF4, 0xFF3D3DF6, 0xFF3D3DDD, 0xFF5D5D83, 0xFF101010,
- 0x00000000, 0xFF101010, 0xFF4E4E55, 0xFF5B5B83, 0xFF5B5B84, 0xFF4D4D54, 0xFF101010, 0x00000000
-};
-
-uint8 pbdAlpha[] = {
- 0xFF, 0xE4, 0x72, 0x68, 0x7E, 0xA7, 0xF0, 0xFF,
- 0xE4, 0x3E, 0x00, 0x00, 0x00, 0x00, 0x93, 0xF0,
- 0x71, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xB2,
- 0x67, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x9A,
- 0x7D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x9A,
- 0xA6, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xB1,
- 0xEF, 0x91, 0x00, 0x00, 0x00, 0x00, 0x96, 0xEF,
- 0xFF, 0xEF, 0xAE, 0x98, 0x97, 0xAF, 0xEF, 0xFF
-};
-
-uint32 slideSwitchUp[] = {
- 8, 16,
-
-//0C7F -> 000011 00011 11111 -> 0000 1100 0001 1000 1111 1111 -> 0C 18 FF
- 0xFFF7D649,0xFFF7D649,0xFFF7D649,0xFFF7D649,0xFFF7D649,0xFFF7D649,0xFFF7D649,0xFFF7D649, // ++++++++
- 0xFFF7D649,0xFFFF180C,0xFFFF180C,0xFFFF180C,0xFFFF180C,0xFFFF180C,0xFFFF180C,0xFFBD8400, // + .
- 0xFFF7D649,0xFFFF180C,0xFFFF180C,0xFFFF180C,0xFFFF180C,0xFFFF180C,0xFFFF180C,0xFFBD8400, // + .
- 0xFFF7D649,0xFFFF180C,0xFFFF180C,0xFFFF180C,0xFFFF180C,0xFFFF180C,0xFFFF180C,0xFFBD8400, // + .
- 0xFFF7D649,0xFFFF180C,0xFFFF180C,0xFFFF180C,0xFFFF180C,0xFFFF180C,0xFFFF180C,0xFFBD8400, // + .
- 0xFFF7D649,0xFFFF180C,0xFFFF180C,0xFFFF180C,0xFFFF180C,0xFFFF180C,0xFFFF180C,0xFFBD8400, // + .
- 0xFFF7D649,0xFFFF180C,0xFFFF180C,0xFFFF180C,0xFFFF180C,0xFFFF180C,0xFFFF180C,0xFFBD8400, // + .
- 0xFFF7D649,0xFFFF180C,0xFFFF180C,0xFFFF180C,0xFFFF180C,0xFFFF180C,0xFFFF180C,0xFFBD8400, // + .
- 0xFFF7D649,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0xFFBD8400, // +.......
- 0xFFF7D649,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0xFFBD8400, // +.......
- 0xFFF7D649,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0xFFBD8400, // +.......
- 0xFFF7D649,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0xFFBD8400, // +.......
- 0xFFF7D649,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0xFFBD8400, // +.......
- 0xFFF7D649,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0xFFBD8400, // +.......
- 0xFFF7D649,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0xFFBD8400, // +.......
- 0xFFBD8400,0xFFBD8400,0xFFBD8400,0xFFBD8400,0xFFBD8400,0xFFBD8400,0xFFBD8400,0xFFBD8400 // ........
-};
-
-uint32 slideSwitchDown[] = {
- 8, 16,
-
- 0xFFF7D649,0xFFF7D649,0xFFF7D649,0xFFF7D649,0xFFF7D649,0xFFF7D649,0xFFF7D649,0xFFF7D649, // ++++++++
- 0xFFF7D649,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0xFFBD8400, // +.......
- 0xFFF7D649,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0xFFBD8400, // +.......
- 0xFFF7D649,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0xFFBD8400, // +.......
- 0xFFF7D649,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0xFFBD8400, // +.......
- 0xFFF7D649,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0xFFBD8400, // +.......
- 0xFFF7D649,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0xFFBD8400, // +.......
- 0xFFF7D649,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0xFFBD8400, // +.......
- 0xFFF7D649,0xFFFF180C,0xFFFF180C,0xFFFF180C,0xFFFF180C,0xFFFF180C,0xFFFF180C,0xFFBD8400, // + .
- 0xFFF7D649,0xFFFF180C,0xFFFF180C,0xFFFF180C,0xFFFF180C,0xFFFF180C,0xFFFF180C,0xFFBD8400, // + .
- 0xFFF7D649,0xFFFF180C,0xFFFF180C,0xFFFF180C,0xFFFF180C,0xFFFF180C,0xFFFF180C,0xFFBD8400, // + .
- 0xFFF7D649,0xFFFF180C,0xFFFF180C,0xFFFF180C,0xFFFF180C,0xFFFF180C,0xFFFF180C,0xFFBD8400, // + .
- 0xFFF7D649,0xFFFF180C,0xFFFF180C,0xFFFF180C,0xFFFF180C,0xFFFF180C,0xFFFF180C,0xFFBD8400, // + .
- 0xFFF7D649,0xFFFF180C,0xFFFF180C,0xFFFF180C,0xFFFF180C,0xFFFF180C,0xFFFF180C,0xFFBD8400, // + .
- 0xFFF7D649,0xFFFF180C,0xFFFF180C,0xFFFF180C,0xFFFF180C,0xFFFF180C,0xFFFF180C,0xFFBD8400, // + .
- 0xFFBD8400,0xFFBD8400,0xFFBD8400,0xFFBD8400,0xFFBD8400,0xFFBD8400,0xFFBD8400,0xFFBD8400 // ........
-};
-
-/*uint32 [] = {
- 8, 8,
-
- 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000, // ........
- 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000, // ........
- 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000, // ........
- 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000, // ........
- 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000, // ........
- 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000, // ........
- 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000, // ........
- 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000 // ........
-};*/
-
char separator[] = "--------------------------------------------------------";
//
Button(uint32 x, uint32 y, uint32 w, uint32 h, uint32 * p): Element(x, y, w, h),
activated(false), clicked(false), inside(false), fgColor(0xFFFFFFFF),
bgColor(0xFF00FF00), pic(p), elementToTell(NULL) {}
- Button(uint32 x, uint32 y, uint32 * p): Element(x, y, 0, 0),
+// Button(uint32 x, uint32 y, uint32 * p): Element(x, y, 0, 0),
+ Button(uint32 x, uint32 y, uint32 * p, uint32 * pH = NULL, uint32 * pD = NULL): Element(x, y, 0, 0),
activated(false), clicked(false), inside(false), fgColor(0xFFFFFFFF),
- bgColor(0xFF00FF00), pic(p), elementToTell(NULL)
+ bgColor(0xFF00FF00), pic(p), picHover(pH), picDown(pD), elementToTell(NULL)
{ if (pic) extents.w = pic[0], extents.h = pic[1]; }
Button(uint32 x, uint32 y, uint32 w, uint32 h, string s): Element(x, y, w, h),
activated(false), clicked(false), inside(false), fgColor(0xFFFFFFFF),
bgColor(0xFF00FF00), pic(NULL), text(s), elementToTell(NULL) {}
- Button(uint32 x, uint32 y, string s): Element(x, y, 0, 8),
+ Button(uint32 x, uint32 y, string s): Element(x, y, 0, FONT_HEIGHT),
activated(false), clicked(false), inside(false), fgColor(0xFFFFFFFF),
bgColor(0xFF00FF00), pic(NULL), text(s), elementToTell(NULL)
- { extents.w = s.length() * 8; }
+ { extents.w = s.length() * FONT_WIDTH; }
virtual void HandleKey(SDLKey key) {}
virtual void HandleMouseMove(uint32 x, uint32 y);
virtual void HandleMouseButton(uint32 x, uint32 y, bool mouseDown);
protected:
bool activated, clicked, inside;
uint32 fgColor, bgColor;
- uint32 * pic;
+ uint32 * pic, * picHover, * picDown;
string text;
Element * elementToTell;
};
{
uint32 addr = (extents.x + offsetX) + ((extents.y + offsetY) * pitch);
- for(uint32 y=0; y<extents.h; y++)
+ if (text.length() > 0) // Simple text button
+// if (pic == NULL)
{
- for(uint32 x=0; x<extents.w; x++)
+ for(uint32 y=0; y<extents.h; y++)
{
- // Doesn't clip in y axis! !!! FIX !!!
- if (extents.x + x < pitch)
- screenBuffer[addr + x + (y * pitch)]
+ for(uint32 x=0; x<extents.w; x++)
+ {
+ // Doesn't clip in y axis! !!! FIX !!!
+ if (extents.x + x < pitch)
+ screenBuffer[addr + x + (y * pitch)]
// = (clicked && inside ? fgColor : (inside ? 0x43F0 : bgColor));
//43F0 -> 010000 11111 10000 -> 0100 0001 1111 1111 1000 0100 -> 41 FF 84
- = (clicked && inside ? fgColor : (inside ? 0xFF84FF41 : bgColor));
+ = (clicked && inside ? fgColor : (inside ? 0xFF84FF41 : bgColor));
+ }
}
+
+ DrawString(screenBuffer, extents.x + offsetX, extents.y + offsetY, false, "%s", text.c_str());
}
+ else // Graphical button
+ {
+ uint32 * picToShow = pic;
- if (pic != NULL)
- DrawTransparentBitmap(screenBuffer, extents.x + offsetX, extents.y + offsetY, pic);
+ if (picHover != NULL && inside && !clicked)
+ picToShow = picHover;
- if (text.length() > 0)
- DrawString(screenBuffer, extents.x + offsetX, extents.y + offsetY, false, "%s", text.c_str());
+ if (picDown != NULL && inside && clicked)
+ picToShow = picDown;
+
+ DrawTransparentBitmap(screenBuffer, extents.x + offsetX, extents.y + offsetY, picToShow);
+ }
}
}
}*/
-// DrawTransparentBitmap(screenBuffer, extents.x + offsetX, extents.y + offsetY, (*state ? pushButtonDown : pushButtonUp));
- DrawTransparentBitmap(screenBuffer, extents.x + offsetX, extents.y + offsetY, (*state ? pushButtonDown : pushButtonUp), (*state ? pbdAlpha : pbuAlpha));
+ DrawTransparentBitmap(screenBuffer, extents.x + offsetX, extents.y + offsetY, (*state ? pushButtonDown : pushButtonUp));
+// DrawTransparentBitmap(screenBuffer, extents.x + offsetX, extents.y + offsetY, (*state ? pushButtonDown : pushButtonUp), (*state ? pbdAlpha : pbuAlpha));
if (text.length() > 0)
DrawString(screenBuffer, extents.x + offsetX + 12, extents.y + offsetY, false, "%s", text.c_str());
}
//1E10 -> 000111 10000 10000 -> 0001 1111 1000 0100 1000 0100 -> 1F 84 84
/*clicked(false), inside(false),*/ fgColor(0xFF84FF4D), bgColor(0xFF84841F),
handler(f)
- { close = new Button(w - 8, 1, closeBox); list.push_back(close);
+ { close = new Button(w - (CLOSEBOX_WIDTH + 1), 1, closeBox, closeBoxHover, closeBoxDown);
+ list.push_back(close);
close->SetNotificationElement(this); }
virtual ~Window();
virtual void HandleKey(SDLKey key);
//4FF0 -> 010011 11111 10000 -> 0100 1101 1111 1111 1000 0100 -> 4D FF 84
//FE10 -> 111111 10000 10000 -> 1111 1111 1000 0100 1000 0100 -> FF 84 84
Text(uint32 x = 0, uint32 y = 0, uint32 w = 0, uint32 h = 0): Element(x, y, w, h),
- fgColor(0xFF84FF4D), bgColor(0xFF8484FF) {}
- Text(uint32 x, uint32 y, string s, uint32 fg = 0xFF84FF4D, uint32 bg = 0xFF8484FF): Element(x, y, 0, 0),
- fgColor(fg), bgColor(bg), text(s) {}
+ fgColor(0xFF8484FF), bgColor(0xFF84FF4D) {}
+ Text(uint32 x, uint32 y, string s, uint32 fg = 0xFF8484FF, uint32 bg = 0xFF84FF4D):
+ Element(x, y, 0, 0), fgColor(fg), bgColor(bg), text(s) {}
virtual void HandleKey(SDLKey key) {}
virtual void HandleMouseMove(uint32 x, uint32 y) {}
virtual void HandleMouseButton(uint32 x, uint32 y, bool mouseDown) {}
};
ListBox::ListBox(uint32 x, uint32 y, uint32 w, uint32 h): Element(x, y, w, h),
- thumbClicked(false), windowPtr(0), cursor(0), limit(0), charWidth((w / 8) - 1),
- charHeight(h / 8), elementToTell(NULL), upArrow(w - 8, 0, upArrowBox),
+ thumbClicked(false), windowPtr(0), cursor(0), limit(0), charWidth((w / FONT_WIDTH) - 1),
+ charHeight(h / FONT_HEIGHT), elementToTell(NULL), upArrow(w - 8, 0, upArrowBox),
downArrow(w - 8, h - 8, downArrowBox), upArrow2(w - 8, h - 16, upArrowBox)
{
upArrow.SetNotificationElement(this);
{
// Why do we have to do this??? (- extents.y?)
// I guess it's because only the Window class has offsetting implemented... !!! FIX !!!
- cursor = (y - extents.y) / 8;
+// cursor = (y - extents.y) / 8;
+ cursor = (y - extents.y) / FONT_HEIGHT;
}
// Check for a hit on the scrollbar...
// Strip off the extension
// (extension stripping should be an option, not default!)
string s(item[windowPtr + i], 0, item[windowPtr + i].length() - 4);
- DrawString(screenBuffer, extents.x + offsetX, extents.y + offsetY + i*8,
+// DrawString(screenBuffer, extents.x + offsetX, extents.y + offsetY + i*8,
+ DrawString(screenBuffer, extents.x + offsetX, extents.y + offsetY + i*FONT_HEIGHT,
(cursor == i ? true : false), "%-*.*s", charWidth, charWidth, s.c_str());
}
DIR * dp = opendir(vjs.ROMPath);
dirent * de;
- while ((de = readdir(dp)) != NULL)
+ if (dp != NULL)
{
- char * ext = strrchr(de->d_name, '.');
-
- if (ext != NULL)
- if (strcasecmp(ext, ".zip") == 0 || strcasecmp(ext, ".j64") == 0
- || strcasecmp(ext, ".abs") == 0 || strcasecmp(ext, ".jag") == 0
- || strcasecmp(ext, ".rom") == 0)
- files->AddItem(string(de->d_name));
+ while ((de = readdir(dp)) != NULL)
+ {
+ char * ext = strrchr(de->d_name, '.');
+
+ if (ext != NULL)
+ if (strcasecmp(ext, ".zip") == 0 || strcasecmp(ext, ".j64") == 0
+ || strcasecmp(ext, ".abs") == 0 || strcasecmp(ext, ".jag") == 0
+ || strcasecmp(ext, ".rom") == 0)
+ files->AddItem(string(de->d_name));
+ }
+
+ closedir(dp);
+ }
+ else
+ {
+//Give a diagnostic message here so that the (l)user can figure out what went wrong. !!! FIX !!!
}
-
- closedir(dp);
}
void FileList::HandleKey(SDLKey key)
public:
// 1CFF -> 0 001 11 00 111 1 1111
// 421F -> 0 100 00 10 000 1 1111
- Menu(uint32 x = 0, uint32 y = 0, uint32 w = 0, uint32 h = 8,
+ Menu(uint32 x = 0, uint32 y = 0, uint32 w = 0, uint32 h = FONT_HEIGHT,
/* uint16 fgc = 0x1CFF, uint16 bgc = 0x000F, uint16 fgch = 0x421F,
uint16 bgch = 0x1CFF): Element(x, y, w, h), activated(false), clicked(false),*/
/* uint32 fgc = 0xFF3F3F00, uint32 bgc = 0x7F000000, uint32 fgch = 0xFF878700,
uint32 bgch = 0xFF3F3F00): Element(x, y, w, h), activated(false), clicked(false),*/
- uint32 fgc = 0xFFFF3F3F, uint32 bgc = 0xFF7F0000, uint32 fgch = 0xFFFF8787,
- uint32 bgch = 0xFFFF3F3F): Element(x, y, w, h), activated(false), clicked(false),
+/* uint32 fgc = 0xFFFF3F3F, uint32 bgc = 0xFF7F0000, uint32 fgch = 0xFFFF8787,
+ uint32 bgch = 0xFFFF3F3F): Element(x, y, w, h), activated(false), clicked(false),*/
+ uint32 fgc = 0xFF7F0000, uint32 bgc = 0xFFFF3F3F, uint32 fgch = 0xFFFF3F3F,
+ uint32 bgch = 0xFFFF8787): Element(x, y, w, h), activated(false), clicked(false),
inside(0), insidePopup(0), fgColor(fgc), bgColor(bgc), fgColorHL(fgch),
bgColorHL(bgch), menuChosen(-1), menuItemChosen(-1) {}
virtual void HandleKey(SDLKey key);
for(uint32 i=0; i<itemList.size(); i++)
{
- uint32 width = (itemList[i].title.length() + 2) * 8;
+ uint32 width = (itemList[i].title.length() + 2) * FONT_WIDTH;
if (x >= xpos && x < xpos + width)
{
if (itemList[menuChosen].Inside(x, y) && clicked)
{
- insidePopup = ((y - itemList[menuChosen].extents.y) / 8) + 1;
+ insidePopup = ((y - itemList[menuChosen].extents.y) / FONT_HEIGHT) + 1;
menuItemChosen = insidePopup - 1;
}
}
DrawStringOpaque(screenBuffer, xpos, extents.y + offsetY, color1, color2,
" %s ", itemList[i].title.c_str());
- xpos += (itemList[i].title.length() + 2) * 8;
+ xpos += (itemList[i].title.length() + 2) * FONT_WIDTH;
}
// Draw sub menu (but only if active)
if (clicked)
{
- uint32 ypos = extents.y + 9;
+ uint32 ypos = extents.y + FONT_HEIGHT + 1;
for(uint32 i=0; i<itemList[menuChosen].item.size(); i++)
{
DrawStringOpaque(screenBuffer, itemList[menuChosen].extents.x, ypos,
fgColor, bgColor, "%.*s", itemList[menuChosen].charLength + 2, separator);
- ypos += 8;
+ ypos += FONT_HEIGHT;
}
}
}
mi.charLength = mi.item[i].name.length();
// Set extents here as well...
- mi.extents.x = extents.x + extents.w, mi.extents.y = extents.y + 9;
- mi.extents.w = (mi.charLength + 2) * 8, mi.extents.h = mi.item.size() * 8;
+ mi.extents.x = extents.x + extents.w, mi.extents.y = extents.y + FONT_HEIGHT + 1;
+ mi.extents.w = (mi.charLength + 2) * FONT_WIDTH, mi.extents.h = mi.item.size() * FONT_HEIGHT;
itemList.push_back(mi);
- extents.w += (mi.title.length() + 2) * 8;
+ extents.w += (mi.title.length() + 2) * FONT_WIDTH;
}
//
// Draw text at the given x/y coordinates. Can invert text as well.
//
-//void DrawString(int16 * screen, uint32 x, uint32 y, bool invert, const char * text, ...)
void DrawString(uint32 * screen, uint32 x, uint32 y, bool invert, const char * text, ...)
{
char string[4096];
vsprintf(string, text, arg);
va_end(arg);
-// uint32 pitch = GetSDLScreenPitch() / 2; // Returns pitch in bytes but we need words...
- uint32 pitch = GetSDLScreenWidthInPixels();
+ uint32 pitch = sdlemuGetOverlayWidthInPixels();//GetSDLScreenWidthInPixels();
uint32 length = strlen(string), address = x + (y * pitch);
+ uint32 color1 = 0x0080FF;
+ uint8 nBlue = (color1 >> 16) & 0xFF, nGreen = (color1 >> 8) & 0xFF, nRed = color1 & 0xFF;
+ uint8 xorMask = (invert ? 0xFF : 0x00);
+
for(uint32 i=0; i<length; i++)
{
- uint32 fontAddr = (uint32)string[i] * 64;
+ uint8 c = string[i];
+ uint32 fontAddr = (uint32)(c < 32 ? 0 : c - 32) * FONT_WIDTH * FONT_HEIGHT;
- for(uint32 yy=0; yy<8; yy++)
+ for(uint32 yy=0; yy<FONT_HEIGHT; yy++)
{
- for(uint32 xx=0; xx<8; xx++)
+ for(uint32 xx=0; xx<FONT_WIDTH; xx++)
{
- if ((font1[fontAddr] && !invert) || (!font1[fontAddr] && invert))
-// *(screen + address + xx + (yy * pitch)) = 0xFE00;
- *(screen + address + xx + (yy * pitch)) = 0xFF0080FF;
+ uint32 existingColor = *(screen + address + xx + (yy * pitch));
+
+ uint8 eBlue = (existingColor >> 16) & 0xFF,
+ eGreen = (existingColor >> 8) & 0xFF,
+ eRed = existingColor & 0xFF;
+
+ uint8 trans = font2[fontAddr] ^ xorMask;
+ uint8 invTrans = trans ^ 0xFF;
+
+ uint32 bRed = (eRed * invTrans + nRed * trans) / 255,
+ bGreen = (eGreen * invTrans + nGreen * trans) / 255,
+ bBlue = (eBlue * invTrans + nBlue * trans) / 255;
+
+ *(screen + address + xx + (yy * pitch)) = 0xFF000000 | (bBlue << 16) | (bGreen << 8) | bRed;
fontAddr++;
}
}
- address += 8;
+ address += FONT_WIDTH;
}
}
//
// Draw text at the given x/y coordinates, using FG/BG colors.
//
-//void DrawStringOpaque(int16 * screen, uint32 x, uint32 y, uint16 color1, uint16 color2, const char * text, ...)
void DrawStringOpaque(uint32 * screen, uint32 x, uint32 y, uint32 color1, uint32 color2, const char * text, ...)
{
char string[4096];
vsprintf(string, text, arg);
va_end(arg);
-// uint32 pitch = GetSDLScreenPitch() / 2; // Returns pitch in bytes but we need words...
- uint32 pitch = GetSDLScreenWidthInPixels();
+ uint32 pitch = sdlemuGetOverlayWidthInPixels();
uint32 length = strlen(string), address = x + (y * pitch);
+ uint8 eBlue = (color2 >> 16) & 0xFF, eGreen = (color2 >> 8) & 0xFF, eRed = color2 & 0xFF,
+ nBlue = (color1 >> 16) & 0xFF, nGreen = (color1 >> 8) & 0xFF, nRed = color1 & 0xFF;
+
for(uint32 i=0; i<length; i++)
{
- uint32 fontAddr = (uint32)string[i] * 64;
+ uint8 c = string[i];
+ c = (c < 32 ? 0 : c - 32);
+ uint32 fontAddr = (uint32)c * FONT_WIDTH * FONT_HEIGHT;
- for(uint32 yy=0; yy<8; yy++)
+ for(uint32 yy=0; yy<FONT_HEIGHT; yy++)
{
- for(uint32 xx=0; xx<8; xx++)
+ for(uint32 xx=0; xx<FONT_WIDTH; xx++)
{
- *(screen + address + xx + (yy * pitch)) = (font1[fontAddr] ? color1 : color2);
- fontAddr++;
+ uint8 trans = font2[fontAddr++];
+ uint8 invTrans = trans ^ 0xFF;
+
+ uint32 bRed = (eRed * invTrans + nRed * trans) / 255;
+ uint32 bGreen = (eGreen * invTrans + nGreen * trans) / 255;
+ uint32 bBlue = (eBlue * invTrans + nBlue * trans) / 255;
+
+ *(screen + address + xx + (yy * pitch)) = 0xFF000000 | (bBlue << 16) | (bGreen << 8) | bRed;
}
}
- address += 8;
+ address += FONT_WIDTH;
}
}
//
// Draw text at the given x/y coordinates with transparency (0 is fully opaque, 32 is fully transparent).
//
-//void DrawStringTrans(int16 * screen, uint32 x, uint32 y, uint16 color, uint8 trans, const char * text, ...)
void DrawStringTrans(uint32 * screen, uint32 x, uint32 y, uint32 color, uint8 trans, const char * text, ...)
{
char string[4096];
vsprintf(string, text, arg);
va_end(arg);
-// uint32 pitch = GetSDLScreenPitch() / 2; // Returns pitch in bytes but we need words...
- uint32 pitch = GetSDLScreenWidthInPixels();
+ uint32 pitch = sdlemuGetOverlayWidthInPixels();//GetSDLScreenWidthInPixels();
uint32 length = strlen(string), address = x + (y * pitch);
for(uint32 i=0; i<length; i++)
{
if (font1[fontAddr])
{
-// uint16 existingColor = *(screen + address + xx + (yy * pitch));
uint32 existingColor = *(screen + address + xx + (yy * pitch));
-/* uint8 eRed = (existingColor >> 10) & 0x1F,
- eGreen = (existingColor >> 5) & 0x1F,
- eBlue = existingColor & 0x1F,
-//This could be done ahead of time, instead of on each pixel...
- nRed = (color >> 10) & 0x1F,
- nGreen = (color >> 5) & 0x1F,
- nBlue = color & 0x1F;//*/
uint8 eBlue = (existingColor >> 16) & 0xFF,
eGreen = (existingColor >> 8) & 0xFF,
eRed = existingColor & 0xFF,
//Here we've modified it to have 33 levels of transparency (could have any # we want!)
//because dividing by 32 is faster than dividing by 31...!
uint8 invTrans = 32 - trans;
-/* uint16 bRed = (eRed * trans + nRed * invTrans) / 32;
- uint16 bGreen = (eGreen * trans + nGreen * invTrans) / 32;
- uint16 bBlue = (eBlue * trans + nBlue * invTrans) / 32;
-
- uint16 blendedColor = (bRed << 10) | (bGreen << 5) | bBlue;//*/
uint32 bRed = (eRed * trans + nRed * invTrans) / 32;
uint32 bGreen = (eGreen * trans + nGreen * invTrans) / 32;
// Draw "picture"
// Uses zero as transparent color
// Can also use an optional alpha channel
+// Alpha channel is now mandatory! ;-)
//
//void DrawTransparentBitmap(int16 * screen, uint32 x, uint32 y, uint16 * bitmap, uint8 * alpha/*=NULL*/)
-void DrawTransparentBitmap(uint32 * screen, uint32 x, uint32 y, uint32 * bitmap, uint8 * alpha/*=NULL*/)
+/*void DrawTransparentBitmap(uint32 * screen, uint32 x, uint32 y, uint32 * bitmap, uint8 * alpha)
{
uint32 width = bitmap[0], height = bitmap[1];
bitmap += 2;
// uint32 pitch = GetSDLScreenPitch() / 2; // Returns pitch in bytes but we need words...
- uint32 pitch = GetSDLScreenWidthInPixels();
+ uint32 pitch = sdlemuGetOverlayWidthInPixels();//GetSDLScreenWidthInPixels();
uint32 address = x + (y * pitch);
for(uint32 yy=0; yy<height; yy++)
alpha++;
}
+ bitmap++;
+ }
+ }
+}*/
+void DrawTransparentBitmap(uint32 * screen, uint32 x, uint32 y, uint32 * bitmap)
+{
+ uint32 width = bitmap[0], height = bitmap[1];
+ bitmap += 2;
+
+ uint32 pitch = sdlemuGetOverlayWidthInPixels();//GetSDLScreenWidthInPixels();
+ uint32 address = x + (y * pitch);
+
+ for(uint32 yy=0; yy<height; yy++)
+ {
+ for(uint32 xx=0; xx<width; xx++)
+ {
+ uint32 color = *bitmap;
+ uint32 blendedColor = color;
+ uint32 existingColor = *(screen + address + xx + (yy * pitch));
+
+ if (existingColor >> 24 != 0x00) // Pixel needs blending
+ {
+ uint8 trans = color >> 24;
+ uint8 invTrans = trans ^ 0xFF;//255 - trans;
+
+ uint8 eRed = existingColor & 0xFF,
+ eGreen = (existingColor >> 8) & 0xFF,
+ eBlue = (existingColor >> 16) & 0xFF,
+
+ nRed = color & 0xFF,
+ nGreen = (color >> 8) & 0xFF,
+ nBlue = (color >> 16) & 0xFF;
+
+ uint32 bRed = (eRed * invTrans + nRed * trans) / 255;
+ uint32 bGreen = (eGreen * invTrans + nGreen * trans) / 255;
+ uint32 bBlue = (eBlue * invTrans + nBlue * trans) / 255;
+
+ blendedColor = 0xFF000000 | bRed | (bGreen << 8) | (bBlue << 16);
+ }
+
+ *(screen + address + xx + (yy * pitch)) = blendedColor;
bitmap++;
}
}
Window * mainWindow = NULL;
// Set up the GUI classes...
-// Element::SetScreenAndPitch(backbuffer, GetSDLScreenPitch() / 2);
- Element::SetScreenAndPitch(backbuffer, GetSDLScreenWidthInPixels());
+// Element::SetScreenAndPitch(backbuffer, GetSDLScreenWidthInPixels());
+ Element::SetScreenAndPitch((uint32 *)sdlemuGetOverlayPixels(), sdlemuGetOverlayWidthInPixels());
+ sdlemuEnableOverlay();
Menu mainMenu;
MenuItems mi;
// memset(background, 0x11, tom_getVideoModeWidth() * 240 * 2);
//1111 -> 000100 01000 10001 -> 0001 0000 0100 0010 1000 1100 -> 10 42 8C
for(uint32 i=0; i<tom_getVideoModeWidth()*240; i++)
- background[i] = 0xFF8C4210;
+// background[i] = 0xFF8C4210;
+ backbuffer[i] = 0xFF8C4210;
+
+/* uint32 * overlayPix = (uint32 *)sdlemuGetOverlayPixels();
+ for(uint32 i=0; i<sdlemuGetOverlayWidthInPixels()*480; i++)
+ overlayPix[i] = 0x00000000;*/
// Handle loading file passed in on the command line...! [DONE]
SDL_PushEvent(&event); // & update mouse position...!
mouseX = mx, mouseY = my; // This prevents "mouse flash"...
- if (vjs.useOpenGL)
- mouseX /= 2, mouseY /= 2;
+// if (vjs.useOpenGL)
+// mouseX /= 2, mouseY /= 2;
}
}
else if (event.type == SDL_ACTIVEEVENT)
{
mouseX = event.motion.x, mouseY = event.motion.y;
- if (vjs.useOpenGL)
- mouseX /= 2, mouseY /= 2;
+// if (vjs.useOpenGL)
+// mouseX /= 2, mouseY /= 2;
if (mainWindow)
mainWindow->HandleMouseMove(mouseX, mouseY);
{
uint32 mx = event.button.x, my = event.button.y;
- if (vjs.useOpenGL)
- mx /= 2, my /= 2;
+// if (vjs.useOpenGL)
+// mx /= 2, my /= 2;
if (mainWindow)
mainWindow->HandleMouseButton(mx, my, true);
{
uint32 mx = event.button.x, my = event.button.y;
- if (vjs.useOpenGL)
- mx /= 2, my /= 2;
+// if (vjs.useOpenGL)
+// mx /= 2, my /= 2;
if (mainWindow)
mainWindow->HandleMouseButton(mx, my, false);
// our clearing, but for now, this will suffice.
// memset(backbuffer, 0x11, tom_getVideoModeWidth() * 240 * 2);
// memcpy(backbuffer, background, tom_getVideoModeWidth() * 256 * 2);
- memcpy(backbuffer, background, tom_getVideoModeWidth() * 256 * 4);
+// memcpy(backbuffer, background, tom_getVideoModeWidth() * 256 * 4);
+ memset(sdlemuGetOverlayPixels(), 0, sdlemuGetOverlayWidthInPixels() * 480 * 4);
mainMenu.Draw();
//Could do multiple windows here by using a vector + priority info...
if (showMouse)
// DrawTransparentBitmap(backbuffer, mouseX, mouseY, mousePic);
- DrawTransparentBitmap(backbuffer, mouseX, mouseY, mousePic);
+ DrawTransparentBitmap((uint32 *)sdlemuGetOverlayPixels(), mouseX, mouseY, mousePic);
RenderBackbuffer();
}
Window * LoadROM(void)
{
- FileList * fileList = new FileList(8, 16, 304, 216);
+ FileList * fileList = new FileList(20, 20, 600, 440);
return (Window *)fileList;
}
bool debounceRunKey = true;
Window * RunEmu(void)
{
-//This is crappy... !!! FIX !!!
extern uint32 * backbuffer;
+//Temporary, to test the new timer based code...
+sdlemuDisableOverlay();
+JaguarExecuteNew();
+sdlemuEnableOverlay();
+ // Save the background for the GUI...
+// memcpy(background, backbuffer, tom_getVideoModeWidth() * 240 * 2);
+ // In this case, we squash the color to monochrome, then force it to blue + green...
+ for(uint32 i=0; i<tom_getVideoModeWidth() * 256; i++)
+ {
+// uint32 word = backbuffer[i];
+// uint8 r = (word >> 10) & 0x1F, g = (word >> 5) & 0x1F, b = word & 0x1F;
+// word = ((r + g + b) / 3) & 0x001F;
+// word = (word << 5) | word;
+// background[i] = word;
+
+ uint32 pixel = backbuffer[i];
+ uint8 b = (pixel >> 16) & 0xFF, g = (pixel >> 8) & 0xFF, r = pixel & 0xFF;
+ pixel = ((r + g + b) / 3) & 0x00FF;
+// background[i] = 0xFF000000 | (pixel << 16) | (pixel << 8);
+ backbuffer[i] = 0xFF000000 | (pixel << 16) | (pixel << 8);
+ }
+return NULL;//*/
+
+//This is crappy... !!! FIX !!!
extern bool finished, showGUI;
- uint32 nFrame = 0, nFrameskip = 0;
+// uint32 nFrame = 0, nFrameskip = 0;
uint32 totalFrames = 0;
finished = false;
bool showMessage = true;
cartType = 3;
char * cartTypeName[5] = { "2M Cartridge", "4M Cartridge", "CD BIOS", "CD Dev BIOS", "Homebrew" };
+ uint32 elapsedTicks = SDL_GetTicks(), frameCount = 0, framesPerSecond = 0;
-// while (!finished)
while (true)
{
// Set up new backbuffer with new pixels and data
JaguarExecute(backbuffer, true);
+// JaguarExecuteNew();
totalFrames++;
//WriteLog("Frame #%u...\n", totalFrames);
//extern bool doDSPDis;
if (showGUI)
{
extern uint32 gpu_pc, dsp_pc;
- DrawString((uint32 *)backbuffer, 8, 8, false, "GPU PC: %08X", gpu_pc);
- DrawString((uint32 *)backbuffer, 8, 16, false, "DSP PC: %08X", dsp_pc);
+ DrawString(backbuffer, 8, 8, false, "GPU PC: %08X", gpu_pc);
+ DrawString(backbuffer, 8, 16, false, "DSP PC: %08X", dsp_pc);
+ DrawString(backbuffer, 8, 32, false, "%u FPS", framesPerSecond);
}
if (showMessage)
DrawStringTrans((uint32 *)backbuffer, 8, 26*8, 0x3FE3, transparency, "%s, run address: %06X", cartTypeName[cartType], jaguarRunAddress);
DrawStringTrans((uint32 *)backbuffer, 8, 27*8, 0x3FE3, transparency, "CRC: %08X", jaguar_mainRom_crc32);//*/
//first has wrong color. !!! FIX !!!
- DrawStringTrans((uint32 *)backbuffer, 8, 24*8, 0xFF7F63FF, transparency, "Running...");
- DrawStringTrans((uint32 *)backbuffer, 8, 26*8, 0xFF1FFF3F, transparency, "%s, run address: %06X", cartTypeName[cartType], jaguarRunAddress);
- DrawStringTrans((uint32 *)backbuffer, 8, 27*8, 0xFF1FFF3F, transparency, "CRC: %08X", jaguar_mainRom_crc32);
+ DrawStringTrans(backbuffer, 8, 24*8, 0xFF7F63FF, transparency, "Running...");
+ DrawStringTrans(backbuffer, 8, 26*8, 0xFF1FFF3F, transparency, "%s, run address: %06X", cartTypeName[cartType], jaguarRunAddress);
+ DrawStringTrans(backbuffer, 8, 27*8, 0xFF1FFF3F, transparency, "CRC: %08X", jaguar_mainRom_crc32);
if (showMsgFrames == 0)
{
showMsgFrames--;
}
- // Simple frameskip
- if (nFrame == nFrameskip)
- {
- RenderBackbuffer();
- nFrame = 0;
- }
- else
- nFrame++;
+ RenderBackbuffer();
+ frameCount++;
+
+ if (SDL_GetTicks() - elapsedTicks > 250)
+ elapsedTicks += 250, framesPerSecond = frameCount * 4, frameCount = 0;
}
// Reset the pitch, since it may have been changed in-game...
Window * About(void)
{
- Window * window = new Window(8, 16, 304, 160);
+ char buf[512];
+ sprintf(buf, "Virtual Jaguar CVS %s", __DATE__);
+//fprintf(fp, "VirtualJaguar v1.0.8 (Last full build was on %s %s)\n", __DATE__, __TIME__);
+//VirtualJaguar v1.0.8 (Last full build was on Dec 30 2004 20:01:31)
+ Window * window = new Window(8, 16, 40 * FONT_WIDTH, 19 * FONT_HEIGHT);
// window->AddElement(new Text(8, 8, "Virtual Jaguar 1.0.8"));
- window->AddElement(new Text(8, 8, "Virtual Jaguar CVS 20041224"));
- window->AddElement(new Text(8, 24, "Coders:"));
- window->AddElement(new Text(16, 32, "Niels Wagenaar (nwagenaar)"));
- window->AddElement(new Text(16, 40, "Carwin Jones (Caz)"));
- window->AddElement(new Text(16, 48, "James L. Hammons (shamus)"));
- window->AddElement(new Text(16, 56, "Adam Green"));
- window->AddElement(new Text(8, 72, "Testers:"));
- window->AddElement(new Text(16, 80, "Guruma"));
- window->AddElement(new Text(8, 96, "Thanks go out to:"));
- window->AddElement(new Text(16, 104, "Aaron Giles (original CoJag)"));
- window->AddElement(new Text(16, 112, "David Raingeard (original VJ)"));
- window->AddElement(new Text(16, 120, "Karl Stenerud (Musashi 68K emu)"));
- window->AddElement(new Text(16, 128, "Sam Lantinga (amazing SDL libs)"));
- window->AddElement(new Text(16, 136, "Ryan C. Gordon (VJ's web presence)"));
- window->AddElement(new Text(16, 144, "The guys over at Atari Age ;-)"));
+// window->AddElement(new Text(8, 8, "Virtual Jaguar CVS 20050110", 0xFF3030FF, 0xFF000000));
+ window->AddElement(new Text(8, 8, buf, 0xFF3030FF, 0xFF000000));
+ window->AddElement(new Text(8, 8+2*FONT_HEIGHT, "Coders:"));
+ window->AddElement(new Text(16, 8+3*FONT_HEIGHT, "James L. Hammons (shamus)"));
+ window->AddElement(new Text(16, 8+4*FONT_HEIGHT, "Niels Wagenaar (nwagenaar)"));
+ window->AddElement(new Text(16, 8+5*FONT_HEIGHT, "Carwin Jones (Caz)"));
+ window->AddElement(new Text(16, 8+6*FONT_HEIGHT, "Adam Green"));
+ window->AddElement(new Text(8, 8+8*FONT_HEIGHT, "Testers:"));
+ window->AddElement(new Text(16, 8+9*FONT_HEIGHT, "Guruma"));
+ window->AddElement(new Text(8, 8+11*FONT_HEIGHT, "Thanks go out to:"));
+ window->AddElement(new Text(16, 8+12*FONT_HEIGHT, "Aaron Giles for the original CoJag"));
+ window->AddElement(new Text(16, 8+13*FONT_HEIGHT, "David Raingeard for the original VJ"));
+ window->AddElement(new Text(16, 8+14*FONT_HEIGHT, "Karl Stenerud for his Musashi 68K emu"));
+ window->AddElement(new Text(16, 8+15*FONT_HEIGHT, "Sam Lantinga for his amazing SDL libs"));
+ window->AddElement(new Text(16, 8+16*FONT_HEIGHT, "Ryan C. Gordon for VJ's web presence"));
+ window->AddElement(new Text(16, 8+17*FONT_HEIGHT, "The guys over at Atari Age ;-)"));
return window;
}
// a buffer overflow... !!! FIX !!!
uint32 romSize = 0;
+WriteLog("JaguarLoadROM: Attempting to load file '%s'...", path);
char * ext = strrchr(path, '.');
+if (ext == NULL)
+ WriteLog("FAILED!\n");
+else
+ WriteLog("Succeeded in finding extension (%s)!\n", ext);
+
if (ext != NULL)
{
WriteLog("VJ: Loading \"%s\"...", path);
projects / virtualjaguar / blobdiff