Commit graph

330 commits

Author SHA1 Message Date
Christoph Oelckers
32300f7d26 - use translation slot 0 for reserved content, like font translations. 2020-04-11 20:20:39 +02:00
Christoph Oelckers
2dcf63c57d - backport some fixes from Raze - mostly redundant includes. 2020-04-11 20:20:39 +02:00
Christoph Oelckers
580e463498 - moved texture code to 'common'. 2020-04-11 20:20:38 +02:00
Christoph Oelckers
5bde737be9 - split buildtexture.cpp in two.
The texture itself is 'common', but the setup is not.
2020-04-11 20:20:38 +02:00
Christoph Oelckers
3e285d2261 - moved renderstyle and colortables code to 'common'. 2020-04-11 20:20:37 +02:00
Christoph Oelckers
f8e9cb8fbc - major dependency reduction of the texture system. 2020-04-11 20:20:37 +02:00
Christoph Oelckers
1ed170d955 - moved some data needed by the texture system into palettecontainer.cpp. 2020-04-11 20:20:36 +02:00
Christoph Oelckers
be24023722 - split animation management out of the texture manager into a separate class. 2020-04-11 20:20:36 +02:00
Christoph Oelckers
7d192decc7 - some cleanup of the texture code
* removed unneeded includes
* moved global brightmap to GPalette
* took Build tile init code out of the FTextureManager class, because this code is not compatible with how real Build games need to go about it, making the texture manager not shareable.
* removed dependency on higher level info from the Image class.
2020-04-11 20:20:35 +02:00
Christoph Oelckers
721b857e5e - minor FTexture cleanup. 2020-04-11 20:19:53 +02:00
Christoph Oelckers
ac610d87e5 - merged FPalette and PaletteContainer. 2020-04-11 20:19:53 +02:00
Christoph Oelckers
7243495b16 - moved special color maps to utilities.
The default tables are needed by the texture compositor which should be universal, so this needs to be, too.
2020-04-11 20:19:52 +02:00
Christoph Oelckers
777f2ee7c6 - moved stringtable to 'common'. 2020-04-11 20:19:51 +02:00
Christoph Oelckers
b3c7b81893 - decoupled the string table from game implementation details.
Using callbacks now to query needed game state.
2020-04-11 20:19:51 +02:00
Christoph Oelckers
31fbff85f4 - c_dispatch header cleanup and splitting of gamestate into a separate header, to avoid polluting low level code with game specific headers. 2020-04-11 20:19:25 +02:00
Christoph Oelckers
1479e3a1c3 - CVAR cleanup, in particular decoupling from game internals, which now get handled via callbacks. 2020-04-11 14:00:22 +02:00
Christoph Oelckers
05d8856fe0 - moved file system implementation to 'common'. 2020-04-11 14:00:20 +02:00
Christoph Oelckers
80c6d5b276 - renamed more stuff and also moved the Strife teaser voice handling out of the file system. 2020-04-11 14:00:19 +02:00
Christoph Oelckers
c1bb7de23a - more file system refactoring.
* moved the sprite renaming out of the file system entirely into a caller-provided callback.
* renamed several functions to closer match the terms of a file system.
* moved the VM interface out of the implementation.
2020-04-11 14:00:19 +02:00
Christoph Oelckers
6bccde3b51 - renamed the file system related classes to actually use the term "FileSystem". 2020-04-11 14:00:18 +02:00
Christoph Oelckers
83befa7686 - moved the "??? lumps" messages out of the single resource file handlers into the calling function and did a bit of include cleanup. 2020-04-11 14:00:18 +02:00
Christoph Oelckers
7d83dfa03a - moved the file names used for deciding to remove the root directory of zips out of the resource file management.
Yet again too much dependencies on game specifics in low level code.
2020-04-11 14:00:18 +02:00
Christoph Oelckers
135f159927 - pass lump filters as parameter when initializing the file system to reduce dependencies on high level state in the low level code. 2020-04-11 14:00:17 +02:00
Christoph Oelckers
d12a9bb77a - renamed the caching functions of FResourceLump. 2020-04-11 14:00:17 +02:00
Christoph Oelckers
510fc2d549 - added handler for Witchaven's sound resource files.
Useful for loading these to play the MIDIs. Since these files have no named directory, the content just gets inserted into a subdirectory named after the file with each entry given a 4 digit hex number as a name.
2020-04-11 14:00:17 +02:00
Christoph Oelckers
1574799683 - moved most parts of the Doom specific lump setup out of the file format implementations into the main class.
This is to keep as much higher level logic out of these as possible. The presentation of the data should be a concern of the file system, not the data containers.
2020-04-11 14:00:16 +02:00
Christoph Oelckers
ef300a9ea8 - lump flags cleanup. 2020-04-11 14:00:16 +02:00
Christoph Oelckers
025e80b74a - moved NeedFileStart out of the lump flag word into an empty part of the FZipLump structure. 2020-04-11 14:00:16 +02:00
Christoph Oelckers
a38633aa22 - moved the file name management out of the single resource lumps.
This is now being managed by the main file system class. The single lumps should only concern themselves with the actual data they manage, not with how the file system presents them to the outside.
The IWAD detection code was also switched to use a file system wrapper instead of looking at the single files directly.
2020-04-11 14:00:16 +02:00
Christoph Oelckers
89fb479c19 - moved the linkedTexture pointer up one level out of the resource descriptor into the file system record. 2020-04-11 14:00:15 +02:00
Christoph Oelckers
fb1a7679ec - moved most basic utility code without any dependencies on the rest of the engine to 'common' directory.
Again the objective is easier sharing with Raze.
2020-04-11 14:00:13 +02:00
Christoph Oelckers
ace3e29473 - removed the implicit conversion operators from FName.
These were creating dangerous interdependencies. It is better to do explicit conversions when needed.
As an added plus, this means that zstring.h no longer depends on name.h which was very annoying.
2020-04-11 14:00:13 +02:00
Christoph Oelckers
6996d54a23 - moved more code to 'common'.
This is all low level utilities with no dependencies on game logic. Having this in a separate directory makes sharing with Raze a lot easier.
2020-04-11 14:00:12 +02:00
Christoph Oelckers
e230420f88 - moved all character set utilities to utf8.cpp.
- moved matrix class to 'common'.
2020-04-11 14:00:12 +02:00
Christoph Oelckers
669e8fbe48 - started some reorganization of low level utility code by moving all third party dependencies to a separate place. 2020-04-11 14:00:12 +02:00
Christoph Oelckers
820fe8b3f9 - split off the container for the translation data into its own file. 2020-04-11 14:00:11 +02:00
Christoph Oelckers
cf757ba834 - made the translation container a class.
This also splits off some Doom-specific implementation details into higher level headers.
2020-04-11 14:00:11 +02:00
Christoph Oelckers
0a7344e432 - abstract the external translation interface.
The translation table array now only gets accessed from within r_translate.cpp.
2020-04-11 14:00:10 +02:00
Christoph Oelckers
b0ecb02d6b - move SuperFastHash to its own set of files, instead of having this tied to the console.
- replace swapvalues with std::swap globally.
- added some additions to utility code from Raze, mainly to reduce file content differences.
- reduced some unused utilities
2020-04-11 14:00:10 +02:00
Christoph Oelckers
1fe667c6a0 - cleaned up the includes in m_png.h, this file had far too many and far too broad dependencies. 2020-04-11 14:00:09 +02:00
Christoph Oelckers
c623b04170 - copied some fixes for overlong config entries from Raze.
- renamed basictypes.h to basics.h to keep the file name in line with Raze and make comparisons easier.
2020-04-11 14:00:08 +02:00
Christoph Oelckers
6bfdf904b9 - removed use of copystring in Dehacked code and cleaned up the list of includes in cmdlib.cpp 2020-04-11 14:00:07 +02:00
Christoph Oelckers
5490ffcd77 - removed the obsolete Doomsday 1.8-style texture pack support.
This poorly integrated into the texture system and wasn't compatible with modern texture packs anymore so its usefulness was questionable.
2020-04-04 12:55:24 +02:00
nashmuhandes
74db8b7684 Move the opaqueBlood member definition so that object size remains unchanged 2020-03-23 12:50:17 +01:00
nashmuhandes
dd0769de80 Opaque blood decals must be defined with 'OpaqueBlood' keyword in DECALDEF 2020-03-23 12:50:17 +01:00
Christoph Oelckers
828cba13a1 - changed translation management so that the fonts also use translation IDs. 2020-03-16 17:23:30 +01:00
Christoph Oelckers
0c04cddd28 - allow specifying full palettes in translation definitions. 2020-03-15 10:22:42 +01:00
Christoph Oelckers
27b8284881 - forgot to remove the test settings for the fullscreen feature. 2020-03-15 10:02:19 +01:00
Christoph Oelckers
db5efddf12 - implemented better aspect ratio control for fullscreen images.
Due to backwards compatibility needs and for flexibility this needs to be controlled by a gameinfo setting (fullscreenautoaspect):

0: Treat all images as having an aspect ratio of 4:3, this is the default for compatibility reasons
1: Scale all images to fit the screen, i.e. either pillarbox or letterbox them.
2: Scale all images to fill the screen.
3: Scale all images so that the center 4:3 area is always fully visible. This is the recommended mode for 16:9 images designed to be shown with the sides being cropped on narrower displays.

A new DTA_ tag - DTA_FullscreenEx also exists which allows specifying the scale mode directly
2020-03-15 09:27:02 +01:00
Christoph Oelckers
8613e47899 - default terrain's DamageTimeMask to a reasonable value.
Use 31, which is the default for damaging floor specials instead of 0.
2020-03-11 00:32:11 +01:00
alexey.lysiuk
359e7927de - fixed comparison with uninitialized data in MAPINFO parser
This issue was reported by Valgrind
2020-02-23 13:43:47 +02:00
alexey.lysiuk
78bae1f166 - fixed wrong name assigned to dummy texture with zero ID
Texture created with image and name set to nullptr's is named after the very first lump, it's ALTHUDCF currenty
2020-02-17 15:37:56 +02:00
Christoph Oelckers
653336de24 - fix character substitution for mixed case fonts and text update. 2020-02-16 13:51:31 +01:00
Christoph Oelckers
7a6b133e93 - Greek letters for Strife's Big and Mini fonts. 2020-02-16 12:44:16 +01:00
Christoph Oelckers
f4edfa23dc - reformattede getAlternative for compactness. 2020-02-16 08:58:57 +01:00
Christoph Oelckers
e6aaab3c32 - remap accented Greek uppercase letters to their base variant instead of directly to the Latin/Cyrillic replacement. 2020-02-16 08:26:03 +01:00
Christoph Oelckers
9644e26ce3 - removed accented Greek characters from BigUpper font as well.
I think the same applies as for allcaps fonts, and aside from that the form of accents being used here is not correct for Greek anyway.
2020-02-16 00:04:22 +01:00
Christoph Oelckers
7a86e7f043 - fix for Greek uppercase-only fonts.
In Greek for all-caps text there *must* not be any accents. As such, all accented characters now contain a default remap to the unaccented version and the accented characters in the already converted Doom Small and BigFont have been removed as these are all-caps fonts. Doom BigUpper still requires investigation how Smallcaps fonts need to be handled.
2020-02-15 23:32:52 +01:00
alexey.lysiuk
5a19010699 - added ability to filter VM disassembly dump
Use '-dumpdisasm something' to output functions with 'something' in their printable names
Open and close output file only once when processing code generated by Dehacked, and calculate its sizes as well
2020-01-19 16:48:35 +02:00
Rachael Alexanderson
14dc46772c - add check for unity version of Nerve.wad
- infrastructure in place in case Nerve.wad changes again, this can be extended
2020-01-18 22:19:42 +01:00
alexey.lysiuk
f32aff3396 - fixed A_PlaySound() called from Dehacked
The recently added argument was missing from PlaySound code pointer handling
Verified other Dehacked functions, and changed one incorrect comment
2020-01-12 11:48:45 +02:00
Christoph Oelckers
1d0ece26b6 - missed a warning. 2020-01-12 08:26:07 +01:00
Christoph Oelckers
9e13d3c60d - fixed: The directory scanner for reading a directory into the WAD file system and ScanDirectory were not Unicode capable on Windows.
Both now use the Unicode capable I_Find* interface instead of duplicating all its functionality in multiple platform dependent incarnations.
2020-01-12 08:18:47 +01:00
Kevin Caccamo
9b598017f9 Add more ways to prevent GZDoom from drawing skybox walls
Add noskywalls flag to sectors and linedefs
2020-01-11 13:24:02 +01:00
alexey.lysiuk
83f46c4b2f - fixed erroneous override of default language strings
If the default identifier is present in LANGUAGE lump, following entries were treated as default as well

https://forum.zdoom.org/viewtopic.php?t=66873
2020-01-06 10:22:42 +02:00
Rachael Alexanderson
98ee0a7035 - move colorization parser from 'textures' to 'gldefs' 2020-01-05 16:30:01 -05:00
Christoph Oelckers
77469e0512 - fixed the colorization parser. 2019-12-29 12:11:16 +01:00
Christoph Oelckers
3530bc5945 - cleanup.
(The Raven license got removed from sc_man after checking that no Raven code is still present here, this file got a nearly complete overhaul over all those years.)
2019-12-29 11:30:37 +01:00
Christoph Oelckers
9b9fd35107 - hooked up the colorization feature.
It can now be used from UDMF and ZScript.
To avoid clutter it doesn't allow setting the values individually but requires definition of a data record in TEXTURES.

colorization
{
    DesaturationFactor <float>
    Invert
    AddColor <color>
    ModulateColor <color>
    BlendColor <color>, <mode> [, <alpha>]
}

Mode for BlendColor can be Alpha (normal translucent blending), as well as 3 special values taken from Build engine games: Screen, Overlay and HardLight.
2019-12-29 11:30:37 +01:00
Christoph Oelckers
f9d2dc51d0 - cleanup of new colorization code.
- profiling shows that running the code for applying the colorization and the gradients is extremely expensive, apparently this always causes a cache miss, so now the entire thing is enabled by a sidedef flag.
2019-12-29 11:30:36 +01:00
Christoph Oelckers
bb8db9422f - scaled down the texture colorization feature for easier usability.
It makes little sense exposing every minute detail of this through UDMF.
Setting it up that way is far too complicated. Using virtual textures that map to a real texture plus a colorization record should be far easier to use by mappers.
This also doesn't piggyback on the Doom64 color feature anymore and is completely separate, despite some redundancies.
This is still missing the texture definition part, though.
2019-12-20 22:25:10 +01:00
Christoph Oelckers
fd15af0b50 Merge branch 'master' of https://github.com/coelckers/gzdoom 2019-12-20 18:56:38 +01:00
Christoph Oelckers
3a249cb06f - added high level interface to the new properties, i.e. UDMF and ZScript. 2019-12-20 18:02:42 +01:00
alexey.lysiuk
ffe1a651a9 - upsample texture if width * height is less or equal to gl_texture_hqresize_maxinputsize squared
https://forum.zdoom.org/viewtopic.php?t=66652
2019-12-20 18:11:22 +02:00
alexey.lysiuk
daedf9d158 - improved normalNx scaling performance by ~10%
Actual boost heavily depends on platform's memory architecture, made it a bit more cache friendly in general
2019-12-20 11:04:50 +02:00
Christoph Oelckers
e82565373f - separated the channel number from the flags in the sound interface so that the 8 channel limit can be eliminated.
- added Marisa Kirisame's CHAN_OVERLAP flag.
- exported S_IsActorPlayingSomething to ZScript.

The sound API change required deprecating A_PlaySound and S_Sound. There are now new variants S_StartSound and A_StartSound which have two distinct parameters for channel and flags.
2019-12-16 23:52:39 +01:00
Magnus Norddahl
0fd964ec4f Fix compile error 2019-12-15 17:32:12 +01:00
Christoph Oelckers
71d7013255 - better validation checks for CSV-based string files. 2019-12-15 16:42:24 +01:00
alexey.lysiuk
1a19dbb52f - added 'damageonland' property to terrain definition
This property helps to replicate vanilla Hexen behavior of damaging player right after touching lava floor

https://forum.zdoom.org/viewtopic.php?t=66512
2019-12-12 15:14:30 +01:00
Christoph Oelckers
bf8305062a - do not allow summon CCMD to spawn abstract classes 2019-12-12 02:13:19 +01:00
Christoph Oelckers
6725cfcca5 - cleaned the includes of the sound backend code of unwanted content.
Also simplified the sound init decision making. With FMod gone there is no reason to be pedantic here. Even the check of snd_backend for the Null device could be omitted here, its only realistic use is '-nosound'.
2019-12-08 22:17:19 +01:00
alexey.lysiuk
372733da8c - handle mirroring in MNTR sprite renaming
https://forum.zdoom.org/viewtopic.php?t=66583
2019-12-07 14:58:23 +02:00
Rachael Alexanderson
eaab122076 Merge remote-tracking branch 'origin/polybackend' 2019-12-06 09:30:55 -05:00
alexey.lysiuk
ffe8aaa091 - updated xBRZ scaler to 1.8
Removed all C++17 features: std::clamp(), attribute [[likely]], terse static asserts, ...

https://sourceforge.net/projects/xbrz/files/xBRZ/xBRZ_1.8.zip/download
2019-12-06 13:18:43 +02:00
Magnus Norddahl
4a25c9f69b Merge remote-tracking branch 'origin/master' into polybackend 2019-12-01 20:09:19 +01:00
Ed the Bat
001df17daa Optional override for SetSlot and ClearPlayerClasses
With this, a decade-long struggle can now be ended.

# Conflicts:
#	wadsrc/static/language.csv
2019-11-26 09:58:53 -05:00
alexey.lysiuk
a7f2df4fef - added ability to set custom alternative HUD
Use GAMEINFO key 'althudclass' to specify own class derived from AltHud

https://forum.zdoom.org/viewtopic.php?t=66422
2019-11-26 15:45:18 +02:00
alexey.lysiuk
20d3752fdd - exported several Wads.GetLump...() methods to ZScript
* GetLumpName() returns 8-characters lump name
* GetLumpFullName() returns full name with path and extension
* GetLumpNamespace() returns lump's namespace
* GetNumLumps() returns total number of lumps

https://forum.zdoom.org/viewtopic.php?t=66285
2019-11-25 17:37:56 +02:00
PaulyB
a74be69371 Added 'NoKeyboardCheats' option to IWADINFO
This is useful for IWADs that do not want to use the hardcoded engine cheats. This can still be overriden with the 'allcheats' CVAR
2019-11-13 17:34:42 +01:00
alexey.lysiuk
fd5e8d6e7b - fixed source lump assignment for multipatch textures
It was impossible to detect a WAD that contains a multipatch texture

https://forum.zdoom.org/viewtopic.php?t=66299
2019-11-05 14:47:13 +02:00
Christoph Oelckers
2ae3f6d326 - fixed bad variable name for lump filter 2019-11-04 00:08:06 +01:00
Christoph Oelckers
077d4e08bb - fixed: lump filters without any dot in the name did not work. 2019-11-03 15:53:41 +01:00
alexey.lysiuk
c45e8b32d0 - fallback to console font in case of missing small font
https://forum.zdoom.org/viewtopic.php?t=66102
2019-10-16 09:46:23 +02:00
Christoph Oelckers
e166563ac9 - removed redundant resource reading. 2019-10-15 18:46:53 +02:00
Christoph Oelckers
2e7af1338c - the big cleanup of the exit cleanup is done!
atterm is gone and only a few system-side functions use atexit.
All game side cleanup is performed in D_DoomMain now.
2019-10-07 20:28:55 +02:00
Christoph Oelckers
5a72e0bfb7 - added a new texture class using stb_image to read a more formats.
This implementation only reads GIF, BMP and PIC formats. No animated GIF support because stb_image does not handle that.
PNG, JPG and TGA are still being handled by the existing dedicated implementations.
PSD and HDR are impractical for reading texture data and thus are disabled.
PnM could be enabled, if its identification semantics were stronger. stb_image only checks the first two characters which simply would falsely identify several flats with the right colors in the first two bytes.

This is more or less a waste product of getting stb_image to work with something actually testable, so it is just provided as-is.
2019-10-06 08:37:23 +02:00
Christoph Oelckers
241a47602b - small fix 2019-10-01 15:24:17 +02:00
Christoph Oelckers
c8c8fecad3 - fixed a few warnings. 2019-09-16 17:30:39 +02:00
alexey.lysiuk
e48edf6199 - fixed compilation with MSVC
src\gamedata\resourcefiles\resourcefile.h(77): error C4716:  'FResourceLump::FillCache': must return a value
2019-09-13 17:35:31 +03:00
Christoph Oelckers
587fd75190 - extended lump injection to allow injecting data into a PWAD's directory, not just the IWAD. 2019-09-13 13:55:53 +02:00