Commit graph

635 commits

Author SHA1 Message Date
Robert Beckebans
c91f8f4338 Merge branch 'master' into vkdoom3-merge 2017-09-03 10:32:19 +02:00
Robert Beckebans
e22837309b Merged LordHavoc's image compression progress bar
# Conflicts:
#	neo/framework/common_frame.cpp
2017-09-03 10:30:13 +02:00
Robert Beckebans
657b5c02f9 Optimized makeAmbient importance sampling with Hammersley point set 2017-09-03 10:28:23 +02:00
Robert Beckebans
736ccadcb3 Started to move files so it can be compared to vkdoom3 2017-09-03 10:22:36 +02:00
Robert Beckebans
4daffd67c0 Astyle 2017-09-03 09:45:03 +02:00
Robert Beckebans
72091f73ca Merge branch 'master' into vkdoom3-merge 2017-09-02 14:40:39 +02:00
Robert Beckebans
09f92b95d9 Disable ATL warning with VS2015 2017-09-02 13:58:21 +02:00
Robert Beckebans
6fbaf4e904 Merge remote-tracking branch 'Codes4Fun/HDRMSAAFix' 2017-09-02 13:33:55 +02:00
Robert Beckebans
fab5644a75 Merge pull request #393 from dsalt/compile-warnings
Trivial fixes for some (mostly) string-related compile warnings
2017-08-30 12:39:40 +02:00
Robert Beckebans
579de5008d Merged SWF fixes from vkDoom3 2017-08-29 16:26:03 +02:00
Darren Salt
5791f11a6b Kill a macro redefinition warning. 2017-08-27 23:31:51 +01:00
Darren Salt
c8fae11e7d Constify format string in DisplayRealTimeString (fixes warnings). 2017-08-27 22:26:28 +01:00
Darren Salt
01be91c9c8 Fix detection of Mesa >= 17.2.
This handles accelerated drivers (vendor == "X.Org") and software rendering (llvmpipe).
2017-08-09 17:02:35 +01:00
Ensiform
29786cf420 Static cvars incorrectly checking against wrong size on 64
On 64-bit arch these checks are incorrect. the 0xFFFFFFFF is effectively UINT32_MAX rather than the pointer size. Changing to the unsigned integral pointer maximum seems like a better idea.

Fixes the warning, and corrects the code.
2017-07-30 22:30:25 -05:00
Ensiform
df08e21e0d Add cmake files for VS 2017 support
Win10 solutions are likely needed to be used if you don't want to depend on the DXSDK same as 2015.
2017-07-15 21:28:05 -05:00
Caffeine Code
41f1014ed5 read core count correctly 2017-07-09 22:39:20 +01:00
Caffeine Code
8a1ce622a3 Fix sprintf overflows in various locations (gcc 7) 2017-07-09 19:22:33 +01:00
Robert Beckebans
81dc65119d Merge pull request #341 from boscorillium/glew2.0
update to glew 2.0
2017-04-21 10:55:32 +02:00
Codes4Fun
de899cdbda Automatic reload of shaders after changing r_useHDR and r_useHalfLambertLighting. 2016-10-24 16:08:27 -07:00
Codes4Fun
2ce3f660bd Fixed resolution changing bug with MSAA and HDR.
After a resolution change the hdrNonMSAAFBO needed to be reattached
after Resize, not doing that resulted in a black screen (being attached
to the old deleted texture).
2016-10-24 16:07:17 -07:00
Codes4Fun
d53b9cafda Update to use glConfig.multisamples.
code under USE_HDR_MSAA was stil using r_multiSamples, so switched it to
use glConfig.multiSamples.
2016-10-24 16:06:21 -07:00
Codes4Fun
3241d08740 Added UpdateStereo3DMode function.
This is to consolidate how we update the glConfig.stereo3Dmode, and to
update it before initializing the framebuffers so that they are
initially allocated correctly and avoid framebuffers getting reallocated
later.
2016-10-24 15:58:43 -07:00
Codes4Fun
e83aa52d4f Fix for Stereoscopic 3D modes.
A lot of places using glConfig.nativeScreenWidth, when they should be
calling renderSystem->GetWidth() (and height equivalent) which take into
account stereoscopic 3d modes.
2016-10-23 18:55:16 -07:00
Shane Utt
8226e25886 Regenerate RenderProgs_embedded.h 2016-10-14 21:32:57 -04:00
Tim Howard
fc3fd70409 update to glew 2.0 2016-08-13 21:05:14 -04:00
Jonathan Young
5368af9ad8 Fix playDemo running as fast as possible (like timeDemo). 2016-07-16 11:24:06 +10:00
Jonathan Young
ca0527f9a6 Merged Storm Engine 2 demo fixes. 2016-07-15 16:36:34 +10:00
Jonathan Young
42f93f5b0e Include json maps in command argument auto-complete. 2016-07-04 19:14:16 +10:00
Jonathan Young
9325c3672c Fix debug assert when auto-completing some command arguments. 2016-07-04 19:12:58 +10:00
Robert Beckebans
3d75dbcb4a GCC compile fixes under Kubuntu 15.10 2016-07-03 22:56:29 +02:00
Robert Beckebans
9a340f3914 Renamed Flash GUI development cvars to postLoadFlash* 2016-07-03 15:33:01 +02:00
Robert Beckebans
e6f75d3336 Merge branch 'flash-tools' 2016-07-03 15:11:43 +02:00
Robert Beckebans
d3b9d238ec Merge branch 'collada-support' 2016-07-03 14:59:45 +02:00
Robert Beckebans
7296fd83b5 Added COLLADA model support to get rid of ancient LWO/ASE formats 2016-07-03 13:47:52 +02:00
Robert Beckebans
3e1d21ef34 Merged some SS2 shadow mapping performance improvements 2016-07-02 11:24:22 +02:00
Robert Beckebans
081c848f87 envShot cleanup 2016-07-02 11:24:22 +02:00
Robert Beckebans
30f85f5b46 Merged Steel Storm 2 envShot bugfix by LordHavoc 2016-07-02 11:24:22 +02:00
Robert Beckebans
3bac15f585 Merged some SS2 shadow mapping performance improvements 2016-07-02 11:22:04 +02:00
y2keeth
7b5fc61a51 added option to game setting to turn on or off muzzleflashes 2016-06-29 18:37:59 -04:00
y2keeth
321dda8b8f increase max_decals and deffered decals, shotgun now has full impacts 2016-06-26 21:05:41 -04:00
y2keeth
473449cf5a Merge remote-tracking branch 'refs/remotes/RobertBeckebans/master' 2016-06-26 20:49:32 -04:00
Robert Beckebans
f3c8e0748e Move worlspawn to first entry if map was read from Blender 2016-06-19 17:19:24 +02:00
Robert Beckebans
45c96fa6bc envShot cleanup 2016-06-14 10:33:50 +02:00
Robert Beckebans
b8748b59e5 Merged Steel Storm 2 envShot bugfix by LordHavoc 2016-06-13 22:29:31 +02:00
Robert Beckebans
a884b08010 Astyle 2016-05-10 09:55:37 +02:00
Robert Beckebans
c664c9e940 Save rendermodels as OBJ if postLoadExportModels is set 2016-03-16 23:18:47 +01:00
Robert Beckebans
95de9c62a5 exportDecls command to export def/* stuff for Blender 2016-03-05 21:19:14 +01:00
Robert Beckebans
52b7775d83 Added support for new JSON based map format 2016-03-05 20:52:09 +01:00
Robert Beckebans
be556174e0 Merge branch 'master' into map-primitive-polygons-for-blender 2016-03-05 20:20:07 +01:00
Ivan Vashchaev
3171686814 Support SDL2 GameController API
On OS X DualShock4 works perfectly
2016-02-12 20:53:24 +03:00
Robert Beckebans
7728dc3add Fullscreen effects always need to be in sRGB. close #292 2016-02-02 23:12:53 +01:00
Robert Beckebans
1275984ab8 Fixed FFmpeg Win64 static libs. fix #288 2016-01-20 19:42:55 +01:00
Robert Beckebans
f01738a429 Added missing BRDF.inc to renderprogs manifest. #286 2016-01-20 19:31:48 +01:00
Robert Beckebans
414a426b09 VS 2015 and Windows 10 support. close #261 #271 #272 2016-01-20 00:55:30 +01:00
y2keeth
5f37c213c7 Merge remote-tracking branch 'refs/remotes/RobertBeckebans/master' 2016-01-19 06:07:46 -05:00
Robert Beckebans
fa87f5465c Updated readme/release notes 2016-01-19 00:04:13 +01:00
Robert Beckebans
facc23d956 Updated embedded shaders 2016-01-18 23:23:01 +01:00
Robert Beckebans
c158a16a93 Fixed rendering of mirrors 2016-01-18 23:21:53 +01:00
Robert Beckebans
fb618feeca Always render 2D GUIs in sRGB color space 2016-01-18 22:21:32 +01:00
Robert Beckebans
8f1512dc5e Tweaked HDR tone mapping and linear RGB bugfixes 2016-01-17 12:49:04 +01:00
Robert Beckebans
d50c93f26f Added r_exposure and tweaked lighting 2016-01-14 00:59:41 +01:00
Robert Beckebans
f82b700598 Improved linear RGB lighting and added ACES tonemap 2016-01-13 20:33:16 +01:00
y2keeth
da79018740 Enables muzzle flashes
weapon world lighting enabled
2016-01-11 16:46:19 -05:00
Robert Beckebans
29f5488c89 Merge branch 'SSGI' into HDR-linearRGB
Conflicts:
	base/renderprogs/global.inc
	base/renderprogs/interactionAmbient.pixel
	neo/renderer/OpenGL/gl_Image.cpp
	neo/renderer/RenderProgs_embedded.h
2016-01-11 19:35:34 +01:00
Robert Beckebans
05da7306d4 More SSGI and SSAO bugfixes 2016-01-11 19:00:20 +01:00
Robert Beckebans
dec7944856 SSGI and SSAO bugfixes 2016-01-10 23:47:16 +01:00
Robert Beckebans
3c9bc63f61 SSGI radiosity blur 2016-01-10 17:20:38 +01:00
Robert Beckebans
9e4b6188cc Screen Space Global Illumination first step 2016-01-09 22:24:57 +01:00
Robert Beckebans
b0f5f51f4c Bugfix 2016-01-09 20:17:09 +01:00
Robert Beckebans
e8826caae8 Hierarchical depth buffer for SSAO works 2016-01-09 16:23:49 +01:00
Robert Beckebans
d9f9db3b37 Framework for hierarchical depth buffer optimization 2016-01-09 13:38:49 +01:00
Robert Beckebans
94c28fa8ff Working Alchemy SSAO shaders 2016-01-08 19:30:21 +01:00
Robert Beckebans
8a861c7914 Render SSAO to offscreen FBO 2016-01-06 22:37:16 +01:00
Robert Beckebans
9f83e84f6f Added bilateral blur to SSAO 2016-01-02 23:59:44 +01:00
Robert Beckebans
e555e83119 SSAO experiment 2016-01-02 19:28:49 +01:00
Robert Beckebans
08c7b35fd1 Normals-only G-Buffer for screen space effects 2015-12-31 18:11:34 +01:00
Robert Beckebans
5e7e59cfe6 Updated embedded shaders 2015-12-31 13:05:51 +01:00
Robert Beckebans
ba8097a90e Revert "Enables muzzle flashes"
This reverts commit 7a2f275c17.
2015-12-31 12:34:29 +01:00
Robert Beckebans
1f81d427fa Merge branch 'SMAA' 2015-12-31 12:27:26 +01:00
Robert Beckebans
5846953302 Fixed missing multiSamples initialization for OpenGL. #276 2015-12-30 19:28:14 +01:00
Robert Beckebans
523410e8cf Merge branch 'SMAA' into HDR-linearRGB 2015-12-30 13:32:05 +01:00
Robert Beckebans
ebc3f34650 Removed black triangles when half-lambert is enabled 2015-12-30 12:46:45 +01:00
Robert Beckebans
e1195615a3 Added SMAA shaders to renderprogs manifest 2015-12-30 12:22:05 +01:00
Robert Beckebans
e2e4295556 Replaced r_multiSamples with r_antiAliasing to switch between SMAA, MSAA ( and TXAA future) 2015-12-30 12:07:24 +01:00
Robert Beckebans
a74956208e Lighting in linear RGB. One step closer to PBR 2015-12-30 11:01:57 +01:00
Robert Beckebans
195f8082b8 Merge branch 'SMAA' into HDR-linearRGB
Conflicts:
	base/renderprogs/global.inc
	neo/renderer/RenderProgs_GLSL.cpp
	neo/renderer/RenderProgs_embedded.h
2015-12-30 10:08:25 +01:00
Robert Beckebans
cae1397d78 Disabled SWF Image channelScale export 2015-12-29 11:47:45 +01:00
Robert Beckebans
08f28edfb0 Disabled HDR MSAA support in favor of SMAA 2015-12-28 23:44:22 +01:00
Robert Beckebans
c4316b14a4 Reenabled filmic post effects 2015-12-28 23:33:39 +01:00
Robert Beckebans
127b2ed5e8 Finally, Crytek's SMAA works at leat in SMAA 1x mode 2015-12-28 23:22:58 +01:00
Robert Beckebans
0b5d931e1e SMAA debugging 2015-12-28 21:36:25 +01:00
Robert Beckebans
3bb28ab144 SMAA neighborhood blending shader 2015-12-28 13:34:39 +01:00
Robert Beckebans
794f9ae5e1 SMAA blending weight calculation shader 2015-12-28 11:42:11 +01:00
Robert Beckebans
43b0cb2415 SMAA edge detection shader 2015-12-27 17:45:41 +01:00
Robert Beckebans
e332dd07d6 SMAA step one 2015-12-26 16:11:47 +01:00
Robert Beckebans
e8c8aa4795 Added SMAA intrinsic helper images 2015-12-26 15:20:19 +01:00
Robert Beckebans
6aa87784a3 Tweaked HDR/ambient 2015-12-25 12:03:59 +01:00
Robert Beckebans
a501209c8b Updated shaders. Merry Christmas :) 2015-12-24 18:49:25 +01:00
Robert Beckebans
ad0ff8ec8d Tweaked HDR/ambient 2015-12-24 18:47:16 +01:00
Robert Beckebans
5556231d71 Tweaked HDR parameters 2015-12-24 18:47:16 +01:00