1
0
Fork 0
mirror of https://github.com/AquariaOSE/Aquaria.git synced 2024-11-29 03:33:48 +00:00
Aquaria/BBGE
fgenesis c44c67a063 Worldmap overhaul, part 1
In short:
- No more grid-for-alpha; everything uses generated textures now
  (With proper bilinear filtering so it looks like the old method)
- All tiles are now shown partially uncovered at the same time;
  selecting one is no longer needed
- Gems can now be local (associated to a tile) or global.
  Local games move with their tile, global ones stay where they were placed

Background:
Originally there were two possible implementations of how to render the world map:
- One used write-alpha-to-texture to implement graual uncovering.
- The other (permanently enabled) used the DrawGrid to render the map tiles
  as a fine grid, each little square having its own alpha value
The downside of the first method was that it didn't look as good as the
second, so i guess that's why it was never fully finished.
The main downside of the second method was that it burned a lot of vertices
just to do alpha, so only one tile at a time could show the detailed grid.

I also never liked how an entire tile was effectively fully uncovered once
the map was first entered, taking away a lot of the exploration feeling
that could have been there if everything that hasn't been explored would be
completely invisible.
I've added this worldmap uncovering method as an optional config param,
<WorldMap revealMethod="1"/> but i've decided to fully switch over now.

Things left to be done:
- create a WorldMapRender instance only once and keep the tiles across map loads
- add debug option to reload/recreate worldmap at runtime
- cleanup gem storage and carry over the player gem properly (ged rid of std::list)
- remove "worldmap" grid render type
- Add more user "pyramid" gems as world map markers. More colors!
- check that gems and beacons still work as they should
2024-11-15 03:12:14 +01:00
..
ActionInput.cpp warning fixes, signed vs unsigned mismatch, cleanups, c++98 compat 2024-04-16 01:43:36 +02:00
ActionInput.h
ActionMapper.cpp Get rid of a lot of gcc warnings 2021-01-11 12:28:27 +01:00
ActionMapper.h Fix ACTION_MENU* input to be sent as intended, broke in a7c2d054a2 iirc 2021-01-12 14:24:30 +01:00
ActionSet.cpp warning fixes, signed vs unsigned mismatch, cleanups, c++98 compat 2024-04-16 01:43:36 +02:00
ActionSet.h warning fixes, signed vs unsigned mismatch, cleanups, c++98 compat 2024-04-16 01:43:36 +02:00
ActionStatus.cpp Add MOUSE_BUTTON_REAL_* mapping IDs because sometimes we need to handle unmapped mouse buttons 2024-09-22 02:36:18 +02:00
ActionStatus.h Add MOUSE_BUTTON_REAL_* mapping IDs because sometimes we need to handle unmapped mouse buttons 2024-09-22 02:36:18 +02:00
AfterEffect.cpp Changes to rendering logic, incl water surface flicker fix, plus other fixes. 2024-04-25 03:33:02 +02:00
AfterEffect.h Changes to rendering logic, incl water surface flicker fix, plus other fixes. 2024-04-25 03:33:02 +02:00
Base.cpp make dmon optional at compile time, and a dedicated runtime option 2024-06-27 23:43:26 +02:00
Base.h make dmon optional at compile time, and a dedicated runtime option 2024-06-27 23:43:26 +02:00
BaseText.h Build fixes for Linux, some warnings and compatibility fixes for C++17 and up 2023-05-25 16:58:08 +02:00
bithacks.h remove zlib, libpng, glpng and related code; add some stb libs; rework texture loading 2022-03-31 21:03:40 +02:00
BitmapFont.cpp warning fixes, signed vs unsigned mismatch, cleanups, c++98 compat 2024-04-16 01:43:36 +02:00
BitmapFont.h BmpFont usage is now a ref instead of a ptr, const-ify glfont 2023-05-31 17:08:52 +02:00
CMakeLists.txt integrate directory watching for mod gfx in dev mode, and reload texture files that change 2024-06-25 04:49:44 +02:00
Cocoa.mm
Core.cpp fix missed break in prev^2 commit 2024-10-15 04:11:30 +02:00
Core.h Change the text input box to use SDL textinput events 2024-10-15 04:07:22 +02:00
DarkLayer.cpp Changes to rendering logic, incl water surface flicker fix, plus other fixes. 2024-04-25 03:33:02 +02:00
DarkLayer.h Changes to rendering logic, incl water surface flicker fix, plus other fixes. 2024-04-25 03:33:02 +02:00
DataStructures.cpp Rewrite SceneEditor level generation and skinning, use light pink to designate areas that should not be skinned 2022-07-06 08:59:55 +02:00
DataStructures.h Reduce Game::fillGrid() complexity from O(n^2) to O(n) when trimming 2024-11-04 04:47:34 +01:00
DebugFont.cpp fix a warning 2024-09-22 03:23:51 +02:00
DebugFont.h Build fixes for Linux, some warnings and compatibility fixes for C++17 and up 2023-05-25 16:58:08 +02:00
DirWatcher.cpp make dmon optional at compile time, and a dedicated runtime option 2024-06-27 23:43:26 +02:00
DirWatcher.h integrate directory watching for mod gfx in dev mode, and reload texture files that change 2024-06-25 04:49:44 +02:00
Emitter.cpp tentative fix for particle flip not working properly in some cases 2023-10-20 03:53:29 +02:00
EngineEnums.h remove RenderObject::blendEnabled and cleanup the blend code a bit 2022-05-19 01:34:31 +02:00
Event.cpp warning fixes, signed vs unsigned mismatch, cleanups, c++98 compat 2024-04-16 01:43:36 +02:00
Event.h warning fixes, signed vs unsigned mismatch, cleanups, c++98 compat 2024-04-16 01:43:36 +02:00
FmodOpenALBridge.cpp warning fixes, signed vs unsigned mismatch, cleanups, c++98 compat 2024-04-16 01:43:36 +02:00
FmodOpenALBridge.h
FrameBuffer.cpp unbind framebuffer after init; fixes loading bar screen staying black 2024-05-07 00:44:04 +02:00
FrameBuffer.h Changes to rendering logic, incl water surface flicker fix, plus other fixes. 2024-04-25 03:33:02 +02:00
GameKeyNames.cpp
GameKeyNames.h
GameKeys.h warning fixes, signed vs unsigned mismatch, cleanups, c++98 compat 2024-04-16 01:43:36 +02:00
GLLoad.cpp fix issues with glDrawBuffersARB() code path in prev commit 2024-04-26 03:28:07 +02:00
GLLoad.h remove zlib, libpng, glpng and related code; add some stb libs; rework texture loading 2022-03-31 21:03:40 +02:00
Gradient.cpp Preliminary support for vertial orientation: 2024-04-28 02:08:38 +02:00
Gradient.h Build fixes for Linux, some warnings and compatibility fixes for C++17 and up 2023-05-25 16:58:08 +02:00
Image.cpp save savefile previews as png. this finally kills .zga format, but it's kept for backwards compat 2024-11-09 03:46:52 +01:00
Image.h save savefile previews as png. this finally kills .zga format, but it's kept for backwards compat 2024-11-09 03:46:52 +01:00
Interpolators.cpp make both spline modes toggle-able ("assist" mode) 2024-07-07 05:36:21 +02:00
Interpolators.h make both spline modes toggle-able ("assist" mode) 2024-07-07 05:36:21 +02:00
Joystick.cpp warning fixes, signed vs unsigned mismatch, cleanups, c++98 compat 2024-04-16 01:43:36 +02:00
Joystick.h warning fixes, signed vs unsigned mismatch, cleanups, c++98 compat 2024-04-16 01:43:36 +02:00
Localization.cpp
Localization.h
MathFunctions.h Get rid of a lot of gcc warnings 2021-01-11 12:28:27 +01:00
MT.cpp warning fixes, signed vs unsigned mismatch, cleanups, c++98 compat 2024-04-16 01:43:36 +02:00
MT.h
OpenGLStubs.h Changes to rendering logic, incl water surface flicker fix, plus other fixes. 2024-04-25 03:33:02 +02:00
OSFunctions.cpp Support _mods/modname/mod-info.xml in addition to the old _mods/modname.xml 2024-11-04 22:38:29 +01:00
OSFunctions.h Support _mods/modname/mod-info.xml in addition to the old _mods/modname.xml 2024-11-04 22:38:29 +01:00
ParticleEffect.cpp first step towards making the render process const 2022-05-19 05:17:00 +02:00
ParticleManager.cpp remove iprof and BBGE_PROF (#74) 2022-03-17 20:50:42 +01:00
Particles.h tentative fix for particle flip not working properly in some cases 2023-10-20 03:53:29 +02:00
Precacher.cpp warning fixes, signed vs unsigned mismatch, cleanups, c++98 compat 2024-04-16 01:43:36 +02:00
Precacher.h Rework texture loading, part 1 2023-05-31 00:55:16 +02:00
Quad.cpp remove last traces of GL_BLEND/glBlendFunc() manipulation 2024-01-11 23:05:47 +01:00
Quad.h editor: fix multi-select, scaling, sideways-scaling, texcoords 2023-10-21 00:33:49 +02:00
QuadGrid.cpp Add RenderState to be passed through the scene graph 2022-05-20 01:04:19 +02:00
QuadGrid.h Build fixes for Linux, some warnings and compatibility fixes for C++17 and up 2023-05-25 16:58:08 +02:00
ReadXML.cpp remove zlib, libpng, glpng and related code; add some stb libs; rework texture loading 2022-03-31 21:03:40 +02:00
ReadXML.h
Rect.h Cleanup underwater checks, fix rectangular water bubbles 2023-06-23 15:05:05 +02:00
Refcounted.h Drop textures when no longer needed 2023-05-31 01:36:50 +02:00
RenderBase.cpp
RenderBase.h Changes to rendering logic, incl water surface flicker fix, plus other fixes. 2024-04-25 03:33:02 +02:00
RenderGrid.cpp only update VBO if texcoords actually change 2023-10-25 01:52:03 +02:00
RenderGrid.h warning fixes, signed vs unsigned mismatch, cleanups, c++98 compat 2024-04-16 01:43:36 +02:00
RenderObject.cpp very minor perf thing: skip some RenderObject child checks when there are no children 2024-07-13 06:48:30 +02:00
RenderObject.h fix broken scrolling in mod selector in vertical mode 2024-04-28 13:15:41 +02:00
RenderObject_inline.h don't update render water surface framebuffer when off screen 2024-04-28 04:04:30 +02:00
RenderObjectLayer.cpp remove RenderObjectLayer::update. now all layers are updated, always. 2024-05-12 18:01:43 +02:00
RenderRect.cpp Remove RenderObject::setColorMult() hack and related members 2022-05-21 16:31:10 +02:00
RenderState.cpp remove last traces of GL_BLEND/glBlendFunc() manipulation 2024-01-11 23:05:47 +01:00
RenderState.h remove last traces of GL_BLEND/glBlendFunc() manipulation 2024-01-11 23:05:47 +01:00
RoundedRect.cpp Add RenderState to be passed through the scene graph 2022-05-20 01:04:19 +02:00
RoundedRect.h Build fixes for Linux, some warnings and compatibility fixes for C++17 and up 2023-05-25 16:58:08 +02:00
ScreenTransition.cpp Changes to rendering logic, incl water surface flicker fix, plus other fixes. 2024-04-25 03:33:02 +02:00
ScreenTransition.h Build fixes for Linux, some warnings and compatibility fixes for C++17 and up 2023-05-25 16:58:08 +02:00
ScriptObject.cpp
ScriptObject.h More RenderObject slimming; reorder members, split out motion blur data + collideRadius, add new CollideQuad type 2022-05-18 19:44:42 +02:00
Shader.cpp Rework & cleanup CMake project files 2022-04-07 02:38:39 +02:00
Shader.h Change some stuff for butt-endian architectures 2021-01-11 12:28:27 +01:00
SimpleIStringStream.h fix derp in 4c52a147b0 2022-09-23 18:21:36 +02:00
SkeletalSprite.cpp bspline point gen is now properly integrated and only called while in the editor. 2024-07-07 03:30:54 +02:00
SkeletalSprite.h add AC_SET_FH bone command; rework bone frames; some skel cleanups 2023-12-21 06:04:09 +01:00
Slider.cpp
Slider.h
SoundManager.cpp Rework & cleanup CMake project files 2022-04-07 02:38:39 +02:00
SoundManager.h
SpawnParticleData.cpp remove RenderObject::blendEnabled and cleanup the blend code a bit 2022-05-19 01:34:31 +02:00
SplineGrid.cpp ocd fix 2024-07-08 01:54:13 +02:00
SplineGrid.h make both spline modes toggle-able ("assist" mode) 2024-07-07 05:36:21 +02:00
StateMachine.cpp
StateMachine.h
StateManager.cpp Build fixes for Linux, some warnings and compatibility fixes for C++17 and up 2023-05-25 16:58:08 +02:00
StateManager.h warning fixes, signed vs unsigned mismatch, cleanups, c++98 compat 2024-04-16 01:43:36 +02:00
StringBank.cpp very slightly more verbose loading 2023-06-01 12:59:07 +02:00
StringBank.h warning fixes, signed vs unsigned mismatch, cleanups, c++98 compat 2024-04-16 01:43:36 +02:00
Texture.cpp Worldmap overhaul, part 1 2024-11-15 03:12:14 +01:00
Texture.h Worldmap overhaul, part 1 2024-11-15 03:12:14 +01:00
TextureMgr.cpp integrate directory watching for mod gfx in dev mode, and reload texture files that change 2024-06-25 04:49:44 +02:00
TextureMgr.h integrate directory watching for mod gfx in dev mode, and reload texture files that change 2024-06-25 04:49:44 +02:00
Tile.cpp typo; fix tile wavy-effect flip (this effectively made numpad 5+6 effects the same) 2024-09-22 04:32:18 +02:00
Tile.h don't lose tile flags when changing solidness; update grid when flipping solid tile 2024-09-23 23:29:10 +02:00
TileRender.cpp make editor outline not so dull, closer to what it was 2024-05-06 04:27:28 +02:00
TileRender.h fixes to SceneEditor, some more things are working again 2023-10-20 00:35:25 +02:00
Tileset.cpp more editor fixes: 2023-10-25 00:46:12 +02:00
Tileset.h more editor fixes: 2023-10-25 00:46:12 +02:00
TTFFont.cpp remove last traces of GL_BLEND/glBlendFunc() manipulation 2024-01-11 23:05:47 +01:00
TTFFont.h Build fixes for Linux, some warnings and compatibility fixes for C++17 and up 2023-05-25 16:58:08 +02:00
Vector.cpp Get rid of a lot of gcc warnings 2021-01-11 12:28:27 +01:00
Vector.h fix Hair, now using VBO and working 2023-10-26 22:18:19 +02:00
VertexBuffer.cpp fix some oversights in vertex buffer binding cache 2024-01-11 22:59:26 +01:00
VertexBuffer.h warning fixes, signed vs unsigned mismatch, cleanups, c++98 compat 2024-04-16 01:43:36 +02:00
Window.cpp fixes to window size management, fullscreen transition, etc 2021-01-12 11:06:09 +01:00
Window.h fixes to window size management, fullscreen transition, etc 2021-01-12 11:06:09 +01:00
Window_SDL1.cpp fixes to window size management, fullscreen transition, etc 2021-01-12 11:06:09 +01:00
Window_SDL2.cpp Experimenting with GL debug context and GL_ARB_debug_output 2023-08-09 02:34:12 +02:00