//
// Blitter core
//
-// by cal2
+// by Cal2
// GCC/SDL port by Niels Wagenaar (Linux/WIN32) and Caz (BeOS)
// Cleanups/fixes by James L. Hammons
//
// if (dstdata != READ_RDATA(PATTERNDATA, a1, REG(A1_FLAGS), a1_phrase_mode))
inhibit = 1;
}
+
// This is DEFINITELY WRONG
- if (a1_phrase_mode || a2_phrase_mode)
- inhibit = !inhibit;
+// if (a1_phrase_mode || a2_phrase_mode)
+// inhibit = !inhibit;
}
if (CLIPA1)
// if (dstdata != READ_RDATA(PATTERNDATA, a2, REG(A2_FLAGS), a2_phrase_mode))
inhibit = 1;
}
- if (a1_phrase_mode || a2_phrase_mode)
- inhibit =! inhibit;
+
+// This is DEFINITELY WRONG
+// if (a1_phrase_mode || a2_phrase_mode)
+// inhibit = !inhibit;
}
if (CLIPA1)
}
}
+ //New: Phrase mode taken into account! :-p
+ if (a1_phrase_mode)
+ {
+ // Bump the pointer to the next phrase boundary
+ // Even though it works, this is crappy... Clean it up!
+ uint32 size = 64 / a1_psize;
+ uint32 newx = (a1_x >> 16) / size;
+ uint32 newxrem = (a1_x >> 16) % size;
+ a1_x &= 0x0000FFFF;
+ a1_x |= (((newx + (newxrem == 0 ? 0 : 1)) * size) & 0xFFFF) << 16;
+ }
+ if (a2_phrase_mode)
+ {
+ // Bump the pointer to the next phrase boundary
+ // Even though it works, this is crappy... Clean it up!
+ uint32 size = 64 / a1_psize;
+ uint32 newx = (a2_x >> 16) / size;
+ uint32 newxrem = (a2_x >> 16) % size;
+ a2_x &= 0x0000FFFF;
+ a2_x |= (((newx + (newxrem == 0 ? 0 : 1)) * size) & 0xFFFF) << 16;
+ }
+
a1_x += a1_step_x;
a1_y += a1_step_y;
a2_x += a2_step_x;
break;
//This really isn't a valid bit combo for A2... Shouldn't this cause the blitter to just say no?
case XADDINC:
-WriteLog("BLIT: Asked to used invalid bit combo for A2...\n");
+WriteLog("BLIT: Asked to use invalid bit combo (XADDINC) for A2...\n");
// add the contents of the increment register
// since there is no register for a2 we just add 1
//Let's do nothing, since it's not listed as a valid bit combo...
}
#endif
+//NOTE: Pitch is ignored!
+
+//This *might* be the altimeter blits (they are)...
+//On captured screen, x-pos for black (inner) is 259, for pink is 257
+//Black is short by 3, pink is short by 1...
+/*
+Blit! (00110000 <- 000BF010) count: 9 x 31, A1/2_FLAGS: 000042E2/00010020 [cmd: 00010200]
+ CMD -> src: dst: misc: a1ctl: UPDA1 mode: ity: PATDSEL z-op: op: LFU_CLEAR ctrl:
+ A1 -> pitch: 4 phrases, depth: 16bpp, z-off: 3, width: 320 (21), addctl: XADDPHR YADD0 XSIGNADD YSIGNADD
+ A2 -> pitch: 1 phrases, depth: 16bpp, z-off: 0, width: 1 (00), addctl: XADDPIX YADD0 XSIGNADD YSIGNADD
+ A1 x/y: 262/124, A2 x/y: 128/0
+Blit! (00110000 <- 000BF010) count: 5 x 38, A1/2_FLAGS: 000042E2/00010020 [cmd: 00010200]
+ CMD -> src: dst: misc: a1ctl: UPDA1 mode: ity: PATDSEL z-op: op: LFU_CLEAR ctrl:
+ A1 -> pitch: 4 phrases, depth: 16bpp, z-off: 3, width: 320 (21), addctl: XADDPHR YADD0 XSIGNADD YSIGNADD
+ A2 -> pitch: 1 phrases, depth: 16bpp, z-off: 0, width: 1 (00), addctl: XADDPIX YADD0 XSIGNADD YSIGNADD
+ A1 x/y: 264/117, A2 x/y: 407/0
+
+Blit! (00110000 <- 000BF010) count: 9 x 23, A1/2_FLAGS: 000042E2/00010020 [cmd: 00010200]
+ CMD -> src: dst: misc: a1ctl: UPDA1 mode: ity: PATDSEL z-op: op: LFU_CLEAR ctrl:
+ A1 step values: -10 (X), 1 (Y)
+ A1 -> pitch: 4(2) phrases, depth: 16bpp, z-off: 3, width: 320 (21), addctl: XADDPHR YADD0 XSIGNADD YSIGNADD
+ A2 -> pitch: 1(0) phrases, depth: 16bpp, z-off: 0, width: 1 (00), addctl: XADDPIX YADD0 XSIGNADD YSIGNADD
+ A1 x/y: 262/132, A2 x/y: 129/0
+Blit! (00110000 <- 000BF010) count: 5 x 27, A1/2_FLAGS: 000042E2/00010020 [cmd: 00010200]
+ CMD -> src: dst: misc: a1ctl: UPDA1 mode: ity: PATDSEL z-op: op: LFU_CLEAR ctrl:
+ A1 step values: -8 (X), 1 (Y)
+ A1 -> pitch: 4(2) phrases, depth: 16bpp, z-off: 3, width: 320 (21), addctl: XADDPHR YADD0 XSIGNADD YSIGNADD
+ A2 -> pitch: 1(0) phrases, depth: 16bpp, z-off: 0, width: 1 (00), addctl: XADDPIX YADD0 XSIGNADD YSIGNADD
+ A1 x/y: 264/128, A2 x/y: 336/0
+
+ 264v vCursor ends up here...
+ xxxxx...`
+ 111122223333
+
+262v vCursor ends up here...
+ xxxxxxxxx.'
+ 1111222233334444
+
+Fixed! Now for more:
+
+; This looks like the ship icon in the upper left corner...
+
+Blit! (00110000 <- 0010B2A8) count: 11 x 12, A1/2_FLAGS: 000042E2/00000020 [cmd: 09800609]
+ CMD -> src: SRCEN dst: DSTEN misc: a1ctl: UPDA1 UPDA2 mode: ity: z-op: op: LFU_REPLACE ctrl: DCOMPEN
+ A1 step values: -12 (X), 1 (Y)
+ A2 step values: 0 (X), 0 (Y) [mask (unused): 00000000 - FFFFFFFF/FFFFFFFF]
+ A1 -> pitch: 4 phrases, depth: 16bpp, z-off: 3, width: 320 (21), addctl: XADDPHR YADD0 XSIGNADD YSIGNADD
+ A2 -> pitch: 1 phrases, depth: 16bpp, z-off: 0, width: 1 (00), addctl: XADDPHR YADD0 XSIGNADD YSIGNADD
+ A1 x/y: 20/24, A2 x/y: 5780/0
+
+Also fixed!
+
+More (not sure this is a blitter problem as much as it's a GPU problem):
+All but the "M" are trashed...
+This does *NOT* look like a blitter problem, as it's rendering properly...
+
+; D
+
+Blit! (00110000 <- 0010B2A8) count: 12 x 12, A1/2_FLAGS: 000042E2/00000020 [cmd: 09800609]
+ CMD -> src: SRCEN dst: DSTEN misc: a1ctl: UPDA1 UPDA2 mode: ity: z-op: op: LFU_REPLACE ctrl: DCOMPEN
+ A1 step values: -14 (X), 1 (Y)
+ A2 step values: -4 (X), 0 (Y) [mask (unused): 00000000 - FFFFFFFF/FFFFFFFF]
+ A1 -> pitch: 4 phrases, depth: 16bpp, z-off: 3, width: 320 (21), addctl: XADDPHR YADD0 XSIGNADD YSIGNADD
+ A2 -> pitch: 1 phrases, depth: 16bpp, z-off: 0, width: 1 (00), addctl: XADDPHR YADD0 XSIGNADD YSIGNADD
+ A1 x/y: 134/144, A2 x/y: 2516/0
+;129,146: +5,-2
+
+; E
+
+Blit! (00110000 <- 0010B2A8) count: 12 x 12, A1/2_FLAGS: 000042E2/00000020 [cmd: 09800609]
+ CMD -> src: SRCEN dst: DSTEN misc: a1ctl: UPDA1 UPDA2 mode: ity: z-op: op: LFU_REPLACE ctrl: DCOMPEN
+ A1 step values: -13 (X), 1 (Y)
+ A2 step values: -4 (X), 0 (Y) [mask (unused): 00000000 - FFFFFFFF/FFFFFFFF]
+ A1 -> pitch: 4 phrases, depth: 16bpp, z-off: 3, width: 320 (21), addctl: XADDPHR YADD0 XSIGNADD YSIGNADD
+ A2 -> pitch: 1 phrases, depth: 16bpp, z-off: 0, width: 1 (00), addctl: XADDPHR YADD0 XSIGNADD YSIGNADD
+ A1 x/y: 147/144, A2 x/y: 2660/0
+
+; M
+
+Blit! (00110000 <- 0010B2A8) count: 12 x 12, A1/2_FLAGS: 000042E2/00000020 [cmd: 09800609]
+ CMD -> src: SRCEN dst: DSTEN misc: a1ctl: UPDA1 UPDA2 mode: ity: z-op: op: LFU_REPLACE ctrl: DCOMPEN
+ A1 step values: -12 (X), 1 (Y)
+ A2 step values: 0 (X), 0 (Y) [mask (unused): 00000000 - FFFFFFFF/FFFFFFFF]
+ A1 -> pitch: 4 phrases, depth: 16bpp, z-off: 3, width: 320 (21), addctl: XADDPHR YADD0 XSIGNADD YSIGNADD
+ A2 -> pitch: 1 phrases, depth: 16bpp, z-off: 0, width: 1 (00), addctl: XADDPHR YADD0 XSIGNADD YSIGNADD
+ A1 x/y: 160/144, A2 x/y: 3764/0
+
+; O
+
+Blit! (00110000 <- 0010B2A8) count: 12 x 12, A1/2_FLAGS: 000042E2/00000020 [cmd: 09800609]
+ CMD -> src: SRCEN dst: DSTEN misc: a1ctl: UPDA1 UPDA2 mode: ity: z-op: op: LFU_REPLACE ctrl: DCOMPEN
+ A1 step values: -15 (X), 1 (Y)
+ A2 step values: -4 (X), 0 (Y) [mask (unused): 00000000 - FFFFFFFF/FFFFFFFF]
+ A1 -> pitch: 4 phrases, depth: 16bpp, z-off: 3, width: 320 (21), addctl: XADDPHR YADD0 XSIGNADD YSIGNADD
+ A2 -> pitch: 1 phrases, depth: 16bpp, z-off: 0, width: 1 (00), addctl: XADDPHR YADD0 XSIGNADD YSIGNADD
+ A1 x/y: 173/144, A2 x/y: 4052/0
+
+*/
extern int blit_start_log;
extern int op_start_log;
if (blit_start_log)
WriteLog("op: %s ", opStr[(cmd >> 21) & 0x0F]);
WriteLog("ctrl: %s%s%s%s%s%s\n", (cmd & 0x02000000 ? "CMPDST " : ""), (cmd & 0x04000000 ? "BCOMPEN " : ""), (cmd & 0x08000000 ? "DCOMPEN " : ""), (cmd & 0x10000000 ? "BKGWREN " : ""), (cmd & 0x20000000 ? "BUSHI " : ""), (cmd & 0x40000000 ? "SRCSHADE" : ""));
+ if (UPDA1)
+ WriteLog(" A1 step values: %d (X), %d (Y)\n", a1_step_x >> 16, a1_step_y >> 16);
+
if (UPDA2)
- {
WriteLog(" A2 step values: %d (X), %d (Y) [mask (%sused): %08X - %08X/%08X]\n", a2_step_x >> 16, a2_step_y >> 16, (a2f & 0x8000 ? "" : "un"), REG(A2_MASK), a2_mask_x, a2_mask_y);
- }
WriteLog(" A1 -> pitch: %d phrases, depth: %s, z-off: %d, width: %d (%02X), addctl: %s %s %s %s\n", 1 << p1, bppStr[d1], zo1, iw1, w1, ctrlStr[ac1&0x03], (ac1&0x04 ? "YADD1" : "YADD0"), (ac1&0x08 ? "XSIGNSUB" : "XSIGNADD"), (ac1&0x10 ? "YSIGNSUB" : "YSIGNADD"));
WriteLog(" A2 -> pitch: %d phrases, depth: %s, z-off: %d, width: %d (%02X), addctl: %s %s %s %s\n", 1 << p2, bppStr[d2], zo2, iw2, w2, ctrlStr[ac2&0x03], (ac2&0x04 ? "YADD1" : "YADD0"), (ac2&0x08 ? "XSIGNSUB" : "XSIGNADD"), (ac2&0x10 ? "YSIGNSUB" : "YSIGNADD"));
#include "tom.h"
#include "video.h"
#include "font1.h"
+#include "crc32.h"
+#include "zlib.h"
+#include "unzip.h"
#include "gui.h"
using namespace std; // For STL stuff
// Private function prototypes
+class Window; // Forward declaration...
+
void DrawTransparentBitmap(int16 * screen, uint32 x, uint32 y, uint16 * bitmap);
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 LoadROM(void);
-void RunEmu(void);
-void Quit(void);
-void About(void);
+Window * LoadROM(void);
+Window * ResetJaguar(void);
+Window * RunEmu(void);
+Window * Quit(void);
+Window * About(void);
+
+int gzfilelength(gzFile gd);
+
+// External variables
+
+extern uint8 * jaguar_mainRam;
+extern uint8 * jaguar_bootRom;
+extern uint8 * jaguar_mainRom;
// Local global variables
0x0000,0x0217,0x0217,0x0217,0x0217,0x0217,0x0000 // .....
};
+uint16 upArrowBox[] = {
+ 8, 8,
+
+ 0x4B5E,0x4B5E,0x4B5E,0x4B5E,0x4B5E,0x4B5E,0x4B5E,0x4B5E, // ++++++++
+ 0x4B5E,0x0000,0x0000,0xFFFF,0xFFFF,0x0000,0x0000,0x0217, // + @@ .
+ 0x4B5E,0x0000,0xFFFF,0xFFFF,0xFFFF,0xFFFF,0x0000,0x0217, // + @@@@ .
+ 0x4B5E,0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF,0x0217, // +@@@@@@.
+ 0x4B5E,0x0000,0x0000,0xFFFF,0xFFFF,0x0000,0x0000,0x0217, // + @@ .
+ 0x4B5E,0x0000,0x0000,0xFFFF,0xFFFF,0x0000,0x0000,0x0217, // + @@ .
+ 0x4B5E,0x0000,0x0000,0xFFFF,0xFFFF,0x0000,0x0000,0x0217, // + @@ .
+ 0x0217,0x0217,0x0217,0x0217,0x0217,0x0217,0x0217,0x0217 // ........
+};
+
+uint16 downArrowBox[] = {
+ 8, 8,
+
+ 0x4B5E,0x4B5E,0x4B5E,0x4B5E,0x4B5E,0x4B5E,0x4B5E,0x4B5E, // ++++++++
+ 0x4B5E,0x0000,0x0000,0xFFFF,0xFFFF,0x0000,0x0000,0x0217, // + @@ .
+ 0x4B5E,0x0000,0x0000,0xFFFF,0xFFFF,0x0000,0x0000,0x0217, // + @@ .
+ 0x4B5E,0x0000,0x0000,0xFFFF,0xFFFF,0x0000,0x0000,0x0217, // + @@ .
+ 0x4B5E,0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF,0x0217, // +@@@@@@.
+ 0x4B5E,0x0000,0xFFFF,0xFFFF,0xFFFF,0xFFFF,0x0000,0x0217, // + @@@@ .
+ 0x4B5E,0x0000,0x0000,0xFFFF,0xFFFF,0x0000,0x0000,0x0217, // + @@ .
+ 0x0217,0x0217,0x0217,0x0217,0x0217,0x0217,0x0217,0x0217 // ........
+};
+
char separator[] = "--------------------------------------------------------";
+uint16 background[1280 * 240];
+
//
// Local GUI classes
//
+enum { WINDOW_CLOSE, MENU_ITEM_CHOSEN };
+
class Element
{
public:
virtual void HandleMouseMove(uint32 x, uint32 y) = 0;
virtual void HandleMouseButton(uint32 x, uint32 y, bool mouseDown) = 0;
virtual void Draw(uint32, uint32) = 0;
+ virtual void Notify(Element *) = 0;
//Needed? virtual ~Element() = 0;
//We're not allocating anything in the base class, so the answer would be NO.
bool Inside(uint32 x, uint32 y);
public:
Button(uint32 x = 0, uint32 y = 0, uint32 w = 0, uint32 h = 0): Element(x, y, w, h),
activated(false), clicked(false), inside(false), fgColor(0xFFFF),
- bgColor(0x03E0), pic(NULL) {}
+ bgColor(0x03E0), pic(NULL), elementToTell(NULL) {}
Button(uint32 x, uint32 y, uint32 w, uint32 h, uint16 * p): Element(x, y, w, h),
activated(false), clicked(false), inside(false), fgColor(0xFFFF),
- bgColor(0x03E0), pic(p) {}
+ bgColor(0x03E0), pic(p), elementToTell(NULL) {}
+ Button(uint32 x, uint32 y, uint16 * p): Element(x, y, 0, 0),
+ activated(false), clicked(false), inside(false), fgColor(0xFFFF),
+ bgColor(0x03E0), pic(p), 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(0xFFFF),
- bgColor(0x03E0), pic(NULL), text(s) {}
+ bgColor(0x03E0), pic(NULL), text(s), elementToTell(NULL) {}
+ Button(uint32 x, uint32 y, string s): Element(x, y, 0, 8),
+ activated(false), clicked(false), inside(false), fgColor(0xFFFF),
+ bgColor(0x03E0), pic(NULL), text(s), elementToTell(NULL)
+ { extents.w = s.length() * 8; }
virtual void HandleKey(SDLKey key) {}
virtual void HandleMouseMove(uint32 x, uint32 y);
virtual void HandleMouseButton(uint32 x, uint32 y, bool mouseDown);
virtual void Draw(uint32 offsetX = 0, uint32 offsetY = 0);
+ virtual void Notify(Element *) {}
bool ButtonClicked(void) { return activated; }
+ void SetNotificationElement(Element * e) { elementToTell = e; }
protected:
bool activated, clicked, inside;
uint16 fgColor, bgColor;
uint16 * pic;
string text;
+ Element * elementToTell;
};
void Button::HandleMouseMove(uint32 x, uint32 y)
clicked = true;
if (clicked && !mouseDown)
+ {
clicked = false, activated = true;
+
+ // Send a message that we're activated (if there's someone to tell, that is)
+ if (elementToTell)
+ elementToTell->Notify(this);
+ }
}
else
clicked = activated = false;
}
}
-//WriteLog("Button::Draw [%08X]\n", this);
if (pic != NULL)
-//{
-//WriteLog("--> Button: About to draw pic [%08X].\n", pic);
DrawTransparentBitmap(screenBuffer, extents.x + offsetX, extents.y + offsetY, pic);
-//}
if (text.length() > 0)
-//{
-//WriteLog("--> Button: About to draw string [%s].\n", text.c_str());
DrawString(screenBuffer, extents.x + offsetX, extents.y + offsetY, false, "%s", text.c_str());
-//}
}
class Window: public Element
{
public:
- Window(uint32 x = 0, uint32 y = 0, uint32 w = 0, uint32 h = 0): Element(x, y, w, h),
- /*clicked(false), inside(false),*/ fgColor(0x4FF0), bgColor(0xFE10),
- close(w - 8, 1, 7, 7, closeBox) { list.push_back(&close); }
- virtual void HandleKey(SDLKey key) {}
+/* Window(uint32 x = 0, uint32 y = 0, uint32 w = 0, uint32 h = 0): Element(x, y, w, h),
+ fgColor(0x4FF0), bgColor(0xFE10)
+ { close = new Button(w - 8, 1, closeBox); list.push_back(close); }*/
+ Window(uint32 x = 0, uint32 y = 0, uint32 w = 0, uint32 h = 0,
+ void (* f)(Element *) = NULL): Element(x, y, w, h),
+ /*clicked(false), inside(false),*/ fgColor(0x4FF0), bgColor(0x1E10),
+ handler(f)
+ { close = new Button(w - 8, 1, closeBox); list.push_back(close);
+ close->SetNotificationElement(this); }
+ virtual ~Window();
+ virtual void HandleKey(SDLKey key);
virtual void HandleMouseMove(uint32 x, uint32 y);
virtual void HandleMouseButton(uint32 x, uint32 y, bool mouseDown);
virtual void Draw(uint32 offsetX = 0, uint32 offsetY = 0);
+ virtual void Notify(Element * e);
void AddElement(Element * e);
- bool WindowActive(void) { return !close.ButtonClicked(); }
+// bool WindowActive(void) { return true; }//return !close->ButtonClicked(); }
protected:
// bool clicked, inside;
uint16 fgColor, bgColor;
- Button close;
+ void (* handler)(Element *);
+ Button * close;
//We have to use a list of Element *pointers* because we can't make a list that will hold
//all the different object types in the same list...
vector<Element *> list;
};
+Window::~Window()
+{
+ for(uint32 i=0; i<list.size(); i++)
+ if (list[i])
+ delete list[i];
+}
+
+void Window::HandleKey(SDLKey key)
+{
+ if (key == SDLK_ESCAPE)
+ {
+ SDL_Event event;
+ event.type = SDL_USEREVENT, event.user.code = WINDOW_CLOSE;
+ SDL_PushEvent(&event);
+ }
+
+ // Handle the items this window contains...
+ for(uint32 i=0; i<list.size(); i++)
+ // Make coords relative to upper right corner of this window...
+ list[i]->HandleKey(key);
+}
+
void Window::HandleMouseMove(uint32 x, uint32 y)
{
// Handle the items this window contains...
list.push_back(e);
}
+void Window::Notify(Element * e)
+{
+ if (e == close)
+ {
+ SDL_Event event;
+ event.type = SDL_USEREVENT, event.user.code = WINDOW_CLOSE;
+ SDL_PushEvent(&event);
+ }
+}
+
class Text: public Element
{
public:
virtual void HandleMouseMove(uint32 x, uint32 y) {}
virtual void HandleMouseButton(uint32 x, uint32 y, bool mouseDown) {}
virtual void Draw(uint32 offsetX = 0, uint32 offsetY = 0);
+ virtual void Notify(Element *) {}
protected:
uint16 fgColor, bgColor;
DrawString(screenBuffer, extents.x + offsetX, extents.y + offsetY, false, "%s", text.c_str());
}
+class ListBox: public Element
+//class ListBox: public Window
+{
+ public:
+// ListBox(uint32 x = 0, uint32 y = 0, uint32 w = 0, uint32 h = 0): Element(x, y, w, h),
+ ListBox(uint32 x = 0, uint32 y = 0, uint32 w = 0, uint32 h = 0);//: Window(x, y, w, h),
+// windowPtr(0), cursor(0), limit(0), charWidth((w / 8) - 1), charHeight(h / 8),
+// elementToTell(NULL), upArrow(w - 8, 0, upArrowBox),
+// downArrow(w - 8, h - 8, downArrowBox), upArrow2(w - 8, h - 16, upArrowBox) {}
+ virtual void HandleKey(SDLKey key);
+ virtual void HandleMouseMove(uint32 x, uint32 y);
+ virtual void HandleMouseButton(uint32 x, uint32 y, bool mouseDown);
+ virtual void Draw(uint32 offsetX = 0, uint32 offsetY = 0);
+ virtual void Notify(Element * e);
+ void SetNotificationElement(Element * e) { elementToTell = e; }
+ void AddItem(string s);
+ string GetSelectedItem(void);
+
+ protected:
+ uint32 windowPtr, cursor, limit;
+ uint32 charWidth, charHeight; // Box width/height in characters
+ Element * elementToTell;
+ Button upArrow, downArrow, upArrow2;
+ vector<string> item;
+};
+
+ListBox::ListBox(uint32 x, uint32 y, uint32 w, uint32 h): Element(x, y, w, h),
+ windowPtr(0), cursor(0), limit(0), charWidth((w / 8) - 1), charHeight(h / 8),
+ elementToTell(NULL), upArrow(w - 8, 0, upArrowBox),
+ downArrow(w - 8, h - 8, downArrowBox), upArrow2(w - 8, h - 16, upArrowBox)
+{
+ upArrow.SetNotificationElement(this);
+ downArrow.SetNotificationElement(this);
+ upArrow2.SetNotificationElement(this);
+ extents.w -= 8; // Make room for scrollbar...
+}
+
+void ListBox::HandleKey(SDLKey key)
+{
+ if (key == SDLK_DOWN)
+ {
+ if (cursor != limit - 1) // Cursor is within its window
+ cursor++;
+ else // Otherwise, scroll the window...
+ {
+ if (cursor + windowPtr != item.size() - 1)
+ windowPtr++;
+ }
+ }
+ else if (key == SDLK_UP)
+ {
+ if (cursor != 0)
+ cursor--;
+ else
+ {
+ if (windowPtr != 0)
+ windowPtr--;
+ }
+ }
+ else if (key == SDLK_PAGEDOWN)
+ {
+ if (cursor != limit - 1)
+ cursor = limit - 1;
+ else
+ {
+ windowPtr += limit;
+ if (windowPtr > item.size() - limit)
+ windowPtr = item.size() - limit;
+ }
+ }
+ else if (key == SDLK_PAGEUP)
+ {
+ if (cursor != 0)
+ cursor = 0;
+ else
+ {
+ if (windowPtr < limit)
+ windowPtr = 0;
+ else
+ windowPtr -= limit;
+ }
+ }
+//How to handle these???
+/* if (key == SDLK_RETURN)
+ done = true;
+ if (key == SDLK_ESCAPE)
+ {
+ WriteLog("GUI: Aborting VJ by user request.\n");
+ return false; // Bail out!
+ }*/
+ else if (key >= SDLK_a && key <= SDLK_z)
+ {
+ // Advance cursor to filename with first letter pressed...
+ uint8 which = (key - SDLK_a) + 65; // Convert key to A-Z char
+
+ for(uint32 i=0; i<item.size(); i++)
+ {
+ if ((item[i][0] & 0xDF) == which)
+ {
+ cursor = i - windowPtr;
+ if (i > windowPtr + limit - 1)
+ windowPtr = i - limit + 1,
+ cursor = limit - 1;
+ if (i < windowPtr)
+ windowPtr = i,
+ cursor = 0;
+ break;
+ }
+ }
+ }
+}
+
+void ListBox::HandleMouseMove(uint32 x, uint32 y)
+{
+ upArrow.HandleMouseMove(x - extents.x, y - extents.y);
+ downArrow.HandleMouseMove(x - extents.x, y - extents.y);
+ upArrow2.HandleMouseMove(x - extents.x, y - extents.y);
+}
+
+void ListBox::HandleMouseButton(uint32 x, uint32 y, bool mouseDown)
+{
+ if (Inside(x, y) && mouseDown)
+ {
+ // Why do we have to do this??? (- extents.y?)
+ // I guess it's because only the Window class has offsetting implemented...
+ cursor = (y - extents.y) / 8;
+ }
+
+ upArrow.HandleMouseButton(x - extents.x, y - extents.y, mouseDown);
+ downArrow.HandleMouseButton(x - extents.x, y - extents.y, mouseDown);
+ upArrow2.HandleMouseButton(x - extents.x, y - extents.y, mouseDown);
+}
+
+void ListBox::Draw(uint32 offsetX/*= 0*/, uint32 offsetY/*= 0*/)
+{
+ for(uint32 i=0; i<limit; i++)
+ {
+ // 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,
+ (cursor == i ? true : false), "%-*.*s", charWidth, charWidth, s.c_str());
+ }
+
+ upArrow.Draw(extents.x + offsetX, extents.y + offsetY);
+ downArrow.Draw(extents.x + offsetX, extents.y + offsetY);
+ upArrow2.Draw(extents.x + offsetX, extents.y + offsetY);
+
+ uint32 sbHeight = extents.h - 24,
+ thumb = (uint32)(((float)limit / (float)item.size()) * (float)sbHeight),
+ thumbStart = (uint32)(((float)windowPtr / (float)item.size()) * (float)sbHeight);
+
+ for(uint32 y=extents.y+offsetY+8; y<extents.y+offsetY+extents.h-16; y++)
+ {
+// for(uint32 x=extents.x+offsetX+extents.w-8; x<extents.x+offsetX+extents.w; x++)
+ for(uint32 x=extents.x+offsetX+extents.w; x<extents.x+offsetX+extents.w+8; x++)
+ {
+ if (y >= thumbStart + (extents.y+offsetY+8) && y < thumbStart + thumb + (extents.y+offsetY+8))
+ screenBuffer[x + (y * pitch)] = 0xFFFF;
+ else
+ screenBuffer[x + (y * pitch)] = 0x0000;
+ }
+ }
+}
+
+void ListBox::Notify(Element * e)
+{
+ if (e == &upArrow || e == &upArrow2)
+ {
+ if (windowPtr != 0)
+ {
+ windowPtr--;
+
+ if (cursor < limit - 1)
+ cursor++;
+ }
+ }
+ else if (e == &downArrow)
+ {
+ if (windowPtr < item.size() - limit)
+ {
+ windowPtr++;
+
+ if (cursor != 0)
+ cursor--;
+ }
+ }
+}
+
+void ListBox::AddItem(string s)
+{
+ item.push_back(s);
+ limit = (item.size() > charHeight ? charHeight : item.size());
+//WriteLog("ListBox: Adding item [%s], limit = %u...\n", s.c_str(), limit);
+
+ //Do this *every* time?
+ sort(item.begin(), item.end());
+}
+
+string ListBox::GetSelectedItem(void)
+{
+ return item[windowPtr + cursor];
+}
+
+class FileList: public Window
+{
+ public:
+ FileList(uint32 x = 0, uint32 y = 0, uint32 w = 0, uint32 h = 0);
+ virtual ~FileList() {}
+ virtual void HandleKey(SDLKey key);
+ virtual void HandleMouseMove(uint32 x, uint32 y) { Window::HandleMouseMove(x, y); }
+ virtual void HandleMouseButton(uint32 x, uint32 y, bool mouseDown) { Window::HandleMouseButton(x, y, mouseDown); }
+ virtual void Draw(uint32 offsetX = 0, uint32 offsetY = 0) { Window::Draw(offsetX, offsetY); }
+ virtual void Notify(Element * e);
+
+ protected:
+ ListBox * files;
+ Button * load;
+};
+
+//Need 4 buttons, one scrollbar...
+FileList::FileList(uint32 x, uint32 y, uint32 w, uint32 h): Window(x, y, w, h)
+{
+ files = new ListBox(8, 8, w - 16, h - 32);
+ AddElement(files);
+ load = new Button(8, h - 16, " Load ");
+ AddElement(load);
+ load->SetNotificationElement(this);
+
+// DIR * dp = opendir(path);
+ DIR * dp = opendir(vjs.ROMPath);
+ dirent * de;
+
+ while ((de = readdir(dp)) != NULL)
+ {
+ char * ext = strrchr(de->d_name, '.');
+
+ if (ext != NULL)
+ if (stricmp(ext, ".zip") == 0 || stricmp(ext, ".jag") == 0)
+ files->AddItem(string(de->d_name));
+ }
+
+ closedir(dp);
+}
+
+void FileList::HandleKey(SDLKey key)
+{
+ if (key == SDLK_RETURN)
+ Notify(load);
+ else
+ Window::HandleKey(key);
+}
+
+void FileList::Notify(Element * e)
+{
+ if (e == load)
+ {
+ char filename[MAX_PATH];
+ strcpy(filename, vjs.ROMPath);
+
+ if (strlen(filename) > 0)
+ if (filename[strlen(filename) - 1] != '/')
+ strcat(filename, "/");
+
+ strcat(filename, files->GetSelectedItem().c_str());
+
+ uint32 romSize = JaguarLoadROM(jaguar_mainRom, filename);
+
+ if (romSize == 0)
+//We need better error checking here... !!! FIX !!!
+ WriteLog("VJ: Could not load ROM from file \"%s\"...", files->GetSelectedItem().c_str());
+ else
+ {
+ jaguar_mainRom_crc32 = crc32_calcCheckSum(jaguar_mainRom, romSize);
+ WriteLog("CRC: %08X\n", (unsigned int)jaguar_mainRom_crc32);
+ eeprom_init();
+
+ SDL_Event event;
+ event.type = SDL_USEREVENT, event.user.code = WINDOW_CLOSE;
+ SDL_PushEvent(&event);
+
+ event.type = SDL_USEREVENT, event.user.code = MENU_ITEM_CHOSEN;
+ event.user.data1 = (void *)ResetJaguar;
+ SDL_PushEvent(&event);
+ }
+ }
+ else
+ Window::Notify(e);
+}
+
+
struct NameAction
{
string name;
- void (* action)(void);
- bool isWindow;
+ Window * (* action)(void);
+ SDLKey hotKey;
- NameAction(string n, void (* a)(void) = NULL, bool w = false): name(n), action(a),
- isWindow(w) {}
+ NameAction(string n, Window * (* a)(void) = NULL, SDLKey k = SDLK_UNKNOWN): name(n),
+ action(a), hotKey(k) {}
};
class MenuItems
public:
Menu(uint32 x = 0, uint32 y = 0, uint32 w = 0, uint32 h = 8,
uint16 fgc = 0x1CFF, uint16 bgc = 0x000F, uint16 fgch = 0x421F,
- uint16 bgch = 0x1CFF): Element(x, y, w, h), clicked(false), inside(0),
- insidePopup(0), fgColor(fgc), bgColor(bgc), fgColorHL(fgch), bgColorHL(bgch),
- menuChosen(-1), menuItemChosen(-1) {}
-// { extents.x = x, extents.y = y, extents.w = w, extents.h = h; }
+ uint16 bgch = 0x1CFF): 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);
virtual void HandleMouseMove(uint32 x, uint32 y);
virtual void HandleMouseButton(uint32 x, uint32 y, bool mouseDown);
virtual void Draw(uint32 offsetX = 0, uint32 offsetY = 0);
+ virtual void Notify(Element *) {}
void Add(MenuItems mi);
- //This is wrong. !!! FIX !!!
- bool ItemChosen(void) { return (clicked && insidePopup); }
- //This is bad... !!! FIX !!!
- NameAction & GetItem(void)
-// { if (ItemChosen()) return itemList[menuChosen].item[menuItemChosen]; return NULL; }
- { return itemList[menuChosen].item[menuItemChosen]; }
protected:
- bool clicked;
+ bool activated, clicked;
uint32 inside, insidePopup;
uint16 fgColor, bgColor, fgColorHL, bgColorHL;
int menuChosen, menuItemChosen;
vector<MenuItems> itemList;
};
-void Menu::HandleKey(SDLKey Key)
+void Menu::HandleKey(SDLKey key)
{
+ for(uint32 i=0; i<itemList.size(); i++)
+ {
+ for(uint32 j=0; j<itemList[i].item.size(); j++)
+ {
+ if (itemList[i].item[j].hotKey == key)
+ {
+ SDL_Event event;
+ event.type = SDL_USEREVENT;
+ event.user.code = MENU_ITEM_CHOSEN;
+ event.user.data1 = (void *)itemList[i].item[j].action;
+ SDL_PushEvent(&event);
+
+ clicked = false, menuChosen = menuItemChosen = -1;
+ break;
+ }
+ }
+ }
}
void Menu::HandleMouseMove(uint32 x, uint32 y)
{
if (insidePopup && !mouseDown) // I.e., mouse-button-up
{
+ activated = true;
if (itemList[menuChosen].item[menuItemChosen].action != NULL)
{
- itemList[menuChosen].item[menuItemChosen].action();
+// itemList[menuChosen].item[menuItemChosen].action();
+ SDL_Event event;
+ event.type = SDL_USEREVENT;
+ event.user.code = MENU_ITEM_CHOSEN;
+ event.user.data1 = (void *)itemList[menuChosen].item[menuItemChosen].action;
+ SDL_PushEvent(&event);
clicked = false, menuChosen = menuItemChosen = -1;
- SDL_Event event;
+/* SDL_Event event;
while (SDL_PollEvent(&event)); // Flush the event queue...
event.type = SDL_MOUSEMOTION;
int mx, my;
SDL_GetMouseState(&mx, &my);
event.motion.x = mx, event.motion.y = my;
SDL_PushEvent(&event); // & update mouse position...!
- }
+*/ }
}
if (!inside && !insidePopup && mouseDown)
virtual void HandleMouseMove(uint32 x, uint32 y) {}
virtual void HandleMouseButton(uint32 x, uint32 y, bool mouseDown) {}
virtual void Draw(uint32 offsetX = 0, uint32 offsetY = 0) {}
+ virtual void Notify(Element *) {}
private:
Menu * menu;
//This could be sped up by using a table of 5 + 5 + 5 bits (32 levels transparency -> 32768 entries)
//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!
+//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;
extern int16 * backbuffer;
bool done = false;
SDL_Event event;
+ Window * mainWindow = NULL;
// Set up the GUI classes...
Element::SetScreenAndPitch(backbuffer, GetSDLScreenPitch() / 2);
- Button closeButton(45, 90, 16, 16);
- Window someWindow(15, 16, 60, 60);
- Button button1(50, 15, 9, 9), button2(10, 10, 8, 8), button3(25, 48, 32, 8, " Ok ");
- someWindow.AddElement(&button1);
- someWindow.AddElement(&button2);
- someWindow.AddElement(&button3);
-
- Menu mainMenu;//(0, 160);
+ Menu mainMenu;
MenuItems mi;
mi.title = "File";
mi.item.push_back(NameAction("Load...", LoadROM));
- mi.item.push_back(NameAction("Reset"));
- mi.item.push_back(NameAction("Run", RunEmu));
+ mi.item.push_back(NameAction("Reset", ResetJaguar));
+ mi.item.push_back(NameAction("Run", RunEmu, SDLK_ESCAPE));
mi.item.push_back(NameAction(""));
- mi.item.push_back(NameAction("Quit", Quit));
+ mi.item.push_back(NameAction("Quit", Quit, SDLK_q));
mainMenu.Add(mi);
mi.title = "Settings";
mi.item.clear();
mi.item.push_back(NameAction("Audio..."));
mi.item.push_back(NameAction("Misc..."));
mainMenu.Add(mi);
- mi.title = "Options";
+ mi.title = "Info";
mi.item.clear();
- mi.item.push_back(NameAction("About..."));
+ mi.item.push_back(NameAction("About...", About));
mainMenu.Add(mi);
bool showMouse = true;
//This is crappy!!! !!! FIX !!!
jaguar_reset();
+ // Set up our background save...
+ memset(background, 0x11, tom_getVideoModeWidth() * 240 * 2);
+
while (!done)
{
while (SDL_PollEvent(&event))
{
- if (event.type == SDL_ACTIVEEVENT)
+ if (event.type == SDL_USEREVENT)
+ {
+ if (event.user.code == WINDOW_CLOSE)
+ {
+ delete mainWindow;
+ mainWindow = NULL;
+ }
+ else if (event.user.code == MENU_ITEM_CHOSEN)
+ {
+ // Confused? Let me enlighten... What we're doing here is casting
+ // data1 as a pointer to a function which returns a Window pointer and
+ // which takes no parameters (the "(Window *(*)(void))" part), then
+ // derefencing it (the "*" in front of that) in order to call the
+ // function that it points to. Clear as mud? Yeah, I hate function
+ // pointers too, but what else are you gonna do?
+ mainWindow = (*(Window *(*)(void))event.user.data1)();
+
+ while (SDL_PollEvent(&event)); // Flush the event queue...
+ event.type = SDL_MOUSEMOTION;
+ int mx, my;
+ SDL_GetMouseState(&mx, &my);
+ event.motion.x = mx, event.motion.y = my;
+ SDL_PushEvent(&event); // & update mouse position...!
+
+ mouseX = mx, mouseY = my; // This prevents "mouse flash"...
+ if (vjs.useOpenGL)
+ mouseX /= 2, mouseY /= 2;
+ }
+ }
+ else if (event.type == SDL_ACTIVEEVENT)
{
if (event.active.state == SDL_APPMOUSEFOCUS)
showMouse = (event.active.gain ? true : false);
}
- if (event.type == SDL_KEYDOWN)
+ else if (event.type == SDL_KEYDOWN)
{
- closeButton.HandleKey(event.key.keysym.sym);
- if (someWindow.WindowActive())
- someWindow.HandleKey(event.key.keysym.sym);
- mainMenu.HandleKey(event.key.keysym.sym);
+ if (mainWindow)
+ mainWindow->HandleKey(event.key.keysym.sym);
+ else
+ mainMenu.HandleKey(event.key.keysym.sym);
}
else if (event.type == SDL_MOUSEMOTION)
{
if (vjs.useOpenGL)
mouseX /= 2, mouseY /= 2;
- closeButton.HandleMouseMove(mouseX, mouseY);
- if (someWindow.WindowActive())
- someWindow.HandleMouseMove(mouseX, mouseY);
- mainMenu.HandleMouseMove(mouseX, mouseY);
+ if (mainWindow)
+ mainWindow->HandleMouseMove(mouseX, mouseY);
+ else
+ mainMenu.HandleMouseMove(mouseX, mouseY);
}
else if (event.type == SDL_MOUSEBUTTONDOWN)
{
if (vjs.useOpenGL)
mx /= 2, my /= 2;
- closeButton.HandleMouseButton(mx, my, true);
- if (someWindow.WindowActive())
- someWindow.HandleMouseButton(mx, my, true);
- mainMenu.HandleMouseButton(mx, my, true);
+ if (mainWindow)
+ mainWindow->HandleMouseButton(mx, my, true);
+ else
+ mainMenu.HandleMouseButton(mx, my, true);
}
else if (event.type == SDL_MOUSEBUTTONUP)
{
if (vjs.useOpenGL)
mx /= 2, my /= 2;
- closeButton.HandleMouseButton(mx, my, false);
- if (someWindow.WindowActive())
- someWindow.HandleMouseButton(mx, my, false);
- mainMenu.HandleMouseButton(mx, my, false);
+ if (mainWindow)
+ mainWindow->HandleMouseButton(mx, my, false);
+ else
+ mainMenu.HandleMouseButton(mx, my, false);
}
// Draw the GUI...
// The way we do things here is kinda stupid (redrawing the screen every frame), but
// it's simple. Perhaps there may be a reason down the road to be more selective with
// our clearing, but for now, this will suffice.
- memset(backbuffer, 0x11, tom_getVideoModeWidth() * 240 * 2);
+// memset(backbuffer, 0x11, tom_getVideoModeWidth() * 240 * 2);
+ memcpy(backbuffer, background, tom_getVideoModeWidth() * 240 * 2);
- closeButton.Draw();
- if (someWindow.WindowActive())
- someWindow.Draw();
mainMenu.Draw();
+ if (mainWindow)
+ mainWindow->Draw();
if (showMouse)
DrawTransparentBitmap(backbuffer, mouseX, mouseY, mousePic);
//
// GUI "action" functions
//
-void LoadROM(void)
+Window * LoadROM(void)
{
+ FileList * fileList = new FileList(8, 16, 304, 216);
+
+ return (Window *)fileList;
}
-void RunEmu(void)
+Window * ResetJaguar(void)
+{
+ jaguar_reset();
+ return RunEmu();
+}
+
+bool debounceRunKey = true;
+Window * RunEmu(void)
{
//This is crappy... !!! FIX !!!
extern int16 * backbuffer;
bool showMessage = true;
uint32 showMsgFrames = 60;
uint8 transparency = 0;
+ // Pass a message to the "joystick" code to debounce the ESC key...
+ debounceRunKey = true;
while (!finished)
{
//if (totalFrames == 373)
// doDSPDis = true;
+//This sucks... !!! FIX !!!
+ joystick_exec();
+ if (finished)
+ break;
+
// Some QnD GUI stuff here...
if (showGUI)
{
}
else
nFrame++;
+ }
- joystick_exec();
+ // Reset the pitch, since it may have been changed in-game...
+ Element::SetScreenAndPitch(backbuffer, GetSDLScreenPitch() / 2);
+
+ // 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() * 240; i++)
+ {
+ uint16 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;
}
+
+ return NULL;
}
-void Quit(void)
+Window * Quit(void)
{
WriteLog("GUI: Quitting due to user request.\n");
log_done();
exit(0);
+
+ return NULL; // We never get here...
}
-void About(void)
+Window * About(void)
{
- extern int16 * backbuffer;
- SDL_Event event;
- uint16 * bgSave = (uint16 *)malloc(tom_getVideoModeWidth() * 240 * 2);
- memcpy(bgSave, backbuffer, tom_getVideoModeWidth() * 240 * 2);
-
- bool done = false;
- while (!done)
- {
- while (SDL_PollEvent(&event))
- {
- if (event.type == SDL_KEYDOWN)
- {
- if (event.key.keysym.sym == SDLK_ESCAPE || event.key.keysym.sym == SDLK_RETURN)
- done = true;
- }
- else if (event.type == SDL_MOUSEMOTION)
- {
- mouseX = event.motion.x, mouseY = event.motion.y;
- if (vjs.useOpenGL)
- mouseX /= 2, mouseY /= 2;
- }
- else if (event.type == SDL_MOUSEBUTTONDOWN)
- {
- uint32 mx = event.button.x, my = event.button.y;
- if (vjs.useOpenGL)
- mx /= 2, my /= 2;
-
- done = true;
- }
-
- // Draw "About" box
- memcpy(backbuffer, bgSave, tom_getVideoModeWidth() * 240 * 2);
-
- DrawStringOpaque(backbuffer, 64, 64, 0x1CFF, 0x000F, " ");
- DrawStringOpaque(backbuffer, 64, 72, 0x1CFF, 0x000F, " Virtual Jaguar by JLH & crew ");
- DrawStringOpaque(backbuffer, 64, 80, 0x1CFF, 0x000F, " ");
-
- DrawTransparentBitmap(backbuffer, mouseX, mouseY, mousePic);
-
- RenderBackbuffer();
- }
- }
-
- free(bgSave);
+ Window * window = new Window(8, 16, 304, 160);
+ window->AddElement(new Text(8, 8, "Virtual Jaguar 1.0.7"));
+ window->AddElement(new Text(8, 24, "Coders:"));
+ window->AddElement(new Text(16, 32, "Niels Wagenaar (nwagenaar)"));
+ window->AddElement(new Text(16, 40, "Caz"));
+ window->AddElement(new Text(16, 48, "James L. Hammons (shamus)"));
+ window->AddElement(new Text(16, 56, "Adam Green"));
+
+ return window;
}
//
//
// Very very crude GUI file selector
//
-bool UserSelectFile(char * path, char * filename)
+/*bool UserSelectFile(char * path, char * filename)
{
//Testing...
-//GUIMain();
+GUIMain();
extern int16 * backbuffer;
vector<string> fileList;
strcat(filename, fileList[startFile + cursor].c_str());
return true;
+}*/
+
+//
+// Generic ROM loading
+//
+uint32 JaguarLoadROM(uint8 * rom, char * path)
+{
+ uint32 romSize = 0;
+
+ char * ext = strrchr(path, '.');
+ if (ext != NULL)
+ {
+ WriteLog("VJ: Loading \"%s\"...", path);
+
+ if (stricmp(ext, ".zip") == 0)
+ {
+ // Handle ZIP file loading here...
+ WriteLog("(ZIPped)...");
+
+ if (load_zipped_file(0, 0, path, NULL, &rom, &romSize) == -1)
+ {
+ WriteLog("Failed!\n");
+ return 0;
+ }
+ }
+ else
+ {
+/* FILE * fp = fopen(path, "rb");
+
+ if (fp == NULL)
+ {
+ WriteLog("Failed!\n");
+ return 0;
+ }
+
+ fseek(fp, 0, SEEK_END);
+ romSize = ftell(fp);
+ fseek(fp, 0, SEEK_SET);
+ fread(rom, 1, romSize, fp);
+ fclose(fp);*/
+
+ gzFile fp = gzopen(path, "rb");
+
+ if (fp == NULL)
+ {
+ WriteLog("Failed!\n");
+ return 0;
+ }
+
+ romSize = gzfilelength(fp);
+ gzseek(fp, 0, SEEK_SET);
+ gzread(fp, rom, romSize);
+ gzclose(fp);
+ }
+
+ WriteLog("OK (%i bytes)\n", romSize);
+ }
+
+ return romSize;
+}
+
+//
+// Jaguar cartridge ROM loading
+//
+void JaguarLoadCart(uint8 * mem, char * path)
+{
+ uint32 romSize = JaguarLoadROM(mem, path);
+
+ if (romSize == 0)
+ {
+/* char newPath[2048];
+ WriteLog("VJ: Trying GUI...\n");
+
+//This is not *nix friendly for some reason...
+// if (!UserSelectFile(path, newPath))
+ if (!UserSelectFile((strlen(path) == 0 ? (char *)"." : path), newPath))
+ {
+ WriteLog("VJ: Could not find valid ROM in directory \"%s\"...\nAborting!\n", path);
+ log_done();
+ exit(0);
+ }
+
+ romSize = JaguarLoadROM(mem, newPath);
+*/
+ if (romSize == 0)
+ {
+// WriteLog("VJ: Could not load ROM from file \"%s\"...\nAborting!\n", newPath);
+ WriteLog("VJ: Could not load ROM from file \"%s\"...\nAborting!\n", path);
+ log_done();
+ exit(0);
+ }
+ }
+
+ jaguar_mainRom_crc32 = crc32_calcCheckSum(jaguar_mainRom, romSize);
+ WriteLog("CRC: %08X\n", (unsigned int)jaguar_mainRom_crc32);
+ eeprom_init();
+}
+
+//
+// Get the length of a (possibly) gzipped file
+//
+int gzfilelength(gzFile gd)
+{
+ int size = 0, length = 0;
+ unsigned char buffer[0x10000];
+
+ gzrewind(gd);
+
+ do
+ {
+ // Read in chunks until EOF
+ size = gzread(gd, buffer, 0x10000);
+
+ if (size <= 0)
+ break;
+
+ length += size;
+ }
+ while (!gzeof(gd));
+
+ gzrewind(gd);
+ return length;
}
uint64 p0 = op_load_phrase(op_pointer);
op_pointer += 8;
-if (scanline == tom_get_vdb() + 1 && op_start_log)
+if (scanline == tom_get_vdb() && op_start_log)
//if (scanline == 215 && op_start_log)
{
WriteLog("%08X --> phrase %08X %08X", op_pointer - 8, (int)(p0>>32), (int)(p0&0xFFFFFFFF));
// if (height)
height--;
- uint64 data = (p0 & 0xFFFFF80000000000) >> 40;
+ uint64 data = (p0 & 0xFFFFF80000000000LL) >> 40;
uint64 dwidth = (p1 & 0xFFC0000) >> 15;
data += dwidth;
- p0 &= ~0xFFFFF80000FFC000; // Mask out old data...
+ p0 &= ~0xFFFFF80000FFC000LL; // Mask out old data...
p0 |= (uint64)height << 14;
p0 |= data << 40;
OPStorePhrase(oldOPP, p0);
}
- op_pointer = (p0 & 0x000007FFFF000000) >> 21;
+ op_pointer = (p0 & 0x000007FFFF000000LL) >> 21;
break;
}
case OBJECT_TYPE_SCALE:
if (vscale == 0)
vscale = 0x20; // OP bug??? Nope, it isn't...! Or is it?
- remainder -= 0x20; // 1.0f in [3.5] fixed point format
+/*extern int start_logging;
+if (start_logging)
+ WriteLog("--> Returned from scaled bitmap processing (rem=%02X, vscale=%02X)...\n", remainder, vscale);*/
+//Locks up here:
+//--> Returned from scaled bitmap processing (rem=20, vscale=80)...
+//There are other problems here, it looks like...
+/*
+OP: Scaled bitmap 4x? 4bpp at 38,? hscale=7C fpix=0 data=00075E28 pitch 1 hflipped=no dwidth=? (linked to 00071118) Transluency=no
+--> Returned from scaled bitmap processing (rem=50, vscale=7C)...
+OP: Scaled bitmap 4x? 4bpp at 38,? hscale=7C fpix=0 data=00075E28 pitch 1 hflipped=no dwidth=? (linked to 00071118) Transluency=no
+--> Returned from scaled bitmap processing (rem=30, vscale=7C)...
+OP: Scaled bitmap 4x? 4bpp at 38,? hscale=7C fpix=0 data=00075E28 pitch 1 hflipped=no dwidth=? (linked to 00071118) Transluency=no
+--> Returned from scaled bitmap processing (rem=10, vscale=7C)...
+OP: Scaled bitmap 4x? 4bpp at 36,? hscale=7E fpix=0 data=000756A8 pitch 1 hflipped=no dwidth=? (linked to 00073058) Transluency=no
+--> Returned from scaled bitmap processing (rem=00, vscale=7E)...
+OP: Scaled bitmap 4x? 4bpp at 34,? hscale=80 fpix=0 data=000756C8 pitch 1 hflipped=no dwidth=? (linked to 00073078) Transluency=no
+--> Returned from scaled bitmap processing (rem=00, vscale=80)...
+OP: Scaled bitmap 4x? 4bpp at 36,? hscale=7E fpix=0 data=000756C8 pitch 1 hflipped=no dwidth=? (linked to 00073058) Transluency=no
+--> Returned from scaled bitmap processing (rem=5E, vscale=7E)...
+OP: Scaled bitmap 4x? 4bpp at 34,? hscale=80 fpix=0 data=000756E8 pitch 1 hflipped=no dwidth=? (linked to 00073078) Transluency=no
+--> Returned from scaled bitmap processing (rem=60, vscale=80)...
+OP: Scaled bitmap 4x? 4bpp at 36,? hscale=7E fpix=0 data=000756C8 pitch 1 hflipped=no dwidth=? (linked to 00073058) Transluency=no
+--> Returned from scaled bitmap processing (rem=3E, vscale=7E)...
+OP: Scaled bitmap 4x? 4bpp at 34,? hscale=80 fpix=0 data=000756E8 pitch 1 hflipped=no dwidth=? (linked to 00073078) Transluency=no
+--> Returned from scaled bitmap processing (rem=40, vscale=80)...
+OP: Scaled bitmap 4x? 4bpp at 36,? hscale=7E fpix=0 data=000756C8 pitch 1 hflipped=no dwidth=? (linked to 00073058) Transluency=no
+--> Returned from scaled bitmap processing (rem=1E, vscale=7E)...
+OP: Scaled bitmap 4x? 4bpp at 34,? hscale=80 fpix=0 data=000756E8 pitch 1 hflipped=no dwidth=? (linked to 00073078) Transluency=no
+--> Returned from scaled bitmap processing (rem=20, vscale=80)...
+*/
+//Here's another problem:
+// [hsc: 20, vsc: 20, rem: 00]
+// Since we're not checking for $E0 (but that's what we get from the above), we end
+// up repeating this scanline unnecessarily... !!! FIX !!! [DONE, but... still not quite
+// right. Either that, or the Accolade team that wrote Bubsy screwed up royal.]
+//Also note: $E0 = 7.0 which IS a legal vscale value...
+
// if (remainder & 0x80) // I.e., it's negative
- if ((remainder & 0x80) || remainder == 0) // I.e., it's <= 0
+// if ((remainder & 0x80) || remainder == 0) // I.e., it's <= 0
+// if ((remainder - 1) >= 0xE0) // I.e., it's <= 0
+// if ((remainder >= 0xE1) || remainder == 0)// I.e., it's <= 0
+// if ((remainder >= 0xE1 && remainder <= 0xFF) || remainder == 0)// I.e., it's <= 0
+ if (remainder <= 0x20) // I.e., it's <= 0
{
- uint64 data = (p0 & 0xFFFFF80000000000) >> 40;
+ uint64 data = (p0 & 0xFFFFF80000000000LL) >> 40;
uint64 dwidth = (p1 & 0xFFC0000) >> 15;
// while (remainder & 0x80)
- while ((remainder & 0x80) || remainder == 0)
+// while ((remainder & 0x80) || remainder == 0)
+// while ((remainder - 1) >= 0xE0)
+// while ((remainder >= 0xE1) || remainder == 0)
+// while ((remainder >= 0xE1 && remainder <= 0xFF) || remainder == 0)
+ while (remainder <= 0x20)
{
remainder += vscale;
+
if (height)
height--;
data += dwidth;
}
- p0 &= ~0xFFFFF80000FFC000; // Mask out old data...
+
+ p0 &= ~0xFFFFF80000FFC000LL; // Mask out old data...
p0 |= (uint64)height << 14;
p0 |= data << 40;
OPStorePhrase(oldOPP, p0);
}
+ remainder -= 0x20; // 1.0f in [3.5] fixed point format
+
+/*if (start_logging)
+ WriteLog("--> Finished writebacks...\n");*/
+
//WriteLog(" [%08X%08X -> ", (uint32)(p2>>32), (uint32)(p2&0xFFFFFFFF));
- p2 &= ~0x0000000000FF0000;
+ p2 &= ~0x0000000000FF0000LL;
p2 |= (uint64)remainder << 16;
//WriteLog("%08X%08X]\n", (uint32)(p2>>32), (uint32)(p2&0xFFFFFFFF));
OPStorePhrase(oldOPP+16, p2);
//remainder = (uint8)(p2 >> 16), vscale = (uint8)(p2 >> 8);
//WriteLog(" [after]: rem=%02X, vscale=%02X\n", remainder, vscale);
}
- op_pointer = (p0 & 0x000007FFFF000000) >> 21;
+ op_pointer = (p0 & 0x000007FFFF000000LL) >> 21;
break;
}
case OBJECT_TYPE_GPU:
//#endif
// We can ignore the RELEASE (high order) bit for now--probably forever...!
// uint8 flags = (p1 >> 45) & 0x0F; // REFLECT, RMW, TRANS, RELEASE
-//Optimize: break these out to their own BOOL values
+//Optimize: break these out to their own BOOL values [DONE]
uint8 flags = (p1 >> 45) & 0x07; // REFLECT (0), RMW (1), TRANS (2)
bool flagREFLECT = (flags & OPFLAG_REFLECT ? true : false),
flagRMW = (flags & OPFLAG_RMW ? true : false),
if (!render || iwidth == 0 || hscale == 0)
return;
+/*extern int start_logging;
+if (start_logging)
+ WriteLog("OP: Scaled bitmap %ix? %ibpp at %i,? hscale=%02X fpix=%i data=%08X pitch %i hflipped=%s dwidth=? (linked to %08X) Transluency=%s\n",
+ iwidth, op_bitmap_bit_depth[depth], xpos, hscale, firstPix, data, pitch, (flagREFLECT ? "yes" : "no"), op_pointer, (flagRMW ? "yes" : "no"));*/
//#define OP_DEBUG_BMP
//#ifdef OP_DEBUG_BMP
-// WriteLog("bitmap %ix%i %ibpp at %i,%i firstpix=%i data=0x%.8x pitch %i hflipped=%s dwidth=%i (linked to 0x%.8x) Transluency=%s\n",
+// WriteLog("OP: Scaled bitmap %ix%i %ibpp at %i,%i firstpix=%i data=0x%.8x pitch %i hflipped=%s dwidth=%i (linked to 0x%.8x) Transluency=%s\n",
// iwidth, height, op_bitmap_bit_depth[bitdepth], xpos, ypos, firstPix, ptr, pitch, (flags&OPFLAG_REFLECT ? "yes" : "no"), dwidth, op_pointer, (flags&OPFLAG_RMW ? "yes" : "no"));
//#endif
// 4. image sits on right edge and no REFLECT; starts in bounds but ends out of bounds.
//Numbers 2 & 4 can be caught by checking the LBUF clip while in the inner loop,
// numbers 1 & 3 are of concern.
-// This *indirectly* handles only cases 2 & 4! And is WRONG is REFLECT is set...!
+// This *indirectly* handles only cases 2 & 4! And is WRONG if REFLECT is set...!
// if (rightMargin < 0 || leftMargin > lbufWidth)
// It might be easier to swap these (if REFLECTed) and just use XPOS down below...
DumpScaledObject(p0, p1, p2);
}//*/
//NOTE: I'm almost 100% sure that this is wrong... And it is! :-p
+
+//Try a simple example...
+// Let's say we have a 8 BPP scanline with an hscale of $80 (4). Our xpos is -10,
+// non-flipped. Pixels in the bitmap are XYZXYZXYZXYZXYZ.
+// Scaled up, they would be XXXXYYYYZZZZXXXXYYYYZZZZXXXXYYYYZZZZ...
+//
+// Normally, we would expect this in the line buffer:
+// ZZXXXXYYYYZZZZXXXXYYYYZZZZ...
+//
+// But instead we're getting:
+// XXXXYYYYZZZZXXXXYYYYZZZZ...
+//
+// or are we??? It would seem so, simply by virtue of the fact that we're NOT starting
+// on negative boundary--or are we? Hmm...
+// cw = 10, dcw = pcw = 10 / ([8 * 4 = 32] 32) = 0, sp = -10
+//
+// Let's try a real world example:
+//
+//OP: Scaled bitmap (70, 8 BPP, spp=28) sp (-400) < 0... [new sp=-8, cw=400, dcw=pcw=14]
+//OP: Scaled bitmap (6F, 8 BPP, spp=27) sp (-395) < 0... [new sp=-17, cw=395, dcw=pcw=14]
+//
+// Really, spp is 27.75 in the second case...
+// So... If we do 395 / 27.75, we get 14. Ok so far... If we scale that against the
+// start position (14 * 27.75), we get -6.5... NOT -17!
+
+//Now it seems we're working OK, at least for the first case...
+uint32 scaledPhrasePixelsUS = phraseWidthToPixels[depth] * hscale;
+
if (startPos < 0) // Case #1: Begin out, end in, L to R
-/* clippedWidth = 0 - startPos,
- dataClippedWidth = phraseClippedWidth = clippedWidth / phraseWidthToPixels[depth],
- startPos = 0 - (clippedWidth % phraseWidthToPixels[depth]);*/
- clippedWidth = 0 - startPos,
- dataClippedWidth = phraseClippedWidth = clippedWidth / scaledPhrasePixels,
- startPos = 0 - (clippedWidth % scaledPhrasePixels);
+{
+extern int start_logging;
+if (start_logging)
+ WriteLog("OP: Scaled bitmap (%02X, %u BPP, spp=%u) start pos (%i) < 0...", hscale, op_bitmap_bit_depth[depth], scaledPhrasePixels, startPos);
+// clippedWidth = 0 - startPos,
+ clippedWidth = (0 - startPos) << 5,
+// dataClippedWidth = phraseClippedWidth = clippedWidth / scaledPhrasePixels,
+ dataClippedWidth = phraseClippedWidth = (clippedWidth / scaledPhrasePixelsUS) >> 5,
+// startPos = 0 - (clippedWidth % scaledPhrasePixels);
+ startPos += (dataClippedWidth * scaledPhrasePixelsUS) >> 5;
+if (start_logging)
+ WriteLog(" [new sp=%i, cw=%i, dcw=pcw=%i]\n", startPos, clippedWidth, dataClippedWidth);
+}
if (endPos < 0) // Case #2: Begin in, end out, R to L
-/* clippedWidth = 0 - endPos,
- phraseClippedWidth = clippedWidth / phraseWidthToPixels[depth];*/
clippedWidth = 0 - endPos,
phraseClippedWidth = clippedWidth / scaledPhrasePixels;
if (endPos > lbufWidth) // Case #3: Begin in, end out, L to R
-/* clippedWidth = endPos - lbufWidth,
- phraseClippedWidth = clippedWidth / phraseWidthToPixels[depth];*/
clippedWidth = endPos - lbufWidth,
phraseClippedWidth = clippedWidth / scaledPhrasePixels;
if (startPos > lbufWidth) // Case #4: Begin out, end in, R to L
-/* clippedWidth = startPos - lbufWidth,
- dataClippedWidth = phraseClippedWidth = clippedWidth / phraseWidthToPixels[depth],
- startPos = lbufWidth + (clippedWidth % phraseWidthToPixels[depth]);*/
clippedWidth = startPos - lbufWidth,
dataClippedWidth = phraseClippedWidth = clippedWidth / scaledPhrasePixels,
startPos = lbufWidth + (clippedWidth % scaledPhrasePixels);
// bitmap! This makes clipping & etc. MUCH, much easier...!
// uint32 lbufAddress = 0x1800 + (!in24BPPMode ? leftMargin * 2 : leftMargin * 4);
// uint32 lbufAddress = 0x1800 + (!in24BPPMode ? startPos * 2 : startPos * 4);
- uint32 lbufAddress = 0x1800 + (!in24BPPMode ? startPos * 2 : startPos * 2);
+ uint32 lbufAddress = 0x1800 + startPos * 2;
uint8 * currentLineBuffer = &tom_ram_8[lbufAddress];
+uint8 * lineBufferLowerLimit = &tom_ram_8[0x1800],
+ * lineBufferUpperLimit = &tom_ram_8[0x1800 + 719];
// Render.
// This is the *only* correct use of endian-dependent code
// (i.e., mem-to-mem direct copying)!
*(uint16 *)currentLineBuffer = paletteRAM16[bits];
+/* {
+ if (currentLineBuffer >= lineBufferLowerLimit && currentLineBuffer <= lineBufferUpperLimit)
+ *(uint16 *)currentLineBuffer = paletteRAM16[bits];
+ }*/
else
*currentLineBuffer =
BLEND_CR(*currentLineBuffer, paletteRAM[bits << 1]),
projects / virtualjaguar / commitdiff