Commit graph

15044 commits

Author SHA1 Message Date
Magnus Norddahl
718f9e36fa Merge branch 'vulkan2' of https://github.com/coelckers/gzdoom into vulkan2 2019-03-02 16:02:43 +01:00
Magnus Norddahl
b1f161040d - transition image layouts and setup pipeline barriers (fixes some errors reported by RenderDoc) 2019-03-02 16:02:27 +01:00
Christoph Oelckers
dc9a995695 - output the error code when submitting a command buffer fails. 2019-03-02 15:57:43 +01:00
Christoph Oelckers
d893299185 - fixed: static event handlers must also receive WorldLoaded events on loading a savegame. 2019-03-02 13:50:58 +01:00
Christoph Oelckers
9ab57e242b - fixed: PlayerStartStomp must check for NOTELEFRAG. 2019-03-02 13:35:35 +01:00
Christoph Oelckers
00febf0498 - fixed: FLevelLocals did not set the owner for its event manager. 2019-03-02 13:24:52 +01:00
Christoph Oelckers
0febe20a08 - fixed: Unmorphing a monster did not clear its UNMORPHED flag. 2019-03-02 13:15:38 +01:00
Christoph Oelckers
4cf90d70ae - fixed: cl_maxdecals did not reset the decal counter when deleting decals. 2019-03-02 12:58:28 +01:00
Christoph Oelckers
5f6198f4e4 - let IWAD and PWAD BigFonts override BigUpper for consistency. 2019-03-02 12:54:46 +01:00
Christoph Oelckers
ce1ecd0d4b - implemented string table macros. 2019-03-02 12:06:24 +01:00
Magnus Norddahl
05a6896d4f - Pass vertex color and normal via uniform buffer when the attribute isn't available 2019-03-02 01:56:08 +01:00
Magnus Norddahl
1430d9012e - fix shutdown crash and some minor adjustments 2019-03-02 00:46:25 +01:00
Christoph Oelckers
fa123f37c7 - adjustment for renamed spreadsheet. 2019-03-01 22:04:39 +01:00
Magnus Norddahl
d86a56086c Merge remote-tracking branch 'origin/master' into vulkan2 2019-03-01 21:50:06 +01:00
Magnus Norddahl
7871ec06ae - add depth/stencil attachment to the render pass 2019-03-01 21:34:08 +01:00
Christoph Oelckers
a5d9d334d2 - fixed: The lump renaming was not performed for Doom, even for those pieces where needed. 2019-03-01 20:21:15 +01:00
Magnus Norddahl
d73b0b3146 - create helper function for copying 2019-03-01 20:15:56 +01:00
Magnus Norddahl
ee8349d168 - add support for specifying the topology 2019-03-01 20:06:20 +01:00
Magnus Norddahl
01c78d7238 - add a bit of bounds checking just to be safe 2019-03-01 19:15:52 +01:00
Magnus Norddahl
195e91adc9 - hook up the hardware renderer 2019-03-01 19:01:06 +01:00
Magnus Norddahl
308c884d02 - use a linked list to keep track of all allocated VkHardwareTexture objects 2019-03-01 18:31:33 +01:00
Magnus Norddahl
c691a8fe64 - bind the vertex inputs as specified by its vertex buffer format 2019-03-01 15:37:13 +01:00
alexey.lysiuk
2939bc701e - fixed compilation error with GCC and Clang
src/intermission/intermission_parse.cpp:941:2: error: no matching function for call to 'F_StartFinale'
2019-03-01 10:06:34 +02:00
Magnus Norddahl
b0fd5db616 - remove misplaced todo 2019-03-01 02:42:24 +01:00
Magnus Norddahl
d4118a755c - load all the shaders and use the right one for each renderpass 2019-03-01 02:40:02 +01:00
Magnus Norddahl
f1f8797d3c - bind the layer textures 2019-03-01 01:30:10 +01:00
Magnus Norddahl
7f3e473f56 - create a render pass for each blend setup 2019-03-01 00:42:51 +01:00
Marisa Kirisame
bc5baae827 Folder casing changes for Linux compatibility. 2019-02-28 23:56:29 +01:00
Christoph Oelckers
23a62cbe12 - added a 'testfinale' CCMD, so that the layout of finale texts can be tested more easily 2019-02-28 23:52:47 +01:00
Christoph Oelckers
86620aaba5 - allow reading xlsx spreadsheets directly for language definitions. 2019-02-28 22:21:55 +01:00
Christoph Oelckers
cad2f49ceb - use BigUpper font for option menu captions. 2019-02-28 22:19:53 +01:00
Major Cooke
b48f7da43e Renamed to musplaying. 2019-02-28 18:47:28 +01:00
Major Cooke
210af0d414 Exported MusPlayingInfo to ZScript.
- Allows grabbing the currently playing song, base order, and loop properties.
2019-02-28 18:47:28 +01:00
Magnus Norddahl
e472050f36 - use dynamic state for viewport and scissor 2019-02-28 15:45:59 +01:00
Magnus Norddahl
45061e8b44 - no need to debug with a red clear anymore 2019-02-28 01:22:38 +01:00
Magnus Norddahl
9a5112c1c9 - tell the memory allocator when we are going to persistently map something 2019-02-28 01:18:29 +01:00
Magnus Norddahl
2e0b34ca72 - hook up enough of renderstate to enable all of main.vp and main.fp 2019-02-28 00:26:49 +01:00
Christoph Oelckers
fab8fed8df - reformat the intermission screen if the text is very long.
This will ensure better visibility on widescreen displays, at least.
2019-02-27 22:52:08 +01:00
Magnus Norddahl
c2e0eba270 - hook up vid_vsync and vk_debug 2019-02-27 22:20:18 +01:00
nashmuhandes
407983749a Added a master volume setting. 2019-02-27 14:17:45 -05:00
Magnus Norddahl
b4154f1772 - fix palette color problem 2019-02-27 16:28:29 +01:00
Magnus Norddahl
96547713d9 - hook up the software renderer 2019-02-27 15:37:37 +01:00
Christopher Bruns
8becc0e78d Enable menu blur in stereo 3d.
Use more blitting to avoid confusing framebuffer state management in stereo 3D.
2019-02-27 09:51:02 +01:00
Magnus Norddahl
a3c21e0b01 - upload some real texture contents 2019-02-26 22:45:18 +01:00
Magnus Norddahl
fe67a2c24f - fix enough bugs to finally get some visuals 2019-02-26 20:19:54 +01:00
Magnus Norddahl
e1d1358249 - add missing field 2019-02-26 20:18:30 +01:00
Christoph Oelckers
90ab830ff9 - added a workaround for mods using the name CONFONT directly.
In the old system it just loaded the font a second time, but with the folder based setup there is no file named CONFONT anymore so it needs to be dealt with explicitly.
2019-02-26 19:19:03 +01:00
Magnus Norddahl
19f4133768 - move most push constants to dynamic uniform buffers 2019-02-26 16:50:54 +01:00
Magnus Norddahl
d958c4fec5 - upload and bind some textures 2019-02-26 15:29:08 +01:00
Magnus Norddahl
347339b254 - add a very basic present shader using a blit
- avoid dealing with image layout transitions for the blit by using VK_IMAGE_LAYOUT_GENERAL for now
2019-02-26 12:25:17 +01:00
Magnus Norddahl
854526dee4 - submit the upload commands 2019-02-26 11:58:03 +01:00
Magnus Norddahl
e875198b37 - create raii objects for semaphore and fence 2019-02-26 11:44:29 +01:00
Magnus Norddahl
27e78e7d8d - remove unused code 2019-02-26 11:31:09 +01:00
Magnus Norddahl
9ed1c7f40b - add render pass manager and setup a pipeline for VkRenderState 2019-02-26 11:27:29 +01:00
Magnus Norddahl
fbfcc30d00 Merge branch 'vulkan2' of https://github.com/coelckers/gzdoom into vulkan2 2019-02-26 11:21:42 +01:00
Magnus Norddahl
69229d7719 - add missing forward declarations 2019-02-26 11:20:24 +01:00
Christoph Oelckers
e8f690116b - removed unused gl_spritebrightfog CVAR. 2019-02-26 00:07:30 +01:00
Christoph Oelckers
4a427694ac - changed calculation of the scaling value for the option menu.
This was already far too generous and caused space problems, but with localization these became a lot worse, so now it will try to allocate at least 640 virtual pixels for the menu width and only go below that for small resolution ranges where the smaller value would result in too small text.
2019-02-26 00:07:09 +01:00
Christopher Bruns
051145b2c8 Use flag to avoid second eye stereo color problem 2019-02-25 00:14:41 +01:00
Christopher Bruns
e83092a7eb Fix stereo-3D 2D quad color problem. 2019-02-25 00:14:41 +01:00
Christoph Oelckers
b670d5f372 - fixed utf8_decode.
This function was written for already validated UTF-8 but not for text that can be mixed with ISO-8859-1.
To handle that properly it needs to do a bit more validation to avoid mangling its output and instead reject invalid input.
2019-02-24 13:55:08 +01:00
Christoph Oelckers
0676a98efc - fixed: ACS must use COPY_AAPTREX for all pointer transfers.
It was already correct for most, but two cases have slipped through.
2019-02-24 12:10:56 +01:00
Christoph Oelckers
6129f9a9cc - fixed a warning and set NOINITCALL for a few CVARs accessing the current level.
These inits are done at a time when the data isn't even initialized so they will get overwritten anyway.
2019-02-24 10:05:01 +01:00
Christoph Oelckers
d5f138f14d - made the text comparison for Dehacked case insensitive so that the contents of the string table can be properly capitalized without breaking old-style string replacements. 2019-02-23 20:23:04 +01:00
Christoph Oelckers
413412f603 Merge branch 'master' into vulkan2 2019-02-23 19:53:38 +01:00
Rachael Alexanderson
7098748e9e - fix building on case sensitive systems 2019-02-23 13:51:24 -05:00
Christoph Oelckers
bae0094039 - fixed the status bar string drawers which weren't UTF-8 capable yet. 2019-02-23 19:44:00 +01:00
Christoph Oelckers
c5156d4598 - moved around a few more files. 2019-02-23 18:57:49 +01:00
Christoph Oelckers
c3890342e6 - moved the 2D drawing code to its own directory under 'rendering'. 2019-02-23 18:08:57 +01:00
Christoph Oelckers
ef3e5ef01e - moved a few parts from g_level.cpp to better fitting places. 2019-02-23 15:21:54 +01:00
Christoph Oelckers
2874a36fbe - added the final missing piece of localization support, i.e. forcing text based menus.
Now a localization mod can disable the graphics patches containing text entirely so that it can properly localize the text based menu variant.
If this flag gets set in MAPINFO, it will override all user settings.
2019-02-23 10:40:07 +01:00
Christoph Oelckers
add10029b9 - fixed chat input. 2019-02-23 09:54:18 +01:00
Christoph Oelckers
a50a0c5b0d - fixed: empty strings cannot be substituted. 2019-02-23 09:20:30 +01:00
Christoph Oelckers
e091369a38 - removed FCriticalSection and replaced all of its uses with std::mutex.
There's really no need for a non-standard solution here anymore with C++11.
This also fixes an unreleased lock in the WildMidi code.
2019-02-22 20:24:24 +01:00
Christoph Oelckers
3d9dce0156 - fixed DHUDMessageTypeOnFadeOut with empty messages. 2019-02-22 19:58:52 +01:00
Christoph Oelckers
f907bb0484 - moved a few more things and deleted the unused v_pfx implementation.
These were pixel format conversion routines used in the D3D backend. Nothing in here is needed anymore - the FBitmap class offers much of the functionality covered here in a far more concise and approachable manner.
2019-02-22 19:48:18 +01:00
Christoph Oelckers
b386603044 - deleted the unused lumpconfigfile.
The chance that this will ever see some use is precisely zero so there's no need keeping this code around.
2019-02-22 19:13:40 +01:00
Christoph Oelckers
8c06a00ee6 - moved all dialogue loading code into the map loader. 2019-02-22 19:07:58 +01:00
Christoph Oelckers
e06aa28620 - fixed the usedcolor array's base type.
The usedcolors array which counts the number of pixels in a given color in a font used bytes as storage, so any color that just happened to have a count that is a multiple of 256 the color was considered not present.
2019-02-22 18:19:26 +01:00
Magnus Norddahl
52460d53d9 - compile main.vp and main.fp for vulkan 2019-02-22 11:30:48 +01:00
Magnus Norddahl
a97d736bd9 - add vulkan renderstate and shadermanager classes 2019-02-21 22:49:00 +01:00
Magnus Norddahl
c606346ae3 - remove dead code 2019-02-21 21:23:44 +01:00
Magnus Norddahl
478ef05a0a - create vulkan buffer objects implementation 2019-02-21 12:31:14 +01:00
Magnus Norddahl
fc79cd1280 - present an empty back buffer while keeping vsync 2019-02-21 10:19:59 +01:00
Christoph Oelckers
2eb312e041 - added a kerning option to FONTDEFS 2019-02-21 01:02:42 +01:00
Christoph Oelckers
2907ba69a0 - implemented OkForLocalization 2019-02-21 00:56:03 +01:00
Christoph Oelckers
48fcdacf06 - more work on graphics substitutiion
* added a CVAR that sets how localizable graphics need to be dealt with.
* pass the substitution string to OkForLocalization so that proper checks can be performed.
* increased item spacing on Doom's list menus to 18 from 16 pixels, because otherwise the diacritic letters would not fit. 20 would have been more ideal but 18 was the limit without compromising its visual style
* added a second text-only main menu because here the spacing cannot be changed. Doing so would render any single-patch main menu non-functional. So here the rules are that if substitution takes place, it will swap out the entire menu class.
* fixed some issues with the summary screen's "entering" and "finished" graphics.
2019-02-21 00:35:27 +01:00
Magnus Norddahl
75403ec744 - hook up the glsl compiler 2019-02-21 00:25:51 +01:00
Christoph Oelckers
8bdbd2e915 - fixed layout of summary screen. 2019-02-21 00:16:48 +01:00
Magnus Norddahl
c6b29846d0 - add 3rd party vulkan dependencies
- add stubs for a vulkan hw renderer backend
- add RAII wrappers for vulkan object types
- add builder classes to isolate vulkan boilerplate code
- add a swap chain class
2019-02-20 21:21:57 +01:00
Christoph Oelckers
6a742f8d34 - changed all places which used a localized string as a format template for printf, String.Format et.al.
Passing something non-constant at compile time here is extremely dangerous, especially when users can replace those strings if they like.
It now uses FString::Substitute in all cases where something needs to be inserted into a template string.
2019-02-20 20:20:06 +01:00
Christoph Oelckers
15eb57e00d - finalized graphics substitution feature. 2019-02-20 19:40:17 +01:00
Christoph Oelckers
ecb1c2ee4a - initialize the language right after reading the strings. 2019-02-20 19:30:39 +01:00
Christoph Oelckers
0e449405a4 - fixed string checks in dialogue loader. 2019-02-20 19:12:32 +01:00
Christoph Oelckers
d2ac77e721 - fixed reading of exit text replacements and display of intermission text screens for Unicode. 2019-02-20 19:04:34 +01:00
Christoph Oelckers
64dc582fbe - reworked texture lookup for localized textures 2019-02-20 00:52:31 +01:00
Christoph Oelckers
8587f253a8 - fixed a typo 2019-02-20 00:43:06 +01:00
Christoph Oelckers
4eb8b53d95 - enforce that localized graphics need to be the same size as the one they replace.
This is one of those things where the work needed to make it robust stands in no relation to the gain.
This simply isn't worth the hassle of going through the entire code and fixing every single use of the 2D texture drawing functions.

Unfortunately this means that the graphics items for the menu cannot be replaced this way because their size will most likely differ, but considering that the only candidates for this are the contents of Doom's main menu, the episode menu, the skill menu and the single player summary screen, it's simply not worth it.

In all these cases the IWAD contents can just as easily be replaced with text and user mods which want to offer localized menus will have to work within the confines of the system, e.g. making sure that all menu items are designed to have proper size for substitution to work or by requesting text based menus, which will be added as a modding feature later.
2019-02-20 00:42:02 +01:00
Christoph Oelckers
5f25fbb2e3 - added support for localized texture replacements
This reads the textures and builds the data tables, but doesn´t use the textures yet.
A bit more work is needed first.
2019-02-20 00:22:00 +01:00
Christoph Oelckers
5e7fb16d05 - preparation work for substituting the menu and intermission screen text graphics for localization 2019-02-19 01:22:12 +01:00