Christoph Oelckers
62f649b4f6
- fixed: the direct native GetTextureSize used the wrong calling convention.
2018-11-30 19:28:24 +01:00
Christoph Oelckers
8e46cb3a21
Merge remote-tracking branch 'remotes/origin/master' into asmjit
2018-11-30 18:49:28 +01:00
Christoph Oelckers
024870ba11
- merged DCanvas and DSimpleCanvas and use a TArray to hold its memory.
2018-11-30 17:02:39 +01:00
Christoph Oelckers
b8394b2f16
- fixed compilation warnings.
2018-11-29 20:11:28 +01:00
Christoph Oelckers
3ecda35379
Add direct native calls to TexMan's native methods.
2018-11-29 19:41:03 +01:00
Christoph Oelckers
533f66396d
Merge branch 'master' into asmjit
2018-11-17 20:16:03 +01:00
Christoph Oelckers
45ef7bca4f
- fixed: FTexture::SmoothEdges must forward its result to the base texture in case a redirection is in effect.
...
Both need the bMasked flag, or some code will think that the texture is not fully opaque if no holes were found.
2018-11-17 18:55:44 +01:00
Christoph Oelckers
08fe9c375b
- use the same formula for calculating 3DMidTex offsets as the renderer when per-sidedef scaling is used.
...
This reuses the FTexCoordInfo class the hardware renderer had been using to calculate wall texture offsetting.
The software renderers still need this sorted out to bring them in line with the rest of the code, though, but they do not have this code sufficiently well organized to make this a straightforward task.
2018-11-17 18:24:14 +01:00
Christoph Oelckers
94ed30e782
- removed the default parameter handling from all native script functions because it is no longer needed.
2018-11-17 10:03:40 +01:00
Christoph Oelckers
b79622bcba
- added far stronger restrictions for when the Boom-Texture-Y-offset compatibility flag may trigger.
...
This had absolutely no sanity checks and unconditionally picked the source texture if one existed.
It should only be done for wall textures, only for those defined in TEXTUREx and only for those where the scale is identical with the underlying texture.
2018-11-01 10:51:57 +01:00
Christoph Oelckers
91df3f8c73
- added option to disable alpha testing for user shaders.
2018-10-31 15:56:20 +01:00
Christoph Oelckers
98e111eba0
- merged the nearly identical wrapper texture classes for the software render and the wiper.
2018-10-29 07:39:33 +01:00
Rachael Alexanderson
e7f19b01cb
- added normal5x and normal6x
2018-10-04 22:09:18 -04:00
Rachael Alexanderson
b6bcc1b0f5
Add 'normalNx' texture scaling
2018-10-04 08:43:02 -04:00
alexey.lysiuk
778a7c370d
- added 5x and 6x upscaling with xBRZ
2018-10-04 08:43:02 -04:00
alexey.lysiuk
e111e2251c
- cleaned up old xBRZ 1.0 upscaler
...
Removed obsolete header comments and support for C++98
Disabled Windows only debug features
2018-10-04 08:43:02 -04:00
alexey.lysiuk
30c3f4f597
- update xBRZ upscaler to version 1.6
...
Fixed build with all suported toolchains thanks to incomplete implementation of C++14 in MSVC 2015 and GCC 4.9
Removed obsolete header comments and support for C++98
Disabled Windows only debug features
https://sourceforge.net/projects/xbrz/
https://sourceforge.net/projects/xbrz/files/xBRZ/xBRZ_1.6.zip
2018-10-04 08:43:02 -04:00
Christoph Oelckers
5b7d3c91f9
- defaulted constructors and assignment operators of several trivial types.
2018-08-25 23:51:36 +02:00
Christoph Oelckers
fad406c4c9
- got rid of FNameNoInit and made the default constructor of FName non-initializing.
...
This setup has been a constant source of problems so now I reviewed all uses of FName to make sure that everything that needs to be initialized is done manually.
This also merges the player_t constructor into the class definition as default values.
2018-08-19 08:19:19 +02:00
David Carlier
1e11ce3bee
Texture data overlap occuring here, using memmove instead.
2018-08-04 09:21:55 +03:00
Christoph Oelckers
4a7b1aada7
Merge remote-tracking branch 'remotes/origin/modern'
...
# Conflicts:
# wadsrc/static/shaders/glsl/main.fp
2018-07-20 10:19:07 +02:00
Magnus Norddahl
8a500a25f5
- rewrite the user shader support for materials - new syntax is to create a 'Material ProcessMaterial()' function
2018-07-15 23:01:40 +02:00
Christoph Oelckers
1294f3df64
- replaced the procedural backdrop texture with some warped noise texture.
...
This was done because the backdrop as implemented was the only texture in the entire game that had to be deleted and recreated each frame.
However, with Vulkan this would have necessitated quite a bit of synchronization with the render pipeline which wasn't really feasible just for this one single texture.
Now the texture manager can assume that once a texture was created it will be immutable and never has to change.
2018-07-15 00:00:00 +02:00
Christoph Oelckers
33ee0f3c27
Merge branch 'master' into modern
...
# Conflicts:
# src/gl/renderer/gl_renderer.cpp
# src/gl/renderer/gl_renderer.h
# src/gl/renderer/gl_renderstate.h
# src/gl/system/gl_framebuffer.cpp
# src/gl/system/gl_framebuffer.h
2018-07-14 13:18:34 +02:00
usernameak
292458ee2d
Custom hardware shaders now can use custom texture units
2018-07-14 12:01:54 +02:00
Christoph Oelckers
124fe63d00
Merge branch 'master' into modern
2018-07-14 10:24:41 +02:00
David Carlier
2a59327aeb
foo being allocated with metadata based allocator needs to
...
be freed similarly.
2018-07-06 10:59:23 +03:00
Christoph Oelckers
b106f72741
- don't route calls to FMaterial::FlushAll through the framebuffer interface.
2018-06-20 22:18:31 +02:00
Christoph Oelckers
c8db149c06
Merge branch 'master' into modern
2018-06-19 00:11:59 +02:00
drfrag666
b38e67a53d
- Applied Blzut3's patch to compile with MinGW.
2018-06-18 20:57:52 +02:00
drfrag666
9a4ae6eb80
- Missing include again due to the VS preprocessor.
2018-06-18 20:57:52 +02:00
Christoph Oelckers
8ab68264c1
- removal of all code to handle OpenGL 2. From this commit on the main build of GZDoom will be OpenGL 3.3 or higher.
...
# Conflicts:
# src/gl/renderer/gl_renderer.cpp
# src/gl/shaders/gl_shader.cpp
# src/gl/system/gl_framebuffer.cpp
# src/gl_load/gl_interface.cpp
2018-06-15 21:45:05 +02:00
Magnus Norddahl
cadc4f2a30
- add #include support to TEXTURES lump
2018-05-24 21:18:20 +02:00
alexey.lysiuk
f17f8c9359
- added end line to various messages
...
so they don't screw up further output anymore
2018-05-11 18:03:57 +03:00
alexey.lysiuk
2c2b19bb7f
- fixed crash during autoloading of material textures
...
https://forum.zdoom.org/viewtopic.php?t=60546
2018-05-10 18:01:29 +03:00
alexey.lysiuk
a7e7db1fe9
- fixed calculation of glow color
...
Width and pitch were mixed up for RGB format texture, pixel data were read outside of designated buffer
https://forum.zdoom.org/viewtopic.php?t=60538
2018-05-10 15:45:29 +03:00
Christoph Oelckers
64b108ff44
- hw_sprites extracted
...
- moved the variables for OpenGL's special textures to the texture manager because it is far better suited as a container than the GLRenderer.
2018-04-29 00:09:44 +02:00
alexey.lysiuk
86232df5ee
Fixed rendering of walls and flats
...
With high resolution textures enabled (gl_texture_usehires CVAR set to true) and without hires textures loaded walls and flats were black
2018-04-26 10:37:27 +03:00
Christoph Oelckers
306b630de2
- merged the remains of gl_texture.cpp into hw_cvars.cpp.
...
- eliminated hqresize.cpp's dependency on GL headers.
- cleaned up the logic for CreateTexBuffer so that hqresize.cpp does not need to check for software warped textures anymore.
2018-04-25 21:02:50 +02:00
Christoph Oelckers
982776d48d
- removed dependencies on GL-API related classes from gl_walls.cpp and gl_sky.cpp
...
Not complete yet, but at least the GLWall memberes no longer reference GLSceneDrawer and the implementation dependent parts of FDrawInfo.
2018-04-25 14:58:13 +02:00
Christoph Oelckers
e24b597ae4
- got rid of the gl_info substructure in FTexture and moved all elements into the main class.
2018-04-24 23:51:19 +02:00
Christoph Oelckers
0675315b41
- made FHardwareTexture inherit from an abstract interface to remove all GL dependencies from gl_material.cpp.
2018-04-24 23:06:34 +02:00
Christoph Oelckers
f9a82e66e4
- removed all GL dependencies from gl_material.h.
2018-04-24 22:37:52 +02:00
Christoph Oelckers
5e8a4b96fe
- make sure that warping textures never create a warped true color image.
...
This replaces the old redirection hackery that had to work differently for the legacy render path.
Overriding CopyTrueColorTranslated is far more robust and ensures that no edge cases can reach the GetPixels function, which wasn't the case before.
2018-04-24 21:58:26 +02:00
Christoph Oelckers
c37ff22a05
- removed the intermediate FGLTexture class.
...
This wasn't serving any real purpose anymore, and all its remaining functionality could be moved to FHardwareTexture
2018-04-24 20:41:52 +02:00
alexey.lysiuk
2ae8d39441
Removed all superfluous #include's
...
Automatically optimized by CLion IDE with manual corrections
2018-04-24 14:30:35 +03:00
Magnus Norddahl
4870cc73e2
- fix true color software crash in square and other maps
2018-04-17 09:01:34 +02:00
Christoph Oelckers
0affc119fd
- moved hardware independent part of flat vertex data out of GL folder.
2018-04-14 12:05:31 +02:00
Christoph Oelckers
551691f42a
- made FTexture::GetPixels and FTexture::GetColumn non-pure-virtual.
...
With the software renderer not being used for 2D anymore it would be quite annoying if every texture class had to implement these.
If done properly, the SW renderer should actually be forced to dynamic_cast any texture to a FWorldTexture before using this stuff, but that'd be some pointless overhead better saved.
2018-04-08 21:19:57 +02:00
Christoph Oelckers
17c18f3367
- fixed typo in texture search function. This caused the crosshairs not to be found.
2018-04-08 19:16:46 +02:00