Commit graph

8892 commits

Author SHA1 Message Date
Rachael Alexanderson
4ed548a189 - Implemented some sprite blend modes. 2016-11-20 17:07:58 -05:00
Magnus Norddahl
ebd810d843 Fix decal vertical position being wrong 2016-11-20 16:43:13 +01:00
Magnus Norddahl
bd9ec843dd Add palette version of the blend modes 2016-11-20 16:42:53 +01:00
Magnus Norddahl
6761e8639a Add palette support 2016-11-20 04:06:21 +01:00
Magnus Norddahl
7ac0cace7d Stop copying the matrix and remove r_triangle 2016-11-20 02:07:55 +01:00
Magnus Norddahl
f8efe394cc Remove unused code 2016-11-20 01:51:08 +01:00
Magnus Norddahl
845bf93c95 Change triangle full block to use vectored load and store 2016-11-20 01:29:19 +01:00
Rachael Alexanderson
fc011e42dd Merge branch 'master' of https://github.com/rheit/zdoom 2016-11-19 12:46:01 -05:00
Magnus Norddahl
b4eb49678a Cache the optimized bitcode (note: this adds LLVMBitWriter as a dependency) 2016-11-19 17:14:37 +01:00
alexey.lysiuk
c28bcca3f3 Print unknown if release information is unavailable on macOS
At least 10.4 Tiger doesn't support required sysctl name
2016-11-19 16:42:16 +01:00
alexey.lysiuk
60ac12be0a Fixed compilation warnings in Cocoa backend 2016-11-19 16:42:16 +01:00
alexey.lysiuk
3b240b73e9 Fixed endianness issue with saved games
See http://forum.zdoom.org/viewtopic.php?t=54272
2016-11-19 16:42:16 +01:00
Magnus Norddahl
d197ebca78 Remove redundant line 2016-11-19 14:07:39 +01:00
Magnus Norddahl
114fda1ed5 Added missing TranslateAlphaBlend and created a helper function for specifying the translation 2016-11-19 13:32:57 +01:00
Magnus Norddahl
17ed585c1f Fix vsync not working 2016-11-19 12:30:58 +01:00
Magnus Norddahl
272fe7f754 Added blending modes to triangle codegen 2016-11-19 02:53:32 +01:00
Magnus Norddahl
5d6ceb868e Move viewport stuff to its own function 2016-11-18 14:40:53 +01:00
Magnus Norddahl
dbb6c7ca27 Add support for specifying a viewport out of screen bounds and fixed statusbar by doing just that! 2016-11-18 01:58:39 +01:00
Rachael Alexanderson
bac3ae3bf8 Merge branch 'master' of https://github.com/coelckers/gzdoom 2016-11-17 17:37:11 -05:00
Christoph Oelckers
b3b5cb2fa4 - fixed: Lines with both sides in the same sector but an active portal may not be discarded early. 2016-11-17 23:13:17 +01:00
Rachael Alexanderson
aa08285676 - Moved scaling before rotation again - this time, using a formula provided by Graf, the rendering pitch is now dynamically scaled based on the aspect ratio, causing pitch aiming to once again be correct. 2016-11-17 16:44:55 -05:00
Magnus Norddahl
6be80efa51 Moved scale back to be after pitch - otherwise the the bullets don't end up where you point 2016-11-17 21:19:50 +01:00
Magnus Norddahl
eac9367ace Fix perspective when status bar is visible 2016-11-17 21:07:00 +01:00
Rachael Alexanderson
7447c49dc5 - Added pixelratio support for the softpoly renderer. 2016-11-17 13:50:35 -05:00
Magnus Norddahl
b02e3d9514 Add shaded blend mode for the decals 2016-11-17 14:28:14 +01:00
Magnus Norddahl
511eb59479 Add particle drawing 2016-11-17 01:29:08 +01:00
Magnus Norddahl
266924600a Missing include guard 2016-11-17 01:28:51 +01:00
Magnus Norddahl
ff2ab61abc Added decals 2016-11-16 23:34:05 +01:00
Magnus Norddahl
59f7dedfb4 Added wall sprite support. Unfortunately it would seem that a bullet hole is not a wall sprite.. 2016-11-16 22:31:49 +01:00
Magnus Norddahl
ae889acaea active_con_scale should respect uiscale 2016-11-16 19:49:46 +01:00
Magnus Norddahl
712e032573 Remove swrenderer2 2016-11-16 19:44:11 +01:00
Magnus Norddahl
f457f0340c Add 3D floor planes 2016-11-16 11:18:40 +01:00
Rachael Alexanderson
71b4f57058 Merge commit 'refs/pull/122/head' of https://github.com/coelckers/gzdoom
# Conflicts:
#	src/posix/cocoa/i_video.mm
#	src/posix/sdl/hardware.cpp
#	src/win32/hardware.cpp
2016-11-16 01:03:32 -05:00
Rachael Alexanderson
813030efef - Fully implemented CVAR_OVERRIDEGET for vid_renderer from the ZDoom code submission. 2016-11-15 20:03:50 -05:00
Rachael Alexanderson
9b9ed64360 - Implemented sv_overridegetcvar: This will override the return value for GetCVar checks for certain CVars marked with the CVAR_OVERRIDEGET flag. Instead of returning their true value, they only return defaults instead.
- Implemented dummy CVar vid_renderer with a default value of 1. This allows mods not designed for the software renderer to run if sv_overridegetcvar is turned on.
2016-11-15 20:01:36 -05:00
Magnus Norddahl
449d4963ae Mapping error workaround 2016-11-16 01:13:29 +01:00
Magnus Norddahl
a092a03c6d Some basic fixed light support 2016-11-15 23:30:42 +01:00
Magnus Norddahl
1b3d50951a Fix sky floodfill bug 2016-11-15 22:48:44 +01:00
Magnus Norddahl
a90a22e056 Fix segment culling bug 2016-11-15 19:27:21 +01:00
Major Cooke
f2ec266eec Fixed: Actors with NOINTERACTION shouldn't waste time continuously applying NOBLOCKMAP if it has it already and not moving. 2016-11-15 11:38:03 -06:00
Magnus Norddahl
cfc977f9e6 Fix texture coordinate 2016-11-15 18:14:18 +01:00
Magnus Norddahl
ee15856786 Deep water support 2016-11-15 15:15:26 +01:00
Magnus Norddahl
3b397183ac Clamp segment range 2016-11-15 15:15:01 +01:00
Magnus Norddahl
5f1b822523 Mark rendered lines in the automap 2016-11-15 13:30:30 +01:00
Magnus Norddahl
f143b9b7b0 Fix midtexture repeat and yoffset bug 2016-11-15 12:31:57 +01:00
Christoph Oelckers
196986ae6b Merge branch 'master' of https://github.com/rheit/zdoom 2016-11-15 11:25:42 +01:00
Magnus Norddahl
e5f8af2216 Fix sky flood fill for E1M8 and Map11 2016-11-14 23:22:38 +01:00
Rachael Alexanderson
62adb64a95 Merge branch 'master' of https://github.com/rheit/zdoom 2016-11-14 10:28:52 -05:00
Christoph Oelckers
0111ec451a Revert "Fixed: A_SetInventory with an amount of 0 was not truly eliminating the actor."
This reverts commit 02435b46a0.
2016-11-14 15:52:49 +01:00
Magnus Norddahl
3673338644 Split r_poly into multiple files handling each aspect of rendering a scene 2016-11-14 14:19:48 +01:00
Christoph Oelckers
109558d74d - added unsigned char casts to all isspace calls in zstring.cpp
isspace takes a signed integer as parameter which triggers an assert on any non-ASCII character taken from a signed char array.
2016-11-14 13:14:07 +01:00
Major Cooke
02435b46a0 Fixed: A_SetInventory with an amount of 0 was not truly eliminating the actor. 2016-11-13 19:27:59 -06:00
Rachael Alexanderson
23384a913c Merge pull request #2 from edward-san/qz_clang_fix
- Fixed Clang on Linux compilation.
2016-11-13 12:49:14 -05:00
Magnus Norddahl
c06798bca1 Adjust texture coordinates 2016-11-13 17:58:03 +01:00
Edoardo Prezioso
1442f7fb7b - Fixed Clang on Linux compilation. 2016-11-13 16:53:18 +01:00
Magnus Norddahl
acb2e821f0 Evict floats from the block code (too bad it didn't make any difference to the speed) 2016-11-13 16:36:47 +01:00
Magnus Norddahl
f25579849a Minor variable optimization 2016-11-13 15:43:54 +01:00
Magnus Norddahl
411eb57952 Fix rendering of masked walls 2016-11-13 15:16:55 +01:00
Rachael Alexanderson
470046ec5a Merge branch 'master' of https://github.com/rheit/zdoom 2016-11-13 07:30:34 -05:00
Magnus Norddahl
c914a7a7fe Cull walls 2016-11-13 13:24:36 +01:00
Magnus Norddahl
27eb8e36ae Fix solid segment culling 2016-11-13 11:44:07 +01:00
Magnus Norddahl
af7a7ab7d7 Remove use of the llvm.round intrinsic as it apparently doesn't work in some environments 2016-11-13 08:57:29 +01:00
Braden Obrzut
472f35d2ce - Fixed building with gtk2 headers. 2016-11-13 00:17:09 -05:00
Rachael Alexanderson
87e9ba0f05 Merge branch 'master' of https://github.com/rheit/zdoom 2016-11-12 22:31:05 -05:00
Braden Obrzut
9342898361 - Added support for GTK3 (thanks to "MineyMe" and edward-san)
- Replaced GTK/OS X (note different from Cocoa) clipboard code with SDL clipboard API.
- Removed requirement to link to GTK in order to compile with GTK support.
	- GTK is no longer init'd if the GTK IWAD picker is not used.
	- Our usage of GTK is such that the dynamic loader can work with both GTK2 and GTK3 depending on what's installed.
	- Since we're accumulating a lot of library loaders I've built a generic interface as FModule which replaces TOptWin32Proc and the loaders in the OpenAL and Fluidsynth code.
2016-11-12 18:32:09 -05:00
alexey.lysiuk
b16e6725d7 Added missing #include to fix build with GCC/Clang 2016-11-12 18:09:05 +02:00
Rachael Alexanderson
f284a24ed9 Merge branch 'master' of https://github.com/rheit/zdoom 2016-11-12 10:17:56 -05:00
Christoph Oelckers
0c0cb6d69c - fixed warnings. 2016-11-12 15:36:36 +01:00
Magnus Norddahl
402227d6b6 Add some intersection tests useful for culling 2016-11-12 14:55:14 +01:00
Christoph Oelckers
32e0123e1b - fixed: FResourceLump::LumpNameSetup passed negative numbers to FString::Truncate for extension-less lump names. 2016-11-12 14:01:34 +01:00
Magnus Norddahl
e3dc9c93b9 Use a simpler algorithm for the stencil buffer as the old one was too slow 2016-11-12 13:50:28 +01:00
Edoardo Prezioso
ffea457d81 - Fixed GCC/Clang warnings with serializer Unicode parser. 2016-11-12 13:35:10 +01:00
Edoardo Prezioso
104030697f - Rename con_numnotify to con_notifylines.
Zandronum 1.1 added an option with the same purpose. Use it to avoid duplicates.
2016-11-12 11:08:33 +01:00
Edoardo Prezioso
f123da9385 - Fixed GCC warnings with new history code. 2016-11-12 11:07:39 +01:00
Magnus Norddahl
eb4021b997 Codegen for all triangle variants 2016-11-12 10:21:02 +01:00
Marisa Heit
c69394fa40 Add con_numnotify cvar to control number of lines of notification text
- If con_numnotify < 0, then there is no limit on the number of lines of
  text.
- If con_numnotify == 0, then any text that would normally be shown in the
  notification area is discarded.
- If con_numnotify > 0, then that is the maximum number of lines of
  notification text to display.
2016-11-12 00:34:07 -06:00
Marisa Heit
1e497e0b3e Fixed: FString::StripLeftRight() lost the right character when copying to a new buffer
- Also, some minor improvements to the strip functions to avoid doing
  extra work.
2016-11-12 00:34:07 -06:00
Marisa Heit
513ad7f75f Use FString to store console atexit commands 2016-11-12 00:34:07 -06:00
Marisa Heit
c5eb28d360 Fix console scrolling too far when page scrolling with scaled text 2016-11-12 00:34:07 -06:00
Marisa Heit
4dce07762b Change con_scale behavior for value 0
- Do not use uiscale for con_scale default. A 40 column console when
  everything is defaults is maddening. The default is now CleanXfac minus 1.
2016-11-12 00:34:07 -06:00
Marisa Heit
3926ca13b0 Fix console input not scrolling when you hit the side of the screen
- Also changed the console input buffer into a struct instead of a
  frankenstein buffer.
2016-11-12 00:34:07 -06:00
Magnus Norddahl
c852b6c5e9 Add codegen for one of the triangle variants 2016-11-12 00:50:21 +01:00
Magnus Norddahl
667f35bfce Declare structs to LLVM 2016-11-11 20:12:09 +01:00
Magnus Norddahl
0938420871 Make triangle drawers compatible with LLVMDrawers 2016-11-11 19:54:27 +01:00
Magnus Norddahl
3cc5cec5a0 Hook up subsector gbuffer 2016-11-11 19:26:28 +01:00
Magnus Norddahl
5a9d4ee9d9 Simplify argument passing 2016-11-11 18:24:59 +01:00
Rachael Alexanderson
c6f7848a09 Merge branch 'master' of https://github.com/rheit/zdoom 2016-11-11 11:39:53 -05:00
nashmuhandes
970c750daa Added OpenGL support to the underwater view blend scalar option. 2016-11-11 18:08:47 +08:00
Magnus Norddahl
6989b7037e Fix stencil write bug 2016-11-11 10:25:40 +01:00
nashmuhandes
fd31c84745 Added a slider to control the intensity of underwater screen blending. 2016-11-11 17:18:39 +08:00
Magnus Norddahl
529a93b680 Sky rendering fixes 2016-11-11 10:15:27 +01:00
Magnus Norddahl
373038231c More stencil sky stuff 2016-11-10 13:58:03 +01:00
Magnus Norddahl
049ceecca5 Toying with stencils 2016-11-10 10:44:35 +01:00
Magnus Norddahl
204d09efde Add a stencil buffer 2016-11-10 08:08:37 +01:00
Magnus Norddahl
b94096ffe1 Crash fixes 2016-11-10 05:30:33 +01:00
Magnus Norddahl
6c52e1e52b Draw sky in a very expensive way 2016-11-10 05:01:33 +01:00
Magnus Norddahl
9820a6cb88 Request GL BSP instead of requiring automap texturing to be on 2016-11-09 12:07:07 +01:00
Magnus Norddahl
dc0e6d40a4 Distance sort sprites 2016-11-09 11:38:07 +01:00
Magnus Norddahl
cffdfdf7fd Cull bsp using solid segments 2016-11-09 01:33:40 +01:00
Magnus Norddahl
95df9bf48e Fix crash bug in 8 bit drawer 2016-11-09 00:35:41 +01:00
Magnus Norddahl
968150ceff Seems there could be more than 6 vertices 2016-11-09 00:22:05 +01:00
Magnus Norddahl
7d3e8d1414 Fix triangle drawer clipping bug 2016-11-08 23:08:25 +01:00
Rachael Alexanderson
9413ea6edf - Textured automap would crash due to an additional parameter in the software renderer to the FillSimplePoly function call, causing stack issues. 2016-11-08 15:35:51 -05:00
Rachael Alexanderson
d36993a03b - Textured automap would crash due to an additional parameter in the software renderer to the FillSimplePoly function call, causing stack issues. 2016-11-08 15:05:23 -05:00
Magnus Norddahl
6ef8fe2da5 Add diminishing lighting 2016-11-08 18:08:13 +01:00
Magnus Norddahl
c1d496c17f A little bit of SSE to speed it slightly more 2016-11-08 17:38:19 +01:00
Magnus Norddahl
466274d7f6 Remove floats from the inner block loop 2016-11-08 16:46:15 +01:00
Magnus Norddahl
28d1cdc1cc Add TriUniforms and move light to it 2016-11-08 16:16:24 +01:00
Magnus Norddahl
6620d99fbb Fix frame buffer bounds and access errors 2016-11-08 15:27:45 +01:00
Christoph Oelckers
5c7affd102 Merge branch 'master' of https://github.com/rheit/zdoom 2016-11-08 14:31:10 +01:00
Magnus Norddahl
cb4b74e0c3 Double render speed of triangle drawer in the poly version by removing sprite clip and assigning whole blocks to threads 2016-11-08 14:28:58 +01:00
Rachael Alexanderson
dffba5267d - Full freelook is now enabled if r_newrenderer is set to true. 2016-11-08 00:44:53 -05:00
Magnus Norddahl
2e2d6da00f Only draw thing if its in the subsector 2016-11-08 05:48:45 +01:00
Magnus Norddahl
d0f0500f0d Draw things 2016-11-08 05:17:29 +01:00
Magnus Norddahl
b9d6fc6856 Add some light and transparency 2016-11-08 02:48:14 +01:00
Magnus Norddahl
237f54f4be Toying with triangle drawer and GL BSP nodes 2016-11-07 09:25:12 +01:00
Magnus Norddahl
47cc110498 Add true color triangle drawer 2016-11-07 05:24:17 +01:00
Magnus Norddahl
4e717cd9ee Merge remote-tracking branch 'origin/triangledrawer' into qzdoom 2016-11-07 04:30:28 +01:00
Magnus Norddahl
92be8f401c Remove old triangle version 2016-11-07 04:27:55 +01:00
Magnus Norddahl
3ea9d7cf04 Move software renderer transform to TriMatrix 2016-11-07 03:34:59 +01:00
Rachael Alexanderson
8e7e1b48e9 Merge branch 'master' of https://github.com/rheit/zdoom 2016-11-06 19:54:08 -05:00
Braden Obrzut
640bf2a6d4 - Fixed: SBarInfo didn't support animated images in some places. 2016-11-06 17:07:44 -05:00
Rachael Alexanderson
9f9e4ea19d - Added randi's "bottomclip" parameter to dpJudas's OpenGLSWFrameBuffer::FillSimplePoly implementation. The code refused to compile because of the new changes. Note that this is not tested on Linux or Mac, and will likely need changes there as well. 2016-11-06 08:58:06 -05:00
Rachael Alexanderson
901727a7f8 Merge branch 'master' of https://github.com/rheit/zdoom 2016-11-06 08:11:04 -05:00
Magnus Norddahl
3a7532fd9b Improve flat mipmap selection 2016-11-06 11:39:28 +01:00
Magnus Norddahl
aad2cde332 Oops, forced all sandy bridge CPUs to westmere instead of just Pentium G840 2016-11-06 07:37:18 +01:00
Magnus Norddahl
70d4097b34 Fix clamping bug when r_mipmap is off 2016-11-06 07:33:17 +01:00
Marisa Heit
55ee78fc0b Add bottomclip parameter to FillSimplePoly() for the software implementation
- Polygons will be clipped to bottomclip. If this is zero or below, they
  will be clipped to the bottom of the screen instead. This keeps the
  polygons from overwriting the status bar border for sofware 2D. The
  hardware version ignores it, since it always draws the status bar border
  every frame.
2016-11-05 22:49:33 -05:00
Rachael Alexanderson
5e547e9455 Merge branch 'master' of https://github.com/rheit/zdoom
# Conflicts:
#	src/r_segs.cpp
#	src/v_draw.cpp
2016-11-05 23:38:50 -04:00
Marisa Heit
dbc54fbca0 Fix FillSimplePoly() for 1-pixel tall or wide textures 2016-11-05 22:30:16 -05:00
Marisa Heit
ae28c9b29c Fix divide by 0 in new wallscan functions with 1-pixel tall textures 2016-11-05 22:09:38 -05:00
Magnus Norddahl
d084f77546 Fix mipmap generation bug
Fix crash due to dc_source2 not always being set
Add r_lod_bias to control mipmap selection
Improve LOD calculations to take the U texture coordinate into account
2016-11-05 16:12:59 +01:00
Magnus Norddahl
4b18530047 Add linear filtering to column drawers and fix offsetting bug with wall/span linear filters 2016-11-05 11:29:50 +01:00
Christoph Oelckers
9ab779fd61 Merge commit '60ae4a8568d9fc929c803036fa16fa0f9bfb68a2' 2016-11-05 10:39:13 +01:00
Rachael Alexanderson
2fe5cb4f77 Merge branch 'master' of https://github.com/rheit/zdoom 2016-11-04 23:53:05 -04:00
Magnus Norddahl
484e1b56be Merge remote-tracking branch 'origin/new_wallscan' into qzdoom 2016-11-05 04:49:54 +01:00
Braden Obrzut
dd1f72bbf9 - Check the version of FMOD in CMake to produce an error on the condition that OpenAL is also enabled and the FMOD version is low enough to also export Xiph symbols. 2016-11-04 23:27:04 -04:00
Magnus Norddahl
60ae4a8568 Replace build wallscan with a rewritten version that tile and scale correctly 2016-11-05 04:02:30 +01:00
Christoph Oelckers
faea61cf01 - fixed: Turbo messages were printed, even when no turbo mode was active. 2016-11-04 12:43:23 +01:00
Christoph Oelckers
540f20882e - fixed: Degeneration should use the same base health value as all the rest of the engine.
- also replaced deh.MaxHealth in the bot code which was the only other remaining case where this was used as health limiter.
2016-11-04 11:32:57 +01:00
Christoph Oelckers
7755a3525a - do not allow menu slider values very close to zero. They not only can produce a glitched number display but also some weird inconsistencies when operating a slider. 2016-11-04 11:17:22 +01:00
Magnus Norddahl
4b4d7a0768 Add texturefrac bounds clamping to R_DrawMaskedColumn to avoid buffer overruns 2016-11-04 10:16:44 +01:00
Magnus Norddahl
b04118032e Fix wrapping and scaling issue for the U texture coordinate for sprites 2016-11-04 10:15:57 +01:00
Magnus Norddahl
12a1755edf Move texture info to R_DrawMaskedColumn and add bounds checking 2016-11-04 01:39:53 +01:00
Christoph Oelckers
747b612860 Merge branch 'master' of https://github.com/rheit/zdoom 2016-11-03 19:42:03 +01:00
Magnus Norddahl
90c8b3370a Fix mipmap sampling bug 2016-11-03 12:51:07 +01:00
Magnus Norddahl
356830a8c8 Add CPU misdetection workaround for the Pentium G840 and a llvm_cpu CVAR that can force codegen to a specific CPU architecture 2016-11-03 12:02:07 +01:00
Rachael Alexanderson
7cba67ad45 Merge branch 'master' of http://github.com/rheit/zdoom 2016-11-02 03:12:21 -04:00
Marisa Heit
f8641c0ffb Fixed: MaxVisForFloor was broken by the switch to floats
- TODO: See if these visibility limits are even needed anymore.
2016-11-02 00:07:57 -05:00
Marisa Heit
3f32ccada6 Zero In2D before calling Flip()
- Fixes an assert when resizing the window in windowed mode. Flip() can call
  V_OutputResized() in windowed mode.
2016-11-01 22:54:27 -05:00