3210 Commits

Author SHA1 Message Date
Torbjörn Andersson
2ba156184c SCUMM: Add Macintosh b/w rendering mode
This is currently only (partially) implemented for the 16-color Mac
versions of Loom and Indiana Jones and the Last Crusade. The text is
still drawn in color, since that's rendered separately, but I'm
committing this now while it still works.
2021-07-13 09:53:36 +02:00
djsrv
ea7d098913 GRAPHICS: MACGUI: Clean up comments 2021-07-12 18:02:56 -04:00
djsrv
6621b6121d GRAPHICS: MACGUI: Fix ID at which Japanese fonts start 2021-07-12 18:02:56 -04:00
djsrv
de929228c4 GRAPHICS: MACGUI: Add Japanese mode 2021-07-12 18:02:56 -04:00
djsrv
ad79812cc6 GRAPHICS: MACGUI: Introduce font aliases
Easy way of adding more font IDs and names for the same font.
2021-07-12 18:02:56 -04:00
djsrv
0c053d20ba GRAPHICS: MACGUI: Replace kMacCentralEurope with kMacRoman 2021-07-12 15:41:21 -04:00
djsrv
0b7af4209f GRAPHICS: MACGUI: Remove MacButton ctor with encodeType
Encoding is handled in MacFontRun now, so this is no longer needed.
2021-07-12 15:41:21 -04:00
djsrv
354e344b4d GRAPHICS: MACGUI: Start IDs for new font registrations at 100
Makes it clearer that these are not system fonts.
2021-07-12 15:41:21 -04:00
djsrv
68426370f3 GRAPHICS: MACGUI: Don't register font name in loadFonts
We don't know a font's preferred ID at this point. We must get that from
the Director movie's font map.
2021-07-12 15:41:15 -04:00
djsrv
9fe78bc54d GRAPHICS: MACGUI: Fix unregistered font segfault 2021-07-12 01:33:16 -04:00
djsrv
c4626eef97 GRAPHICS: MACGUI: Fix compilation
Forgot to eliminate new uses of _encodeType when rebasing. As formatting
strings only use ASCII characters the encoding shouldn't really matter,
and using the default of UTF-8 is easier than fetching the actual
encoding from the relevant MacTextRun.
2021-07-12 00:54:37 -04:00
djsrv
5bc3ad06c0 GRAPHICS: MACGUI: Move encoding tracking to MacFontRun
Font is basically the only way to determine a piece of text's encoding
in Director. Since MacFontRun tracks fonts, it's the nicest place to
handle encoding too.
2021-07-12 00:38:05 -04:00
djsrv
f4d2b75342 GRAPHICS: MACGUI: Set default encodings in registerFontName 2021-07-12 00:38:05 -04:00
djsrv
2e3b08017f GRAPHICS: MACGUI: Whitespace cleanup 2021-07-12 00:38:05 -04:00
djsrv
acb3ace45e GRAPHICS: MACGUI: Detect Japanese fonts from preferred ID 2021-07-12 00:38:05 -04:00
djsrv
71d4127b8a GRAPHICS: MACGUI: Store font lang and encoding 2021-07-12 00:38:05 -04:00
djsrv
ed406150c2 GRAPHICS: MACGUI: Add font name from Alan Kay demo 2021-07-12 00:38:05 -04:00
djsrv
50cec75fd5 GRAPHICS: MACGUI: Remove changing font ID 3 to 1
We register font ID 3 now.
2021-07-12 00:38:05 -04:00
djsrv
53f600846b GRAPHICS: MACGUI: Fix fallback of Japanese fonts to Osaka 2021-07-12 00:38:05 -04:00
djsrv
b57f6d8b7f GRAPHICS: MACGUI: Allow fonts to be registered to a preferred ID 2021-07-12 00:38:05 -04:00
djsrv
f39e6eaac7 GRAPHICS: MACGUI: Add Japanese font info 2021-07-12 00:38:05 -04:00
djsrv
b7c40b3d37 GRAPHICS: MACGUI: Create font info dictionary 2021-07-12 00:38:05 -04:00
Martin Gerhardy
b2878dea3b GRAPHICS: removed invalid char from comment 2021-07-11 13:56:19 +02:00
ysj1173886760
c6bd9f908f GRAPHICS: MACGUI: fixing mactext for dealing with fg color 2021-07-09 19:48:37 +08:00
ysj1173886760
f4a2b8b963 GRAPHICS: MACGUI: amend drawing color 2021-07-09 19:48:37 +08:00
ysj1173886760
947764159c DIRECTOR: fix rendering text separately. read fg color though text, instead of argument 2021-07-09 09:41:31 +08:00
ysj1173886760
4c9db11696 GRAPHICS: MACGUI: amend setting bgcolor and fgcolor. drawing color by fgcolor 2021-07-09 09:41:31 +08:00
ysj1173886760
dc41917a74 DIRECTOR: implement text chunk fields operations 2021-07-08 02:25:11 +02:00
ysj1173886760
6e2a8fc08f GRAPHICS: MACGUI: implement setting text slant and text fontId of text chunks 2021-07-08 02:25:11 +02:00
ysj1173886760
42aa4739f8 DIRECTOR: implement chunk field operations for text cast member 2021-07-08 02:25:11 +02:00
ysj1173886760
56fad1585b DIRECTOR: implement setting text size for text cast member 2021-07-08 02:25:11 +02:00
ysj1173886760
1492a06a84 GRAPHICS: MACGUI: amend interLinear for mactext 2021-07-08 02:25:11 +02:00
ysj1173886760
60c0e78d95 GRAPHICS: MACGUI: add line spacing for mactext 2021-07-08 02:25:11 +02:00
ysj1173886760
a841358e69 DIRECTOR: implement some basic field operations for text cast 2021-07-08 02:25:11 +02:00
Paul Gilbert
0136043f09 COMMON: Revert Change Rect and Point to have int32 fields
This reverts commit 1c3e7fb4e9e761b26840ca7dd785e80dfa639f18.
2021-07-06 20:35:42 -07:00
djsrv
e9d9b9f569 DIRECTOR: Revert FXmp handling
This reverts commit 4dabee7e8b26a6fd170e27ff6dd4bfdf67faec67.
This reverts commit 3fda461d5f961f6d9ae347a39767dbfa70c54e82.
This reverts commit 831c014f9eb4205b47c815c5598d30c94de551d0.
This reverts commit b3b55e59e9ce4caab668b58e4173a8dd102b9c54.
2021-07-06 16:47:20 -04:00
djsrv
3fda461d5f GRAPHICS: MACGUI: Handle FontXPlatformMap in MacFontManager::getFont 2021-07-05 22:54:14 -04:00
djsrv
831c014f9e DIRECTOR: Make FXmp available to MacText 2021-07-05 22:53:35 -04:00
djsrv
b3b55e59e9 GRAPHICS: MACGUI: Add parent to MacFontRun 2021-07-05 22:53:35 -04:00
Le Philousophe
25426c0a80 MACGUI: Fix int/int32 build failures
All of this is because Rect and Surface have moved to int32
2021-07-05 23:54:34 +02:00
Paul Gilbert
baccbedf50 GRAPHICS: Changed surface classes sizes from uint16 to int16 2021-07-04 18:24:27 -07:00
Paul Gilbert
1c3e7fb4e9 COMMON: Change Rect and Point to have int32 fields 2021-07-04 18:24:26 -07:00
djsrv
58ab956d72 GRAPHICS: MACGUI: Don't allow font IDs to be overridden
New fonts are automatically assigned a unique ID.
2021-07-02 18:08:21 -04:00
Eugene Sandulenko
7eb9bcf705
GRAPHICS: Fix MSVC warning 2021-07-01 01:35:58 +02:00
ysj1173886760
1945e3ec5c GRAPHICS: MACGUI: realloc surface after changing dims 2021-06-30 16:29:00 +02:00
ysj1173886760
bcd33eeba3 DIRECTOR: fix rendering text to suit for different style text 2021-06-30 16:29:00 +02:00
ysj1173886760
d0317fa1bb DIRECTOR: use text style to determine whether text should fix dims 2021-06-30 16:29:00 +02:00
ysj1173886760
202f6ce7e5 GRAPHICS: MACGUI: move set fixed dims to ctor for mactext 2021-06-30 16:29:00 +02:00
ysj1173886760
c759e27fe7 GRAPHICS: MACGUI: introduce _fixedDims to mactext, which represent for whether mactext should auto expanding. 2021-06-30 16:29:00 +02:00
ysj1173886760
787454f908 GRAPHICS: MACGUI: support partial color setting in mactext 2021-06-30 16:29:00 +02:00