Magnus Norddahl
92bd752935
Move drawerargs globals into a class and make them local
2017-01-29 07:49:04 +01:00
Rachael Alexanderson
2fb82aaa9f
Revert "- Fully implemented Graf's level.PreserveSectorColor() changes into the software renderers."
...
This reverts commit 2f9453bc86
.
# Conflicts:
# src/swrenderer/line/r_line.cpp
# src/swrenderer/line/r_renderdrawsegment.cpp
# src/swrenderer/things/r_decal.cpp
# src/swrenderer/things/r_wallsprite.cpp
2017-01-28 17:37:57 -05:00
Magnus Norddahl
4afac0f2cc
Force all drawing to go through DrawerStyle
2017-01-28 16:36:39 +01:00
Rachael Alexanderson
2f9453bc86
- Fully implemented Graf's level.PreserveSectorColor() changes into the software renderers.
2017-01-28 09:53:24 -05:00
Magnus Norddahl
8fceb60532
Removed unused variable
2017-01-28 08:40:31 +01:00
Magnus Norddahl
bd35d1d39f
Remove ds_fcolormap
2017-01-28 08:19:21 +01:00
Magnus Norddahl
dbf9cd5de5
Remove a few more drawerargs
2017-01-28 08:17:31 +01:00
Magnus Norddahl
9eebe3e940
Remove unused drawer args
2017-01-28 08:04:11 +01:00
Magnus Norddahl
fe40ad200e
Remove the goto in RenderDecal::Render!
2017-01-28 07:13:52 +01:00
Magnus Norddahl
5f38b15635
Move colfunc family of globals into a DrawerStyle class and localize its usage
2017-01-28 07:08:59 +01:00
alexey.lysiuk
6a826f37bd
Fixed compilation with GCC/Clang
...
No more 'error: cannot jump from this goto statement to its label'
2017-01-26 22:21:22 +02:00
Magnus Norddahl
ed05a2edd3
Create CameraLight class
2017-01-26 10:22:54 +01:00
Magnus Norddahl
4bbf1ba11c
Move visibility stuff into LightVisibility
2017-01-26 09:49:07 +01:00
Magnus Norddahl
933f2d116a
Move DrewAVoxel to VisibleSpriteList
2017-01-26 08:39:44 +01:00
Magnus Norddahl
34f85569b4
Change RenderTranslucentPass to be a singleton
2017-01-26 08:36:28 +01:00
Magnus Norddahl
8b0304c1e3
Remove static from RenderFogBoundary
2017-01-26 08:24:44 +01:00
Magnus Norddahl
29dcea49d7
Move RenderDrawSegment to its own file
2017-01-26 08:13:39 +01:00
Magnus Norddahl
6899b351a2
Create class for draw segment list
2017-01-26 08:01:44 +01:00
Magnus Norddahl
2821c15795
Rename drawseg_t to DrawSegment
2017-01-26 07:03:27 +01:00
Magnus Norddahl
9d9395c855
Updated the copyright
2017-01-26 06:59:20 +01:00
Magnus Norddahl
348b73eb83
Fix gcc warning
2017-01-25 03:45:57 +01:00
Magnus Norddahl
86d9594d6e
Convert r_walldraw to a class
2017-01-24 08:41:35 +01:00
Magnus Norddahl
b256f6ed89
Make wallsetup globals local to where they are used
2017-01-24 07:06:47 +01:00
Magnus Norddahl
ac74a7a1e0
Refactor wall setup into ProjectedWallLine and ProjectWallTexcoords
2017-01-24 06:50:17 +01:00
Magnus Norddahl
12271cbfb5
Remove the 1000 portal segment limit and make WallPortals private to RenderPortal
2017-01-24 05:31:39 +01:00
Magnus Norddahl
946ab93ff6
Remove unused friend declaration
2017-01-24 05:00:11 +01:00
Magnus Norddahl
f94cced13d
Move ColormapLight to r_light
2017-01-24 04:24:04 +01:00
Magnus Norddahl
ca8f71b561
Remove the need for RenderPlayerSprites::SetupSpriteScale
2017-01-24 04:19:43 +01:00
Magnus Norddahl
ba6094be2e
Detach player sprites from VisibleSprite
2017-01-24 04:15:54 +01:00
Magnus Norddahl
07acd9375b
The memset antipattern cannot be used on classes with a virtual table
2017-01-24 02:28:32 +01:00
Rachael Alexanderson
03226e5a0a
Merge https://github.com/coelckers/gzdoom
...
# Conflicts:
# src/r_things.cpp
2017-01-23 00:17:25 -05:00
Magnus Norddahl
112085ebff
Split Clear into two functions
2017-01-19 03:19:31 +01:00
Magnus Norddahl
e94cb3f114
Rename visplane_t to VisiblePlane
2017-01-19 03:11:49 +01:00
Magnus Norddahl
9eef7f9b32
Make visplanes hash list private
2017-01-19 03:02:32 +01:00
Magnus Norddahl
a92771431b
Changed visible plane list to use the shared frame memory allocator instead of using its own internal free list
2017-01-19 01:47:58 +01:00
Magnus Norddahl
111b5c5469
Add support for repeating skies in the TC sky drawer
2017-01-19 00:12:54 +01:00
Magnus Norddahl
8788a9e788
- Change all sky drawing code use to use the sky drawers
...
- Add support for drawing repeating skies in the sky drawers
- Add the old 4 column sky fade optimization to the 1 column variant (fixes speed regression when 4col was removed)
- Remove skyplane globals
- Remove walldraw code used to draw the old skies
2017-01-19 00:02:51 +01:00
Magnus Norddahl
9e0ae21197
Move fakeceiling and fakefloor into the inner loop
2017-01-17 02:32:23 +01:00
Magnus Norddahl
cc0c0f0236
Fix not copying the shade variable first
2017-01-17 02:27:59 +01:00
Magnus Norddahl
8e72e094ce
Fix floor brightness affects sprites not in sector
2017-01-17 02:16:13 +01:00
Magnus Norddahl
e154ff888d
Implement the todo that someone left in the source code
2017-01-17 01:43:45 +01:00
Magnus Norddahl
906c944895
Merge colormap selection into one function
2017-01-17 01:30:12 +01:00
Magnus Norddahl
2848ca53dc
Merge remote-tracking branch 'gzdoom/master' into qzdoom
...
# Conflicts:
# src/r_things.cpp
# src/r_things.h
2017-01-16 23:05:34 +01:00
Magnus Norddahl
6c76c8534b
Change visstyle_t back to how it was in ZDoom and stop using it internally in the swrenderer
2017-01-16 16:23:02 +01:00
Magnus Norddahl
1c3440e391
Merge remote-tracking branch 'gzdoom/master' into qzdoom
...
# Conflicts:
# src/r_plane.cpp
# src/r_plane.h
2017-01-16 06:03:21 +01:00
Magnus Norddahl
433eb77c37
Moved DrawSprite to VisibleSprite and marked all its variables as protected
2017-01-16 05:43:56 +01:00
Magnus Norddahl
55131a7a6d
Rename vissprite_t to VisibleSprite, convert it into a base class and lower all variables if possible. Remove unused fields and unions.
2017-01-16 05:26:22 +01:00
Magnus Norddahl
57d8b0e34c
Rewrite VisibleSpriteList to use TArray
2017-01-16 03:46:05 +01:00
Magnus Norddahl
cd9043fd94
Make RenderActorView private
2017-01-15 23:03:58 +01:00
Magnus Norddahl
f6cc75fad5
Convert r_clipsegment into a class
2017-01-15 22:57:42 +01:00
Magnus Norddahl
74e1cea9c3
Removed openings array
2017-01-15 22:21:21 +01:00
Magnus Norddahl
e02aece40a
Added a generic memory allocator for memory needed for a frame
2017-01-15 21:45:21 +01:00
Magnus Norddahl
601ddb270d
Create a class for the viewport
2017-01-15 04:06:52 +01:00
Magnus Norddahl
42535b17f1
Rename FRenderer::ClearBuffer to SetClearColor
2017-01-15 03:21:35 +01:00
Magnus Norddahl
f9175561bb
Change RenderTarget global to be an internal swrenderer variable
2017-01-15 03:19:03 +01:00
Magnus Norddahl
aaee6e333f
Mark PrecacheTexture private and remove unneeded declarations
2017-01-15 02:50:37 +01:00
Magnus Norddahl
4c12ba740f
Remove SetWindow from FRenderer interface
2017-01-15 02:46:43 +01:00
Magnus Norddahl
1e7015643d
Remove ErrorCleanup from FRenderer interface
2017-01-15 02:04:49 +01:00
Magnus Norddahl
3093aaadc9
Remove SetupFrame and CopyStackedViewParameters from FRenderer interface
2017-01-15 01:54:25 +01:00
Magnus Norddahl
1b043bb46c
Minor cleanup in r_swrenderer
2017-01-15 01:36:57 +01:00
Magnus Norddahl
5ea28897af
Move r_scene into a class
2017-01-14 02:25:02 +01:00
Magnus Norddahl
ca046d26c5
Make particle texture slightly higher quality
2017-01-13 16:12:43 +01:00
Magnus Norddahl
edd9b6c69c
Change the shape of the particle texture
2017-01-13 15:43:06 +01:00
Magnus Norddahl
e1506df8a6
Change globvis to be picked up from the r_light values in softpoly
2017-01-13 15:22:22 +01:00
alexey.lysiuk
8260bbbe77
Fixed compilation with GCC/Clang
...
No more 'error: cannot jump from this goto statement to its label / jump bypasses variable initialization'
2017-01-13 15:44:23 +02:00
Magnus Norddahl
5d9cc6a706
let 'forcenoskystretch' also apply to sky mode 2
2017-01-13 13:23:00 +01:00
Magnus Norddahl
9723078121
Removed dc_texturemid
2017-01-12 22:52:17 +01:00
Magnus Norddahl
bd8d2f501f
Remove dc_light_list
2017-01-12 22:11:25 +01:00
Magnus Norddahl
9e940b4287
Remove basecolormap global
2017-01-12 21:29:19 +01:00
Magnus Norddahl
929e07697d
Remove foggy global
2017-01-12 20:13:21 +01:00
Magnus Norddahl
f912b4ab8b
Convert r_actualextralight global to a function
2017-01-12 19:09:13 +01:00
Magnus Norddahl
40f79371f5
Remove GlobVis global as it apparently wasn't very global!
2017-01-12 18:38:27 +01:00
Magnus Norddahl
80e1844d6c
Split r_main into r_viewport, r_scene and r_light
2017-01-12 16:21:46 +01:00
Magnus Norddahl
c80860cd5d
Split r_visibleplane into more files
2017-01-11 23:27:35 +01:00
Magnus Norddahl
2988a5fe87
Convert r_visibleplane into classes
2017-01-11 23:08:24 +01:00
Magnus Norddahl
9f8ac7e498
Convert r_skyplane into a class
2017-01-11 22:09:06 +01:00
Magnus Norddahl
0885ff44a0
Convert r_flatplane and r_slopeplane into classes
2017-01-11 21:59:26 +01:00
Magnus Norddahl
fc29958dc7
Convert r_fogboundary to a class
2017-01-11 21:33:28 +01:00
Magnus Norddahl
3f8e5d26b8
Rename RenderBSP to RenderOpaquePass and RenderTranslucent to RenderTranslucentPass
2017-01-11 20:42:39 +01:00
Magnus Norddahl
6f1836b68b
Move classes in r_visiblesprite to their own files
2017-01-11 19:50:07 +01:00
Magnus Norddahl
32b91dd978
Convert r_visiblesprite to classes
2017-01-11 19:33:02 +01:00
Magnus Norddahl
8ed66791e7
Change define to enum
2017-01-11 18:38:51 +01:00
Magnus Norddahl
48b4915f5b
Convert r_playersprite to a class
2017-01-11 18:35:20 +01:00
Magnus Norddahl
ee2811450d
Convert r_wallsprite to a class
2017-01-11 18:28:19 +01:00
Magnus Norddahl
7bed0ffeb6
Convert r_voxel to a class
2017-01-11 18:25:14 +01:00
Magnus Norddahl
164af7264f
Convert r_sprite into a class
2017-01-11 18:17:28 +01:00
Magnus Norddahl
deae5bb1a6
Convert r_particle to a class
2017-01-11 18:14:04 +01:00
Magnus Norddahl
7dfb46b8d9
Convert r_decal to a class
2017-01-11 18:10:51 +01:00
Magnus Norddahl
4b96d7377f
Detach voxel and wallsprite projection from (normal) sprite projection and move the type decision making to RenderBSP::AddSprites
2017-01-11 17:59:29 +01:00
Magnus Norddahl
dce3a1c81c
Move remaining parts of r_things into r_visiblesprite
2017-01-11 15:41:42 +01:00
Magnus Norddahl
f288d589ff
Move defines and enums to where they are used
2017-01-11 15:09:35 +01:00
Magnus Norddahl
72762e583f
Move AddSprites to r_bsp and R_ProjectSprite to r_sprite
2017-01-11 15:02:36 +01:00
Magnus Norddahl
361bb11b13
Remove -28 offset to fix issue 0000012
2017-01-10 20:07:51 +01:00
Magnus Norddahl
4be291fb61
Fix divide by zero (issue 0000022)
2017-01-10 18:25:06 +01:00
Magnus Norddahl
ece8e95853
Revert range adjustment (can't make out if this is wrong or not - if it is, it is wrong across the entire function)
2017-01-10 15:16:55 +01:00
Magnus Norddahl
751bd120ac
Fix warning about potential uninitialized lightfiller reported by gcc
2017-01-10 15:14:55 +01:00
Magnus Norddahl
8fc6660a4a
Disable SSE stuff
2017-01-10 13:45:14 +01:00
Magnus Norddahl
c4573fa343
Disable SSE on arm
2017-01-10 13:39:57 +01:00
alexey.lysiuk
079f3bd78c
Fixed compilation errors with GCC/Clang
...
No more 'error: cannot jump from this goto statement to its label'
2017-01-09 17:26:19 +02:00
Rachael Alexanderson
6c04439315
- Fixed compile errors with last merge.
2017-01-09 10:16:24 -05:00
Magnus Norddahl
4c67a717f8
Remove drawerargs from r_things
2017-01-09 14:56:29 +01:00
Magnus Norddahl
4eac238d26
Remove commented out code
2017-01-09 14:52:50 +01:00
Magnus Norddahl
bb2806c9ca
Remove WallSpriteTile global
2017-01-09 14:51:34 +01:00
Magnus Norddahl
b9024f87a0
Remove unused globals
2017-01-09 14:48:19 +01:00
Magnus Norddahl
65fa807433
Remove spriteshade global
2017-01-09 14:46:57 +01:00
Magnus Norddahl
3b5dc96f4a
Move player sprite scale to r_playersprite and make it private
2017-01-09 14:28:31 +01:00
Magnus Norddahl
da85de01de
Move prototype
2017-01-09 14:22:00 +01:00
Magnus Norddahl
6d642b1906
Move FCoverageBuffer to r_voxel
2017-01-09 14:20:47 +01:00
Magnus Norddahl
579199a246
Move R_DrawVisSprite to r_sprite and move R_DrawMaskedColumn to r_draw
2017-01-09 13:53:02 +01:00
Magnus Norddahl
3b7bc2d1e5
Add NO_DRAWERGEN define
2017-01-08 04:54:11 +01:00
Magnus Norddahl
bf850bb788
Merge remote-tracking branch 'gzdoom/master' into qzdoom
...
# Conflicts:
# src/swrenderer/scene/r_things.cpp
2017-01-07 17:44:15 +01:00
Magnus Norddahl
e806b9424c
Move r_portal into a class
2017-01-05 04:55:26 +01:00
Magnus Norddahl
4bcc34f01c
Move openings deinit to r_memory
2017-01-04 19:13:58 +01:00
Magnus Norddahl
47ca45bf18
Convert FakeSide to enum class
2017-01-04 19:03:33 +01:00
Magnus Norddahl
5f8075f726
Convert r_3dfloors to a class
2017-01-04 18:54:14 +01:00
Magnus Norddahl
28732d63d2
Move r_bsp into a class
2017-01-04 15:39:47 +01:00
Magnus Norddahl
c396e7f949
Make r_bsp and r_line stop sharing floorplane and ceiling plane variables
2017-01-04 05:10:16 +01:00
Magnus Norddahl
5caea5a256
Fix clipping regression caused by splitting clip handling from line rendering
2017-01-04 04:49:10 +01:00
Magnus Norddahl
dba81db198
Move material multiplication out of inner light loop
2017-01-03 21:16:21 +01:00
Magnus Norddahl
b3cee51fd0
Fixed clang errors about the gotos leaving certain variables uninitialized
2017-01-03 20:53:40 +01:00
Magnus Norddahl
abdc7f9ff1
Move WindowLeft, WindowRight, MirrorFlags to r_portal
2017-01-03 19:25:00 +01:00
Magnus Norddahl
e25645df46
Move r_fogboundary to line folder
2017-01-03 19:16:37 +01:00
Magnus Norddahl
863f17ada9
Fix function names
2017-01-03 19:08:02 +01:00
Magnus Norddahl
a4c0e29913
Moved r_line into a class and implemented proper parameter passing between r_line and r_bsp, r_walldraw, r_wallsetup, r_decal, r_wallsprite, r_fogboundary, r_portal and r_playersprite
2017-01-03 18:57:48 +01:00
Magnus Norddahl
aa11534033
Remove unused (and broken in swrenderer) back boolean from FakeFlat interface
2017-01-03 18:55:12 +01:00
Magnus Norddahl
e7ab5dddb6
Put add the copyright statement from the files the code originated from
2017-01-03 07:17:54 +01:00
Magnus Norddahl
a9fbd421fb
Move line handling to r_line and drawseg drawing to r_drawsegment and then remove r_segs
2017-01-03 07:13:40 +01:00
Magnus Norddahl
4125da9fc3
Fix speed regression caused by the DrawerThread object being recreated every frame
2017-01-03 04:29:06 +01:00
alexey.lysiuk
41a107a89f
Fixed compilation with GCC/Clang
...
No more 'error: cannot jump from this goto statement to its label' because of 'note: jump bypasses variable initialization'
2017-01-02 17:57:26 +02:00
Magnus Norddahl
c61e9c7fe2
Add attenuated point lights
2017-01-02 06:52:50 +01:00
Magnus Norddahl
388da85937
Move some more vars
2017-01-02 03:46:48 +01:00
Magnus Norddahl
34bd21449b
Move line working variables to r_line
2017-01-02 03:12:51 +01:00
Magnus Norddahl
81658d7c88
Move line handling to more files
2017-01-01 10:28:35 +01:00
Magnus Norddahl
3967156d62
Moved remaining parts of r_plane to r_visibleplane
2016-12-31 14:45:41 +01:00
Magnus Norddahl
07826ccd2f
Move variables closer to their correct location
2016-12-31 14:15:06 +01:00
Magnus Norddahl
0884a09b38
Move floorclip, ceilingclip, floorplane and ceilingplane closer to their location
2016-12-31 14:00:12 +01:00
Magnus Norddahl
165134f1a7
Make wallshade private to r_segs
2016-12-31 13:12:09 +01:00
Magnus Norddahl
ce864655e3
Remove wallshade global from R_RenderDecals
2016-12-31 12:59:43 +01:00
Magnus Norddahl
918904074a
Remove wallshade global from R_DrawFogBoundary
2016-12-31 12:57:48 +01:00
Magnus Norddahl
6fd3691da4
Remove unused declarations
2016-12-31 12:50:57 +01:00
Magnus Norddahl
ad15d56a81
Move files into additional folders
2016-12-31 12:45:07 +01:00
Magnus Norddahl
2f96dcc1a8
Move fog boundary drawing to r_fogboundary
2016-12-31 12:04:23 +01:00
Magnus Norddahl
f354cc8c67
Move flat and slope plane drawing to their own files, isolate and privatize their working variables
2016-12-31 11:42:49 +01:00
Magnus Norddahl
447b162534
Move sky rendering to its own file
2016-12-31 10:19:31 +01:00
alexey.lysiuk
e3a909c296
Fixed compilation with GCC/Clang
...
No more 'error: cannot jump from this goto statement to its label'
2016-12-30 16:05:57 +02:00
Magnus Norddahl
99e263e1b3
Decal rendering to r_decal
2016-12-30 08:31:02 +01:00
Magnus Norddahl
50c525161b
Move wallsprite handling to r_wallsprite
2016-12-30 08:11:06 +01:00
Magnus Norddahl
98026c5711
Move player sprite handling to r_playersprite
2016-12-30 07:51:39 +01:00
Magnus Norddahl
bf237799bf
Move particle drawing to r_particle
2016-12-30 07:26:25 +01:00
Magnus Norddahl
f133b4caa4
Move vissprite to its own file
2016-12-30 07:15:10 +01:00
Magnus Norddahl
80e369541a
Move visplane_t to its own file
2016-12-30 06:42:20 +01:00
Magnus Norddahl
775deeb151
Move variables closer to their correct location
2016-12-30 06:15:10 +01:00
Magnus Norddahl
41d0e7c663
Move portal drawing to r_portal
2016-12-30 06:08:47 +01:00
Magnus Norddahl
60c0dcc3c7
Move openings to r_memory
2016-12-30 05:35:25 +01:00
Magnus Norddahl
74e1955afa
Move more to r_draw_segment
2016-12-30 05:01:42 +01:00
Magnus Norddahl
b615b1b497
Move some draw segment functions to r_draw_segment
2016-12-29 01:06:24 +01:00
Magnus Norddahl
18a551f936
Move all clip segment handling to r_clip_segment and make its working data private
2016-12-28 12:07:55 +01:00
Magnus Norddahl
1b284ecf3b
Create files for clip, draw and portal segments
2016-12-28 07:04:13 +01:00
Magnus Norddahl
b2a0f02f68
Remove unused prototype
2016-12-28 02:21:32 +01:00
Magnus Norddahl
db53d9c706
Remove r_local header
2016-12-28 01:56:37 +01:00
Magnus Norddahl
259d724106
Move R_GetColumn to walldraw and create header file
2016-12-28 01:35:22 +01:00
Magnus Norddahl
f8010854c3
Move colfunc and friends to r_draw and change them to member function pointers
2016-12-27 23:53:47 +01:00
Magnus Norddahl
a94fee0e5d
Rename R_ActiveDrawers to R_Drawers
2016-12-27 08:54:37 +01:00
Magnus Norddahl
272b302294
Create SWPixelFormatDrawers for pal and bgra drawers
2016-12-27 08:47:51 +01:00
Magnus Norddahl
398001b6cb
Move code into R_UpdateFuzzPos
2016-12-27 07:45:10 +01:00
Magnus Norddahl
4554cf45f1
Remove duplicate prototype entry
2016-12-27 07:41:30 +01:00
Magnus Norddahl
325fa20a02
Add R_DrawFogBoundaryLine and move R_DrawFogBoundary to a source file closer to its correct location
2016-12-27 07:40:35 +01:00
Magnus Norddahl
f1cd91922b
Move to correct header
2016-12-27 07:32:21 +01:00
Magnus Norddahl
5a7765910f
Merge R_SetupSpanBits with R_SetSpanSource and rename it to R_SetSpanTexture
2016-12-27 07:30:29 +01:00
Magnus Norddahl
4d0cc9e7bb
Remove old voxel slab drawer
2016-12-27 07:25:11 +01:00
Magnus Norddahl
46e9a0cdf9
Remove zdoom ifdef version as we aren't doing merges from there anymore
2016-12-27 07:20:22 +01:00
Magnus Norddahl
49903af394
Remove 4 column wall drawers
2016-12-27 07:18:04 +01:00
Magnus Norddahl
2659090e1c
Move renders into folders
2016-12-27 06:31:55 +01:00