WIP: 3d floor support in the map editor 3d mode. #966

crisisinaptica · 2018-11-24T16:07:46Z

@sirjuddington I'm putting this up here to better asses what has to be done.
It's far from ready. The more feedback everyone can provide about this the better.

eevee · 2018-11-24T22:20:30Z

Sorry for leaving this hanging for so long! I haven't gotten back to Doom stuff for a while.

Here's my own TODO list, though I can't guarantee it's entirely up to date:

Somewhat critical problem: a sector's 3D floors are ordered by height, but the selection in 3D mode is tracked by an index into that list of floors, which means the selection is wrong if you use mousewheel to move a selected 3D floor above/below another one

Maybe I should get rid of the duplicated extra_floor_t struct and instead give each sector just a list of the control sectors that affect it, then identify by those instead of by "extra floor index"? It is possible to have the same control sector mapped to two 3d floors, though. And having 3D floors ordered by height is useful in some places, e.g. when figuring out where gravity should drop you to while walking around in 3D mode.

Really wish I had faux flat/wall objects. Really, really wish I could just pass around sector pointers and bail if they're invalid.
Can't highlight or select an inner flat of a 3D floor
Mousewheel to change a regular ceiling height is super slow in my dump3 map; I think the full mapspecials recalculation thing is too expensive?

The right thing here is to make map specials update incrementally in real time (rather than the current approach of constantly re-scanning the entire map), but that's much more complicated and requires a whole dependency tree. Or, at least, incremental slopes would require that; incremental 3D floors would be much simpler, since there's only one way to make a 3D floor. Might be a reasonable way to get started on incremental specials.
There was some kind of problem I had that I can no longer remember, to do with modifying 3D floors in real-time, argh
Currently, most of the properties are taken from the wrong place — e.g., the floor/ceiling textures should use the control sector's offsets and rotations and whatnot. For the most part, the only property of the target sector that's actually used is its geometry.
Don't draw wall textures on lines that have the same 3D floor on both sides
I keep abruptly popping out of 3D mode and I'm not sure why, or if it's even my fault? It stopped for a while, then started again when I added lighting code.
Translucent flats need to be sorted by distance in order to draw correctly
With flats_use_vbo off, slopes aren't rendered. Oops! Fix seems straightforward, in renderFlat. (Not actually related to 3D floors but this is where I noticed it.)
Support palette blends
Make sure transferring the sector color is correct?
Handle light effects
- Flats need to propagate downwards to next floor
- Walls: oof, quads might need splitting (consider interaction with slopes too)
Draw walls on two-sided lines
- Support upper/lower flag as well
Sector info overlay still needs work
- Says "ceiling texture", "ceiling height", etc when looking at a floor; is that right?
- Flat lighting is wrong (I think mapspecials should intervene here)
- Doesn't know about "flat plane at ceiling height"
- Should probably show floor type?
- Haven't touched walls at all and not sure how that should even work
Make all the 3D mode keybindings do the right thing when highlighting a 3D floor
- changing wall texture, offset, scaling
- changing flat texture, panning, scaling
- resetting
- changing flat height, wall height (should also understand "flat plane at ceiling height" flag)
- changing linked lighting (flags relevant here too)
- changing unlinked lighting
- auto-align (!!!)
- floodfill selection
Did I break the error rendering of a missing flat?
Support Vavoom floors, too
STILL some bizarre rendering errors
- First time in 3D mode, the inside of a floor doesn't render; second time, it does?? what?
- Very rarely, the VBOs break when switching back to 2D mode
- Some sectors (without 3D floors!) don't have textures
- Modifying sectors in 3D mode can corrupt the polygons in very strange ways, presumably VBOs getting crossed
- 3D floors are now flickering between light levels; possibly trying to draw inside and outside flats simultaneously and they're z-fighting?
- When moving the mouse directly from one 3D floor to another, the highlight briefly flickers to the floor of the actual sector rather than the 3D floor
- 2D mode doesn't always correctly update VBOs when deleting a sector (or possibly while creating a new one, etc)
Code itself still has a bunch of TODOs

crisisinaptica · 2018-11-24T22:58:55Z

@eevee Super helpful! Many thanks. This is going to give me a lot to think about while reading the code.

sirjuddington · 2018-11-25T07:44:28Z

There are a few things I was going to do in the refactor/cleanup that may affect (and/or help) this, particularly to do with how sector floors/ceilings are stored and handled. If you look at the std_string_313_refactor branch, I've added a Surface struct to MapSector which represents a floor or ceiling plane. I'll likely be doing something like this in master, in which case extra flats for 3d floors can be stored as extra Surfaces in each MapSector

Ideally I'd like to completely rewrite the 2d/3d rendering code to use modern opengl and have 3d floors in mind from the ground up, but that would be a lot of work :P Though if I ever want to properly support previewing some more advanced GZDoom features in 3d mode i'd probably have to do that anyway :/

Gaerzi · 2018-11-25T18:01:17Z

Sector info overlay still needs work

Says "ceiling texture", "ceiling height", etc when looking at a floor; is that right?

For a non-Vavoom 3D floor, that makes sense, since the top of the floor is the control sector's ceiling. The terms "upper plane" and "lower plane" could be used instead but you'd have to keep the Vavoom type in mind because for them the upper plane of the 3D floor is the control sector's floor. (The control sector in a Vavoom floor having a negative height, with the floor above the ceiling.)

crisisinaptica · 2018-11-26T23:38:09Z

There are a few things I was going to do in the refactor/cleanup that may affect (and/or help) this, particularly to do with how sector floors/ceilings are stored and handled. If you look at the std_string_313_refactor branch, I've added a Surface struct to MapSector which represents a floor or ceiling plane. I'll likely be doing something like this in master, in which case extra flats for 3d floors can be stored as extra Surfaces in each MapSector

Ideally I'd like to completely rewrite the 2d/3d rendering code to use modern opengl and have 3d floors in mind from the ground up, but that would be a lot of work :P Though if I ever want to properly support previewing some more advanced GZDoom features in 3d mode i'd probably have to do that anyway :/

A complete rewrite with all the GZDoom bells and whistles would be the coolest thing, but since it's probably something that's not going to happen any time soon... Would It be OK (the second coolest thing) if I bring to this branch some of the changes you have done in 'std_string_313_refactor'? From that spot we could rework some of this and finish it.

As it stands now, far from complete and unpolished, it's OK for my needs with a couple more adjustments, but leaving this to rot being so close to something release worthy would be a shame.

sirjuddington · 2018-11-26T23:54:25Z

Hmm, I'd say wait until I add it in master, to avoid a merge conflict mess :P I am currently in the process of working on the MapEditor source files cleanup - I'll do the MapSector/Surface stuff along with it so it shouldn't be too much longer to wait.

Preparation for supporting 3D floors.

Lots of features are missing, there are no walls yet, sometimes the alpha doesn't work right, and 2D mode is broken. But it does work!

… draw order

Now each renderer just remembers its own VBO offsets per sector/flat, which makes more sense anyway since they have their own VBOs.

- VBOs are no longer corrupted when making 3D edits! This had haunted 3D floor rendering since the beginning, but the problem turned out to not be in the renderer at all -- rather, MapSpecials kept re-adding the same 3D floors to the target sectors on every update, without clearing the originals. The renderer would then dutifully create some flat structs, but because the geometry hadn't actually changed, the code that reassigns all the VBO offsets never ran, and the new structs had garbage offsets which wrote junk to who knows where. Now MapSpecials just nukes all the 3D floors on every update pass. A more robust solution will involve incremental updates, but this is good enough for now. It may still be possible for corruption to occur if a tag or special is changed in such a way that the total number of 3D floors changes, but currently you can only make such a change in 2D mode, and I believe VBOs are recreated from scratch when switching into 3D mode. - The "flat plane at ceiling height" flag is now supported. - Floor and ceiling panning, rotation, and scale are now correct when switching to 3D mode. They'd been unreliable for some time, and the culprit was just that the code that first creates VBOs doesn't check for those properties, but the code that updates existing VBOs does. - The 3D renderer's cached flats remember their control sector, so 3D floors now correctly check floor/ceiling properties on the control sector rather than the target sector. - Cleaned up VBO code a bit in general. updateSector no longer has a silly argument for whether to skip half its effort; Polygon2D's updateVBOData was removed, as it's now identical to writeToVBO; we no longer reserve twice as much VBO space as necessary.

The camera gravity is updated on a timer, so it could be called before the sector flats were calculated. The easy fix was to use the original extra_floors instead of the sector flats, which turned out to be easier anyway. As an added bonus, now gravity only checks for solid 3D floors.

This is necessary for 3D mode to know to update the floors when the control sector's height changes.

- The 3D info overlay is now aware when it's looking at the top or bottom plane of a 3D floor, and (mostly) correctly checks for the properties on the control sector. - Changing the height of a 3D floor's floor or ceiling with the mouse wheel now works correctly.

This was causing duplicated 3D floors and leading to more VBO corruption. It's no longer necessary, since we now recompute all specials for the entire map every time something changes.

By default, MapSector::getColour returns the sector color modified by the light level, so effectively the light level was being squared. Requesting the "fullbright" color fixes this.

…loor

(cherry picked from commit 6400c46dff4df41fe669954f378ee79657fb6935)

… flags like upper/lower texture for side) (cherry picked from commit e05a9b7b131a8974f446d5c355f79e6be77e9f24)

(cherry picked from commit c0f85ee4c6c800df7642e495755bf705e7182b22)

(cherry picked from commit fd6768e5ded0e177159d7e6c4675ba984ca13af9)

(cherry picked from commit c0a517efe1d886a1826fb328982a9e1f66032f4d)

(cherry picked from commit 8adbf4c9e0347d89dd565d71779ff492f77d8db6)

(cherry picked from commit 13bf9ffa99db807fbc5bef321bef5a19851f24dd)

…estination sectors. Fixes #1 (cherry picked from commit 4edf93ccd0b38e16d95e989a59fceefe6af220fb)

OrdinaryMagician · 2019-05-02T14:51:01Z

So when's this going to get picked up again?

axredneck · 2019-05-02T19:30:08Z

@OrdinaryMagician after refactoring of Slade.

sirjuddington · 2022-04-29T06:57:21Z

I've finally adapted this one to the latest codebase in #1358, so I'll close this PR to be continued there

crisisinaptica changed the title ~~Eevee 3d floors~~ WIP: 3d floor support in the map editor 3d mode. Nov 24, 2018

crisisinaptica force-pushed the eevee_3d_floors branch from 9b25b10 to f4f0390 Compare November 26, 2018 12:13

eevee and others added 22 commits December 1, 2018 16:39

Merge floors and ceilings in the 3D renderer

cde57ca

Preparation for supporting 3D floors.

WIP: Render 3D floors on 3D mode!

8e0acac

Lots of features are missing, there are no walls yet, sometimes the alpha doesn't work right, and 2D mode is broken. But it does work!

Draw both sides of 3D floor flats when appropriate, and partially fix…

926fc3a

… draw order

Initial support for drawing a selected 3D floor plane correctly

84b0cfe

Fix all the VBO sector stuff I broke

c7ca039

Now each renderer just remembers its own VBO offsets per sector/flat, which makes more sense anyway since they have their own VBOs.

Pass segs to setupQuad

c27242e

Trim a bit of duplicated stuff out of updateLine

12a132f

Very basic clumsy support for rendering the sides of 3D floors

88975f4

Factor out the line shading stuff

107b58c

Teach 3D mode to allow walking on 3D floors

2f9c993

Propagate updated times from control sectors to 3D floors

0c7dc38

This is necessary for 3D mode to know to update the floors when the control sector's height changes.

Stop applying individual line specials from the renderer

d108ebd

This was causing duplicated 3D floors and leading to more VBO corruption. It's no longer necessary, since we now recompute all specials for the entire map every time something changes.

Add support for flat light levels of 3D floors

ce795c9

Fix rendered light level of 3D floor flats

4989f75

By default, MapSector::getColour returns the sector color modified by the light level, so effectively the light level was being squared. Requesting the "fullbright" color fixes this.

Support "use upper/lower texture" 3D floor flags

0fd5290

Quick and dirty hack to avoid drawing a wall within a contiguous 3D f…

a6cc2e0

…loor

Minor fix plus clang format.

3925b08

3D floor editing improvements

9f55e10

(cherry picked from commit 6400c46dff4df41fe669954f378ee79657fb6935)

Cleanup

3bf1975

usernameak and others added 11 commits December 1, 2018 16:39

Made *ALMOST* fully working support for 3D floor side editing (except…

d0db236

… flags like upper/lower texture for side) (cherry picked from commit e05a9b7b131a8974f446d5c355f79e6be77e9f24)

DRAWBOTH on quads

d4f1f5c

(cherry picked from commit c0f85ee4c6c800df7642e495755bf705e7182b22)

Now 3D floors support scaling/offsets

e607a8d

(cherry picked from commit fd6768e5ded0e177159d7e6c4675ba984ca13af9)

Well-working 3D floor editing by faking sectors

31da378

(cherry picked from commit c0a517efe1d886a1826fb328982a9e1f66032f4d)

Add support for 3D floor flag 64

c910521

(cherry picked from commit 8adbf4c9e0347d89dd565d71779ff492f77d8db6)

Fixed crash on change texture, added 'Delete textuere'

ed5a181

(cherry picked from commit 13bf9ffa99db807fbc5bef321bef5a19851f24dd)

Cleanup

2cfb774

Now 3D floors account for the texture offsets on the lines of their d…

4384082

…estination sectors. Fixes #1 (cherry picked from commit 4edf93ccd0b38e16d95e989a59fceefe6af220fb)

Minor fixes.

4756767

Fix 3dFloor highlight rendering.

c61db53

Fix set texture offset in 3d floors sides.

02a129a

crisisinaptica force-pushed the eevee_3d_floors branch from f4f0390 to 02a129a Compare December 1, 2018 15:42

SeventhSentinel mentioned this pull request Sep 5, 2021

3D floors preview (editing) #205

Open

sirjuddington mentioned this pull request Apr 29, 2022

Map editor 3d floors support in 3d mode #1358

Merged

sirjuddington closed this Apr 29, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

WIP: 3d floor support in the map editor 3d mode. #966

WIP: 3d floor support in the map editor 3d mode. #966

crisisinaptica commented Nov 24, 2018

eevee commented Nov 24, 2018 •

edited

crisisinaptica commented Nov 24, 2018

sirjuddington commented Nov 25, 2018 •

edited

Gaerzi commented Nov 25, 2018 •

edited

crisisinaptica commented Nov 26, 2018 •

edited

sirjuddington commented Nov 26, 2018

OrdinaryMagician commented May 2, 2019

axredneck commented May 2, 2019

sirjuddington commented Apr 29, 2022

WIP: 3d floor support in the map editor 3d mode. #966

WIP: 3d floor support in the map editor 3d mode. #966

Conversation

crisisinaptica commented Nov 24, 2018

eevee commented Nov 24, 2018 • edited

crisisinaptica commented Nov 24, 2018

sirjuddington commented Nov 25, 2018 • edited

Gaerzi commented Nov 25, 2018 • edited

crisisinaptica commented Nov 26, 2018 • edited

sirjuddington commented Nov 26, 2018

OrdinaryMagician commented May 2, 2019

axredneck commented May 2, 2019

sirjuddington commented Apr 29, 2022

eevee commented Nov 24, 2018 •

edited

sirjuddington commented Nov 25, 2018 •

edited

Gaerzi commented Nov 25, 2018 •

edited

crisisinaptica commented Nov 26, 2018 •

edited