Commit Graph

458 Commits

Author SHA1 Message Date
Max Horn
48e94ef721 added doxygen comment & TODOs
svn-id: r10604
2003-10-05 13:10:53 +00:00
Max Horn
d4734bd4f2 use namespace Common a bit more; don't zero the RNG in scumm (else the seed gets reset); remove obsolete 256 color blending code
svn-id: r10592
2003-10-04 11:50:21 +00:00
Paweł Kołodziejski
f0fae232b9 fixed compilation under msvc7
svn-id: r10562
2003-10-03 07:45:41 +00:00
Max Horn
a02c13a52e fix scaler compilation for MSVC6. However, the produced code stll seems to be incorrect... Jamieson, maybe the MSVC6_COMPAT should be re-added then after all?
svn-id: r10552
2003-10-02 23:29:58 +00:00
Max Horn
bb5351f0a8 according to tsuteiuQ, this helps MSVC6 (seems it can cope with the enums but not with static consts)
svn-id: r10551
2003-10-02 23:09:54 +00:00
Max Horn
0e645f88ae renamed namespace ScummVM to Common
svn-id: r10544
2003-10-02 17:43:02 +00:00
Max Horn
2d216530e6 fix a warning wjp gets with gcc 3.2.3
svn-id: r10541
2003-10-02 17:07:50 +00:00
Jamieson Christian
8fbcb4ac15 Added MSVC6_COMPAT in order to be able to disable
new additions/optimizations that use constructs with
which MSVC6 is incompatible, such as the revamped
template-based super/hq/tv scalers.

svn-id: r10540
2003-10-02 15:00:36 +00:00
Max Horn
80eb1f8cb9 sync with hq2x (in particular, use my Altivec code here, too
svn-id: r10529
2003-10-01 20:59:05 +00:00
Max Horn
57eb9654b7 make MSVC7 happy
svn-id: r10524
2003-10-01 17:06:36 +00:00
Max Horn
628f65b639 move INTERPOLATE / Q_INTERPOLATE to intern.h; remove some jumps (pipelin trashers I call 'em :-) from diffYUV
svn-id: r10523
2003-10-01 16:47:49 +00:00
Max Horn
b6f85de558 instead of using a stack array, use regular variables (marked with the register keyword to hint the optimizer) for the color data. At least over here this helps the optimizer *A LOT* - instead of keeping w[] on the stack, on the PowerPC all values stay in registers, for a nice speed boost. Shouldn't hurt x86 either
svn-id: r10522
2003-10-01 16:39:31 +00:00
Max Horn
2aeb5c2414 added some AltiVec code. Still under development, and notice that this is my first time writing AltiVec code, so I am sure it could be done better :-). I am working on the interpolation function now.
svn-id: r10508
2003-09-30 16:59:01 +00:00
Max Horn
7ccafa467c synced hq2x with upstream changes; some performance tweaks to hq2x/hq3x (I think for bigger speed improvement we'd have to use ASM (with C++ fallback of course)...
svn-id: r10494
2003-09-29 23:34:43 +00:00
Max Horn
e342878f84 forgot to add common/scaler to MODULE_DIRS
svn-id: r10490
2003-09-29 21:58:40 +00:00
Max Horn
c40e7d68a5 templatized more of the scalers; also introduced template struct ColorMasks (shortens/simplifies other code a bit)
svn-id: r10489
2003-09-29 18:38:51 +00:00
Max Horn
4a7385b4e7 split out scalers into separate source files in common/scaler; some optimizations (in particular, the hq2x/hq3x scalers now are compiled into two versions, one for 555 and one for 565 mode)
svn-id: r10488
2003-09-29 16:02:47 +00:00
Max Horn
17bf7b95aa removed duplicate g_timer object (one was global, one was static to timer.cpp); set g_system earlier (might prevent a few race conditions)
svn-id: r10471
2003-09-28 21:08:48 +00:00
Torbjörn Andersson
2d3e970496 Slightly more sensible hotkeys for the scalers. Hq2x is now number 8, right
after AdvMame2x, and 9 and 0 are AdvMame3x and Hq3x respectively.

I agree with Fingolfin that we'll need a better way of handling this in the
future, though.

svn-id: r10461
2003-09-28 14:27:08 +00:00
Jonathan Gray
0b923944d2 don't try to pass NULL when there is an int argument
svn-id: r10454
2003-09-28 00:59:01 +00:00
Max Horn
1d40ce68c2 get rid of explicit redMask/blueMask and use redBlueMask instead (this will be useful should we choose to templatize the scalers for 555/565 mode optimizations)
svn-id: r10451
2003-09-27 23:59:09 +00:00
Max Horn
b2b9a7cb07 cheak doxygen comments
svn-id: r10448
2003-09-27 23:11:26 +00:00
Jamieson Christian
44c0654ffd Fixed template function compile quirks under MSVC6.
Apparently MSVC6 does not like overloading of template
functions when the template arguments vary between
versions of the overloaded function. I replaced
interpolate16 with functions that have two different
names, so MSVC6 won't see them as being the same
function with [it insists] the same number of template
arguments.

svn-id: r10446
2003-09-27 22:53:24 +00:00
Max Horn
e032e79a4a added hq2x scaler (no, I am not going to add hq4x anytime soon. It would be another 4-5000 lines of code, and scaler.cpp already takes far too long to compile. Maybe we should seperate the scalers into several files in common/scaler/ ?)
svn-id: r10438
2003-09-27 21:19:17 +00:00
Max Horn
d87f65ff06 added a FIXME (regarding optimization) to INTERPOLATE; added new template function interpolate16 which is used by hq3x (advantage of the old trick which abused Q_INTERPOLATE: smaller & better optimized code; very easy to adapt the function for other uses, like for hq2x/hq3x. Drawback: scaler.cpp takes even longer to compile now :-)
svn-id: r10433
2003-09-27 18:09:50 +00:00
Max Horn
49d2a22b42 OSystem changes: removed create_thread() method (not needed anymore; 'pure' threads aren't very portable anyway, better we only use timers); introduced OSystem::TimerProc type
svn-id: r10430
2003-09-27 16:54:11 +00:00
Travis Howell
3854ce8f3d Add Acorn version of Simon the Sorcerer 1 Talkie
svn-id: r10389
2003-09-24 06:19:30 +00:00
Max Horn
8a5e6289a5 use our own ABS instead of the math.h abs(); some tweaks
svn-id: r10363
2003-09-22 23:29:47 +00:00
Max Horn
9abd9bb6b5 added WRITE_LE/BE_16/32 functions to match our current READ_ funcs - useful in some places
svn-id: r10358
2003-09-21 18:15:32 +00:00
Max Horn
ab1c58c1b1 fixed InitLUTs for 555 mode; some tweaks
svn-id: r10354
2003-09-21 17:56:11 +00:00
Torbjörn Andersson
308e88965a Made Ctrl-Alt 9 the hotkey for the new hq3x scaler, and moved the scanlines
and dotmatrix ones to Ctrl-Alt C and Ctrl-Alt-D.

(Does anyone else feel that scanlines and dotmatrix should either be
rewritten so that they can be combined with any scaler and aspect ratio
correction, or removed? That's why I moved them off the Ctrl-Alt <digit>
hotkeys.)

svn-id: r10353
2003-09-21 17:05:07 +00:00
Torbjörn Andersson
14813704ae Applied ScummVM formatting conventions
svn-id: r10349
2003-09-21 15:46:27 +00:00
Max Horn
74e3448a4c added HQ3x filter
svn-id: r10346
2003-09-21 12:10:32 +00:00
Max Horn
b75626d1ce added explicit virtual destructor; added API which makes it potentially possible to have an overlay with a different size than than the 'normal' screen (e.g. if the game runs at 320x200 and a 2x scaler runs, the overlay could be made 640x400 big, if the backend supports that)
svn-id: r10326
2003-09-20 00:47:18 +00:00
Max Horn
209413ed07 disable the custom operator 'new' on Mac OS X, as it cause multiple definition linker error when building ScummVM with loadable modules
svn-id: r10303
2003-09-18 18:22:15 +00:00
Max Horn
be9d4066e1 moved engine.* to base; this fixes some linking issues when building a barebone ScummVM (or maybe I just want to increase our CVS stats? <g>)
svn-id: r10287
2003-09-18 02:07:18 +00:00
Max Horn
3c55fd316f cleanup
svn-id: r10284
2003-09-17 23:05:07 +00:00
Max Horn
c1a678afeb new module 'base'; moved gameDetector.*, main.cpp and base/plugins.* there (this removes the need for an ugly hack in the build system, and is also conceptionally cleaner)
svn-id: r10282
2003-09-17 22:41:01 +00:00
Max Horn
231cb16b5b some tweaks to the build system (work toward plugin support)
svn-id: r10279
2003-09-17 21:53:13 +00:00
Max Horn
468275bb94 added a static method setDefaultDirectory to class File; used this to simplify some code; added a global g_sound pointer in bs2, this cuts down on uses of g_sword2 (of course both should be removed on the long run); some other minor tweaks/fixes
svn-id: r10278
2003-09-17 21:06:16 +00:00
Max Horn
1d60dc552d delete name only after closing the file
svn-id: r10270
2003-09-17 13:28:48 +00:00
Max Horn
a3bb9f81e0 added time.h and math.h to default/precompiled headers
svn-id: r10168
2003-09-11 10:10:38 +00:00
Max Horn
afe56a4aeb added refCon parameter to timer class
svn-id: r10156
2003-09-10 12:43:54 +00:00
Max Horn
110152ddcf moved declaration of error/warning/debug from engine.h to util.h
svn-id: r10149
2003-09-10 12:15:51 +00:00
Max Horn
c775614e1b fixed circular dependency; moved version string to main.cpp (seems more logical to me, too)
svn-id: r10105
2003-09-08 17:46:54 +00:00
Max Horn
3916b97357 changes to get a better link order, and to allow building a 'bare bone' scummvm executable
svn-id: r10103
2003-09-08 17:42:53 +00:00
Max Horn
f61fdef996 fixed disabling of modules
svn-id: r10102
2003-09-08 17:30:24 +00:00
Max Horn
940200f173 got rid of version_settings
svn-id: r10101
2003-09-08 17:25:44 +00:00
Max Horn
6455c81989 more plugin related work
svn-id: r10098
2003-09-08 17:13:40 +00:00
Max Horn
f23a34c9e5 renamed VersionSettings -> TargetSettings and also renamed some of its members; added GameDetector::findTarget; made launcher use that new method; some initial preparations for Plugin code
svn-id: r10092
2003-09-08 15:38:34 +00:00