Commit Graph

1572 Commits

Author SHA1 Message Date
stephena e3b07007d4 Separated the UI palette from emulation palette, and reworked color
definitions so that it's clearer which palette should be used.

Added 1x TIA emulation surface creation to FrameBuffer.  Certain parts
of the codebase need access to this (debugger, snapshot in 1x mode, etc).
Related to this, viewing the TIA emulation in the debugger now works again.

Still todo is fix color handling in PromptWidget (which I just broke).


git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@1594 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2009-01-03 15:44:13 +00:00
stephena b19344c77f Updated OSX project files for recent class additions. Also, I have
to officially move to XCode 3.0, which means a minimum of OSX 10.3
for Stella.  Sorry 10.2 users, but I no longer have the operating
system version to keep compatibility.  On a lighter note, it looks
like XCode 3.0 uses a more recent version of gcc for Intel, so there
may be some speedups ...


git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@1593 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2009-01-02 02:22:31 +00:00
stephena 187bec7873 Added right mouse button context menu to the ROM launcher. For now, it has
three entries:

1)  Override properties - temporarily override ROM properties, so that
    (for example) the left diff switch can be set to 'A' even if its
    property says to use 'B'.

2)  Filter ROM listing - still TODO.

3)  Reload ROM listing - functionality was already present with Ctrl-r;
    this just adds a UI element for it.


git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@1592 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2009-01-02 01:50:03 +00:00
stephena 8f59c4a08e Some refactoring of the OSystem class wrt console creation. Info about
a created console is now shown on the commandline again.


git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@1591 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2009-01-01 22:44:14 +00:00
stephena e15989c30a Updated copyright information for 2009. Happy New Year (for anyone
reading these logs!).


git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@1590 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2009-01-01 18:13:40 +00:00
stephena d1379b54bb First pass at reworking the way auto-detect information is presented to
the user.  Previously, the only way to see certain info was at the
commandline (a bias on my part, as I always launch Stella from the console
and view the output there).  Now, we can see bankswitch type and cart
display format as part of the 'stats' message in TIA emulation.

Reporting this info to the commandline is currently broken.  Also todo
is start on the cart random startup bank infrastructure, and also show
this in the stats message.


git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@1589 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2009-01-01 00:08:59 +00:00
stephena bbdac2b646 Some more properties updates from RomHunter v4.
git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@1588 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2008-12-31 21:57:54 +00:00
stephena a70a1f1e62 Oops, a few properties I missed last time.
git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@1587 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2008-12-31 01:39:04 +00:00
stephena 051969e56a Fixes to RomAuditDialog for recent surface changes. Also, if a ROM
already has the correct name, we no longer rename it anyway (renaming
a correctly-named ROM was updating a counter that should only show
ROMs that *really* had to be renamed).

First pass at integrating RomHunters V4 romset database into internal
properties.


git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@1586 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2008-12-31 01:33:03 +00:00
stephena 8ba2482f50 RomInfoWidget now honours 1x and 2x mode, and correctly resizes PNG
snapshots to the selected mode.  This means that you no longer have
to make sure that snapshots are taken in 1x mode (as was the previous
functionality).


git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@1585 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2008-12-30 02:34:49 +00:00
stephena c5de58f13c Reactivated rom viewer in ROM lauuncher. For now, it only works with
1x snapshots (which the core code can no longer generate) and doesn't
resize properly into 2x mode.

Reworked '-romviewer' commandline argument (and associated UI) to
indicate the zoom level for snapshots in the viewer ('0' means to not
turn it on at all, otherwise '1' or '2').


git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@1584 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2008-12-29 20:42:15 +00:00
stephena c839ddaab1 Baring any last minute issues, it looks like I've finally finished with
the new FrameBuffer surface-based instrastructure.  Thank God, since it
was really starting to get on my nerves :(

Made the Alt- and Alt= keys (for changing videomodes) only be active
in TIA emulation mode.  This solves the final remaining positioning
issues with ContextMenus, since now a ContextMenu is never onscreen when
the VideoMode changes size (and hence we don't have to worry about
re-positioning it).

Now to fix the RomInfoWidget, and then UI-wise we'll have parity with
the 2.6.1 release ...


git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@1583 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2008-12-28 23:47:09 +00:00
stephena eb381e24f6 Make software rendering mode in OSX ignore 'isBase' surface functionality,
and always update entire surfaces when changes are made.  This is
basically a workaround for the next release, as I don't want to spend
time on fixing this right now (since it only happens in fullscreen
software mode, which isn't the optimal code-path in OSX anyway).


git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@1582 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2008-12-28 22:54:04 +00:00
stephena 61ba37d7ad Oops, forgot to remove debugging code.
git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@1581 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2008-12-28 22:31:13 +00:00
stephena 64ec3ac8d0 Properly swallow 'Cmd' key-combo shortcut keys in OSX.
git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@1580 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2008-12-28 22:30:40 +00:00
stephena 3f81dd2c93 Changed behaviour of 'gl_fsmax' argument again. It's now a boolean,
which only applies to TIA mode (in fullscreen, of course).

Some code/debugging cleanups across the various FrameBuffer classes.

Finally fixed software rendering mode crashes.  It now works just as
well as OpenGL mode, with all dialog positioning working the same in
both.

Reactivated OpenGL filtering (GL_LINEAR and GL_NEAREST).  Only the TIA
image can be changed; the UI dialogs are always using GL_NEAREST).


git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@1579 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2008-12-28 21:01:55 +00:00
stephena 829375de34 Fixed yet more positioning issues. Everything seems to be working fine
in OpenGL mode now, and I think I've finally finished the major UI stuff
there.  Now for software mode.


git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@1578 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2008-12-28 00:23:21 +00:00
stephena 5b4f9f3781 OK, another large FrameBuffer-related change so that fullscreen,
double-buffered modes don't have flicker.  Basically, the core FrameBuffer
class has been modified to draw dialogs multiple times when necessary,
above and beyond when changes are made (ie, if a new surface is to be
overlaid, all surfaces underneath must be drawn to BOTH buffers in
double-buffered mode first).

Software rendering is currently broken in fullscreen mode, but I know
why.  It's basically the optimizations I try to make for large software
surfaces (the 'isBase' functionality).  This is going to disappear before
the next release.  And in case I haven't mentioned it for a while; I
REALLY HATE software mode.


git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@1577 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2008-12-27 23:27:32 +00:00
stephena 4051b523d8 Fixed minor error in mode switching.
Commented out some debugging messages.


git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@1576 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2008-12-27 15:56:36 +00:00
stephena 311c0f717f Changed VideoDialog so that it shows the current framebuffer type,
and allows you to change it for the next Stella run, but doesn't
actually change it for this run (since Stella now has to be
restarted for toggling between software and OpenGL mode).


git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@1575 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2008-12-26 21:39:17 +00:00
stephena 5147356c96 Re-add support for displaying text in FrameBufferSoft. I've only
tested 32-bit mode for now; more testing to come.

Made changes in OSystem so creating a framebuffer is only ever done
once.  This means that switching between software and OpenGL mode is
no longer dynamic (ie, it can no longer be done while Stella is running).
With the forthcoming changes to VideoDialog, you'll be able to set the
mode to change the next time Stella runs.  It just adds too much
complexity to support dynamic switching, especially when I don't think
many people do it too often.

Updated CommandDialog to be font-resizable (ie, take advantage of the
new UI fonts).


git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@1574 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2008-12-26 20:05:17 +00:00
stephena 92b22e3ad7 OK, I decided to take a break from the positioning stuff and work on
something which was the basis for this whole surface restructuring in
the first place; updated fonts in the UI.

Switched out the old normal and larger sized fonts for higher
resolution ones.  The surfaces are now mostly larger than 320x210,
which means 1x TIA zoom mode is no longer allowed (which was actually
disabled some time ago).

I'm getting close to the end of a single surface design to what we have
now; a multi-level surface infrastructure.  This allows higher-res UI's
(which have just been committed), and optimizations for OpenGL TIA
rendering (which were committed over the last week).  In the future,
this will also make it easy to add TIA filters to OpenGL mode (ScalexX,
HQxX, etc).


git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@1573 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2008-12-25 23:05:16 +00:00
stephena 843c85c56b Yet more OpenGL positioning fixes.
Fixed compile warning in converting integer values to hex strings in the
debugger.  The resulting code was actually causing crashes in the RIOT
tab of the debugger.


git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@1572 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2008-12-24 01:20:06 +00:00
stephena b62755ce70 Some more UI positioning fixes. InputTextDialog's in the debugger are
now correctly positioned, but there's still an issue with ContextMenus
which are used by PromptWidgets.

Finally, we see the first performance improvements in OpenGL TIA
rendering coming from the new 'surface' infrastructure.  Now that TIA and
UI surfaces are rendered separately, we no longer have to double the TIA
width in software; it can be hardware-accelerated (ie, a 160x200 texture
is stretched in hardware).


git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@1571 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2008-12-23 18:54:05 +00:00
stephena 039a0b9e36 Some fullscreen positioning fixes for OpenGL mode. It's getting close
to being finished now (thankfully, since I want to move to other parts
of the codebase).


git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@1570 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2008-12-21 19:51:35 +00:00
stephena 748325301d Fixed annoying OSX warning that I've been looking at for about 2 years.
It seems the fix for OpenGL issues in OSX do work, so now the OpenGL
code is working the same on all systems again.  So now I can get to
the fullscreen positioning issues ...


git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@1569 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2008-12-21 00:12:15 +00:00
stephena bf993f9284 Fixed minor warning with newer version of gcc.
git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@1568 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2008-12-20 23:42:30 +00:00
stephena 5dc7cba2a8 Hopefully finally fixed the issue of OpenGL texture re-generation whose
behaviour differs between OSX and other systems.

Disabled output of the TIA display while in the debugger; this code
needs to be rewritten.


git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@1567 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2008-12-20 23:32:46 +00:00
stephena a8a2689269 I think I've found the issue with OpenGL weirdness in OSX. Now I need
to make sure it doesn't break on other systems.


git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@1566 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2008-12-18 23:36:32 +00:00
stephena cb8d35044a Oops, this is a little too agressive with the optimizations.
git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@1565 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2008-12-15 17:53:01 +00:00
stephena 54b54aabd6 Switched a bit of code around, because it causes a problem in Vista.
I'm really beginning to tire of the OpenGL stuff right now, since it
seems everything works differently between Linux, OSX and Windows.  And
surprise, surprise, there never seems to be any problems in Linux ...


git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@1564 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2008-12-15 00:20:11 +00:00
stephena f997bfb7f2 Oops, we have to clean up after ourselves.
git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@1563 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2008-12-14 21:51:11 +00:00
stephena c509186c0a Fixed crash with setting the UI palette in OpenGL mode.
git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@1562 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2008-12-14 21:44:06 +00:00
stephena 9aa6eb820c A few more fixes for some OpenGL crashes. The allocation/deallocation
of FBSurfaces should belong solely to FrameBuffer, so that different
parts of the code don't try to delete what they don't own.


git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@1561 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2008-12-12 18:32:53 +00:00
stephena 203cdaf323 First pass at fixing the 'white texture' issue with OpenGL mode in OSX.
Basically, all textures/surfaces need to be reloaded each time the GL
context changes (which seems to be more often under OSX than on other
systems).  This new code takes care of that.


git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@1560 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2008-12-12 15:51:07 +00:00
stephena f599e1611d A little renaming in the GL class. I now know why we're getting white
textures in OSX.  It seems the textures have to be completely reloaded
after the window changes size, even if it's still large enough to hold
the previous textures.  I assume the GL context is being reset each
time SDL_SetVideoMode is called (although this doesn't happen in Linux
or Win32).


git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@1559 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2008-12-10 18:11:21 +00:00
stephena f0212fe4de Enable the texrect argument again in OpenGL mode. However, now we're
getting white textures in OSX.  Arrgh ...


git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@1558 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2008-12-10 17:11:34 +00:00
stephena a3de0dcbaf Finally, I've eliminated the redraw issues in windowed OpenGL mode.
Can you believe it was because of ONE #$&#%&** line of code!

Still TODO, a general cleanup of the positioning code (ie, switching
from windowed to fullscreen & vice-versa) used the 'old' coordinates,
so things often aren't centered.


git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@1557 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2008-12-08 18:56:54 +00:00
stephena 86cc191168 Finally getting a chance to look at the OpenGL stuff again.
Fixed crash when displaying 'popup' messages with OpenGL.

Changed OpenGL internal format to be the same as OSX.  Based on my
experimentation and research, this is the fastest format independent
of the platform/operating system.

Updated TODO marking the reload ROM listing functionality as being
complete.


git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@1556 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2008-12-04 16:53:26 +00:00
stephena f1441f5f1b Added ability to reload the current ROM listing in the ROM launcher to the 'Control-r' key combo (similar to the same key which reloads the ROM while in emulation mode).
git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@1555 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2008-11-30 17:28:03 +00:00
stephena f9d4bf5873 Update TODO list. I've had these items on an internal TODO list for
some time; I guess it's time to make it public.  I expect to add many
of the top items for the next release (at this point hopefully in
January 2009).


git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@1554 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2008-11-26 16:22:55 +00:00
stephena 43f26ad3a6 Removed 'PAL' hint for a ROM, since the auto-detection actually correctly
detects it as NTSC.


git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@1553 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2008-11-24 18:14:44 +00:00
stephena 6d0333800e OpenGL dialog boxes are now centered.
Partial fixes to F8 bankswitching code, also adding hardcoded support
for HES Challenge/Surfers Paradise double cart (the lower bank was
never accessible).  More work is required in this area.


git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@1552 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2008-11-24 18:02:19 +00:00
stephena a1e91c365d A few gcc 4.3.x changes.
git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@1551 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2008-11-02 16:46:05 +00:00
stephena 5b75962511 Fixed some missing includes as reported by M. Lanctot.
git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@1550 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2008-08-25 23:22:22 +00:00
stephena dbc36a32e2 First pass at fixing OpenGL mode. There are still several issues with
the UI stuff, but at least emulation mode is now working.  But for
some strange reason, starting a ROM from the commandline gives a blank
screen, while it works fine from the ROM launcher.


git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@1549 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2008-08-05 12:54:47 +00:00
stephena 6ba918320a A few minor API fixes, and a fix for the '-pedantic' argument in GCC.
git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@1548 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2008-08-04 20:12:23 +00:00
stephena 54b5b79414 Backtracked a little on the new software surfaces rendering code. The
surfaces are still separate and blitted separately, but the actual
screen updates are now done all at once, at the end of the frame (as in
the previous code).  This makes things a little faster, and eliminates
an annoying flicker because of SDL_UpdateRect being called at different
times.


git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@1547 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2008-08-04 11:56:12 +00:00
stephena 60da49f3ef Fixed issue with randomizing RAM for M6532 and various carts. It seems
that randomization was only done once per game invocation, and not each
time Device::reset() was called (which according to its definition is
when it should be done).  This has the side-effect of fixing A. Davies
notBoulderdash ROM, which didn't work if display-type was set to
auto-detect.

Some fixes for dynamic menus generated by PopUpWidget and its
associated dialog/surfaces.


git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@1546 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2008-08-01 12:16:00 +00:00
stephena a661d6b804 Some restructuring and cleanup of PopUpWidget/ContextMenu functionality.
Those widgets now take two items per entry; the string to display, and
the one to use (in essence a key/value pair).  This really shortens the
code in quite a few places.

TIA graphical filters are now selectable from the UI, and correctly change
video mode (in TIA mode).


git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@1545 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2008-07-25 12:41:41 +00:00