zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2024-12-16 15:31:30 +00:00
Code Issues Projects Releases Packages Wiki Activity
15349 commits 86 branches 139 tags 124 MiB
Commit graph

195 commits

Author SHA1 Message Date
Christoph Oelckers
6ebec37baf - moved all portal code that sets up a scene to be rendered into API independent code and let it be handled by a common wrapper class. 2018-06-23 23:03:34 +02:00
Christoph Oelckers
1cf3af9c41 - moved the current portal pointer to HWDrawInfo so that the portal managed does not need to save and restore a global variable for each portal. 2018-06-23 13:51:19 +02:00
Christoph Oelckers
282fdac660 - made the static portal state a struct inside the Renderer object 2018-06-23 13:25:59 +02:00
Christoph Oelckers
82d7e5970f - moved the clipline uniform to the viewpoint buffer. 
This was the final one of the per-scene values that could be taken out of the render state.
 2018-06-22 23:49:39 +02:00
Christoph Oelckers
80a9028938 - mirror clip planes moved - not working yet. 2018-06-22 22:45:05 +02:00
Christoph Oelckers
d5af939119 - more uniforms moved. 
(not working yet.)
 2018-06-22 21:32:38 +02:00
Christoph Oelckers
43e1a2d249 - moved uViewHeight and uCameraPos to the viewpoint uniform struct. 2018-06-22 21:05:36 +02:00
Christoph Oelckers
1967165633 - move view and projection matrices to DrawInfo. 2018-06-21 21:02:14 +02:00
Christoph Oelckers
eb277cc101 - calculate the normal view matrix at a higher level. 2018-06-20 13:49:06 +02:00
Christoph Oelckers
469c9241eb Moved WriteSavePic implementation to FGLRenderer 2018-06-20 12:29:52 +02:00
Christoph Oelckers
9bdb5f1a5d Moved ProcessLowerMinisegs back toAPI independent code. 2018-06-20 10:10:30 +02:00
Christoph Oelckers
922c3a8d75 - moved the basic methofs of HWDrawInfo to a dedicated file instead of storing them somewhere else. 2018-06-19 23:52:01 +02:00
Christoph Oelckers
54970b60e8 - use locally stored viewpoint variables in the hardware renderer. 
- move a few variables from SceneDrawer to FRenderViewpoint.

The global r_viewpoint variable is left alone now to always represent the current viewpoint to the play code.
The main reason behind this change is to reduce the amount of global variables being used by the hardware renderer's scene processing code.
 2018-06-19 23:45:17 +02:00
Christoph Oelckers
d2309af3d5 Merge remote-tracking branch 'remotes/origin/master' into modern 
# Conflicts:
#	src/d_main.cpp
#	src/hwrenderer/scene/hw_weapon.cpp
 2018-06-19 19:40:52 +02:00
Christoph Oelckers
eddb179e36 - moved ViewActor variable into FRenderViewpoint. 2018-06-19 18:51:46 +02:00
Christoph Oelckers
87dfa34f1f - save r_viewpoint as a whole when processing portals. 2018-06-19 17:55:42 +02:00
Christoph Oelckers
22b8d0a8d7 - r_viewpoint reduction in hwrenderer 2018-06-19 11:21:13 +02:00
Christoph Oelckers
86975a71e8 - don't use r_viewpoint directly when sorting translucent geometry. 
Better store the view Z in a member variable and use that.
 2018-06-19 10:50:48 +02:00
Christoph Oelckers
ae7053ee98 - another small optimization 2018-06-19 10:40:50 +02:00
Christoph Oelckers
12ad0caec0 - small optimization 2018-06-19 10:33:59 +02:00
Christoph Oelckers
fba5b872be - reduced number of references to r_viewpoint in hw_flats 2018-06-19 10:31:25 +02:00
Christoph Oelckers
3eb4b137f3 - reduced number of references to r_viewpoint in hw_fakeflat.cpp 2018-06-19 10:30:18 +02:00
Christoph Oelckers
18f43dea1e - reduced number of references to r_viewpoint in hw_sprites.cpp 2018-06-19 10:29:09 +02:00
Christoph Oelckers
cf1641d0f6 - reduce number of places in weapon code which access r_viewpoint directly. 2018-06-19 10:25:11 +02:00
Christoph Oelckers
74d8c929cc Give the clipper a reference to the current viewpoint 
This is both for efficiency and encapsulation. At last on MSVC in 64 bit, accessing global variables is very inefficient and the clipper was doing it repeatedly in its worker functions.

It is also one less place where the global viewpoint gets checked.
 2018-06-19 09:37:49 +02:00
Christoph Oelckers
6b92b95068 - moved vertex creation for skybox sector to backend independent code. 2018-06-18 18:41:59 +02:00
Christoph Oelckers
34ee04f2ce - moved the matrix math for the sky dome into backend independent code. 2018-06-18 18:18:28 +02:00
Christoph Oelckers
1fdf6a20d1 - fixed incomplete null pointer check. 2018-06-17 10:53:55 +02:00
Christoph Oelckers
4937848123 - refactoring of fixed colormap stuff to have it better organized and to reduce the number of uniforms in the main shader. 
This removes 3 uniforms, consisting of 9 floats. Those were merged into other values that never get used at the same time.
It also moves the costly setup of the fixed colormap out of the render state into the 2D processing code.
Since 3D forces use of render buffers now, it is no longer necessary to draw the entire scene with the colormap active, meaning it can be handled more efficiently.
 2018-06-16 22:40:44 +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
5464d2a577 - add dynamic lights to softpoly and software renderer models 2018-06-05 22:43:11 +02:00
alexey.lysiuk
edabe43bca - fixed typo in previous commit 
https://forum.zdoom.org/viewtopic.php?t=60739
 2018-06-01 12:24:29 +03:00
Christoph Oelckers
2d50f535ff - fixed and simplified the vertex counter for wall polygons. 
This is now allowed to overestimate the number of vertices to reduce computation time for a rarely occuring special case that was eating most of the time and was causing errors with some walls.
 2018-05-31 22:14:57 +02:00
alexey.lysiuk
0187b0aa5b - fixed mirrors and reflections in hardware renderer 
https://forum.zdoom.org/viewtopic.php?t=60671
 2018-05-28 11:51:43 +03:00
Magnus Norddahl
31f29bbe8a - force model light to be attenuated 2018-05-25 19:23:47 +02:00
Christoph Oelckers
496e6e2e8f - fixed: The vertex height updater was using the index buffer offsets to access the vertex buffer. 
I missed this part when repurposing the vboindex members to store the index buffer offsets.
However, since both indices are needed, they need another set of variables.
 2018-05-24 00:01:56 +02:00
Christoph Oelckers
b612e182b4 Merge branch 'indexbuffer' 
# Conflicts:
#	src/gl/data/gl_vertexbuffer.h
#	src/gl/scene/gl_flats.cpp
#	src/hwrenderer/data/flatvertices.h
 2018-05-22 22:10:21 +02:00
Christoph Oelckers
df6a50872d Merge branch 'master' of https://github.com/coelckers/gzdoom 2018-05-22 21:36:52 +02:00
Christoph Oelckers
3f6789ecac - moved gl_bsp.cpp to its proper place. 2018-05-22 21:36:42 +02:00
Christoph Oelckers
2514753afb - make the vertex buffer accessible from the hwrenderer code. 2018-05-22 18:48:10 +02:00
Christoph Oelckers
226e8f84da - most of gl_bsp.cpp moved to HWDrawInfo. 
Only the vertex buffer update check needs to be done yet.
 2018-05-22 00:27:39 +02:00
Christoph Oelckers
df0b1e8dae - moved the clipper out of GLSceneDrawer and let it be handled by HWDrawInfo. 
The precise way the clipper needs to be maintained may differ between APIs, so it is no longer owned by any render structure but instead HWDrawInfo only contains a reference.
For OpenGL there is still only one static clipper because without multithreaded BSP traversal there is no need for more.
 2018-05-21 22:54:04 +02:00
Christoph Oelckers
5f87e81b6a - moved CurrentMapSections and in_area from GLSceneDrawer to HWDrawInfo. 
Not only are they better placed in the common code, but they are also both per-viewpoint and not per-scene, so this is a far more suitable place and avoids saving and restoring them in the portal code.
 2018-05-21 22:04:29 +02:00
Magnus Norddahl
31abe3df7e - avoid reusing the same mVBuf pointer for the different renderers as that causes too many problems when switching between them 
- remove gl_ prefix for model functions that are no longer GL specific
 2018-05-21 17:52:03 +02:00
alexey.lysiuk
2cdc9f9dda - fixed applying of alpha to weapon sprites 
https://forum.zdoom.org/viewtopic.php?t=60638
https://forum.zdoom.org/viewtopic.php?t=60642
 2018-05-21 10:53:02 +03:00
Christoph Oelckers
f54cf561ab - missed this. 2018-05-19 15:40:33 +02:00
Christoph Oelckers
3e204080ae - render sector planes in one draw call. 
On a fast and modern graphics card this is a lot faster than doing it per subsector but it may not be without drawbacks on older hardware so it will require some testing on older hardware.
For me Frozen Time's view over the bridge went from 46 fps to 51 fps with this change, the time saved was roughly 2 ms.
 2018-05-19 15:20:46 +02:00
Christoph Oelckers
1656bbf9ec - route the BlurScene call in the menu through DFrameBuffer. 
Game code should never ever call the renderer directly. This must be done through the video interface so that it can also work with other framebuffers later.
 2018-05-18 00:22:57 +02:00
Christoph Oelckers
c0837f42bd - gl_system.h as well, in particular this has no place in hw_* files. 2018-05-16 23:34:52 +02:00
Christoph Oelckers
142368d958 - fixed alpha of weapon sprite. 2018-05-12 18:45:12 +02:00
Christoph Oelckers
e1ad4b618d - fixed: The targeter drawer did not check the return value of its setup function. 
This caused invalid items to be passed to the renderer.
 2018-05-10 09:09:24 +02:00
Christoph Oelckers
099057b142 - moved the vertex and light data generation back to the render pass for modern OpenGL with persistently mapped buffers. 
Having this extra CPU time in there allows for better parallelization with the graphics driver and GPU.
 2018-05-05 23:32:55 +02:00
Christoph Oelckers
52d73eabbf - weapon drawing code refactor complete. 
Setup and drawing are now done separately, this also no longer needs the Quad drawer.
 2018-05-04 23:11:37 +02:00
Christoph Oelckers
e0833d5005 - prepared the weapon sprite drawer for full separation. 2018-05-03 23:49:16 +02:00
Christoph Oelckers
e309fd1f3d - moved a bit more of the wall setup to the API independent side. 2018-05-03 22:14:25 +02:00
Christoph Oelckers
6285a309ce - added UploadLights to the DrawInfo interface. 
- removed GLPASS_PLAIN because it was the same as GLPASS_ALL.
 2018-05-03 21:47:58 +02:00
Christoph Oelckers
96ac1fa363 - changed GLDecal to work without a pointer to the generating GLWall. 
Although this is currently safe there is no guarantee that future refactorings will keep the current draw lists, so it's better if GLDecal used its own copy of the data.
 2018-05-03 21:42:34 +02:00
alexey.lysiuk
e87cdd3658 - fixed missing geometry with render precision set to quality 
https://forum.zdoom.org/viewtopic.php?t=60423
 2018-05-03 21:10:05 +02:00
Christoph Oelckers
9bdb0f2e49 - renamed the flag bits for sector_t::MoreFlags, so that they are easier to distinguish from sector_t::Flags. 
- precalculate if a sector's floor and ceiling plane overlap. This avoids rechecking this for each single call of hw_FakeFlat.
- vertices must be marked dirty every time they change after map setup. That means that ChangePlaneTexZ must do this as well, because it cannot rely on interpolation taking care of it.
- Having a 'dirty' argument for SetPlaneTexZ's ZScript version makes no sense. If the value changes from the script side the vertices must always be marked to be recalculated.
 2018-05-01 11:29:29 +02:00
Christoph Oelckers
f49c6cbde2 - use sector_t::GetHeightSec consistently and optimize it. 
This was all over the place, with half of it using the function and half doing incomplete checks on the underlying variables.
Also did some optimization on the IGNOREHEIGHTSEC flag: Putting it on the destination sector instead of the model sector makes the check even simpler and allows to precalculate the effect of 3D floors on the heightsec, which previously had to be run on every call and made the function too complex for inlining.
 2018-05-01 09:47:09 +02:00
Christoph Oelckers
3c49804c6c - some Transfer_Heights related optimizations. 
* only call hw_CheckViewArea if the result is not known yet.
* check the map up front if it even contains heightsecs. This allows to shortcut the above check entirely for maps without sector transfers and will allow further optimizations.
 2018-05-01 09:02:24 +02:00
Christoph Oelckers
2b5019ea6e - fix for rendering a brightmapped 2D texture with ColorIsFixed render style. 
This must disable the brightmap.
 2018-04-30 21:28:06 +02:00
Christoph Oelckers
ebc1c5741b - some more weapon code extracted. 2018-04-30 00:09:42 +02:00
Christoph Oelckers
c2ac985357 - split off the utility functions from gl_weapon.cpp. 
Meaning there's only half as much code left to clean up.
 2018-04-29 23:38:26 +02:00
Christoph Oelckers
1345c8e7b4 - fixed: NewDecal should not be called unless it is guaranteed that the decal will be rendered. 
This left partially initialized items in the render list.
 2018-04-29 19:28:13 +02:00
Christoph Oelckers
9350eee0c0 - GLDrawList moved to hwrenderer/. 2018-04-29 12:56:06 +02:00
Christoph Oelckers
77b301612a - some refactoring of GLDrawList to remove implementation-specific parts from this class. 2018-04-29 12:32:21 +02:00
Christoph Oelckers
634b3cf413 - moved gl_spritelight out of gl/. This required a few more changes: 
* split gl_shadowmap.cpp into a GL dependent and an API independent part.
* gl_drawinfo must be kept around for the HUD sprite because it connects the renderer with the hardware indpendent part of the engine.
 2018-04-29 11:00:34 +02:00
Christoph Oelckers
819ea8f937 - reduced gl_spritelight.cpp to pure data setup so that it can be moved out of gl/. 
- added thread_local to some static arrays being used for setting up dynamic lights.

Right now it's of little consequence but these will have to be maintained per thread if the render data setup is done by worker tasks.
 2018-04-29 09:33:36 +02: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
Christoph Oelckers
d1720ad790 - GLSprite rework. 2018-04-28 20:02:17 +02:00
Christoph Oelckers
243e12bd8f - split gl_flats.cpp 2018-04-28 13:24:45 +02:00
Christoph Oelckers
c5641a0e72 - GLFlat split into API-dependent and -independent data. 
No resorting of the files yet.
 2018-04-28 12:34:09 +02:00
Christoph Oelckers
d694e19f01 - split off the data generation parts of gl_skydome.cpp 2018-04-28 00:50:42 +02:00
Christoph Oelckers
785a6c2ce5 - moved gl_sky.cpp 2018-04-28 00:22:25 +02:00
Christoph Oelckers
fe2bfc6f11 - moved the API-independent parts of the decal code to hwrenderer/. 2018-04-27 20:34:20 +02:00
Christoph Oelckers
0d7c2527f2 - finished decal render refactoring. 
Decals will now be processed into a list in the processing pass, allowing to use the vertex buffer even on GL3 hardware and to offload this part of the work to a multithreaded worker task.
 2018-04-27 20:18:52 +02:00
Christoph Oelckers
1ae2f06161 Merge branch 'wallwork' of https://github.com/coelckers/gzdoom into wallwork 2018-04-27 18:53:08 +02:00
Christoph Oelckers
58c0431396 - copied gl_SetupLights to hw_walls.cpp. 2018-04-27 18:53:01 +02:00
Christoph Oelckers
200848a487 Decal work. Not finished yet. 2018-04-27 11:40:23 +02:00
Christoph Oelckers
bbea6e7e3c Begin2D doesn't need a return type anymore 
This was to tell the caller that software 2D was in use, but that doesn't exist anymore
 2018-04-27 09:58:19 +02:00
Christoph Oelckers
fc0d673935 - moved the files 2018-04-27 00:28:30 +02:00
Christoph Oelckers
dd524b046e - GLWall is mostly clean, except some smaller things in gl_sky.cpp 2018-04-27 00:22:00 +02:00
Christoph Oelckers
937a2cf69f - abstracted the vertex allocator. 2018-04-26 20:07:56 +02:00
Christoph Oelckers
cf8ee3130b - gl_clock moved to hwrenderer. 2018-04-25 18:39:54 +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
bf81799701 - typo 2018-04-25 13:59:27 +02:00
Christoph Oelckers
81341ac6c5 - Moved all static variables in hw_renderhacks into HWDrawInfo 
- removed the profiling code from hw_renderhacks because it was broken in its current state and if still needed needs to be redone differently.
 2018-04-25 13:59:14 +02:00
Christoph Oelckers
f4e139485a - fixed return value of hw_CheckViewArea. 2018-04-25 00:30:35 +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
Christoph Oelckers
8d62ebd2f4 - renamed the functions in hw_fakeflat.cpp 2018-04-24 17:52:35 +02:00
Christoph Oelckers
0dcc6ec6d3 Merge branch 'master' of https://github.com/coelckers/gzdoom 
# Conflicts:
#	src/CMakeLists.txt
#	src/gl/renderer/gl_renderer.h
#	src/gl/scene/gl_portal.cpp
#	src/gl/scene/gl_scene.cpp
 2018-04-24 17:39:03 +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
Christoph Oelckers
e55b52f356 Moving the files to hwrenderer/ 2018-04-24 11:58:04 +02:00
Christoph Oelckers
5ca1fca8d1 - moved gl_clipper and gl_fakeflat to the hwrenderer folder because both files do not contain anything API specific. 2018-04-23 22:18:13 +02:00