Hard Light Productions Forums
Modding, Mission Design, and Coding => FS2 Open Coding - The Source Code Project (SCP) => Nightly Builds => Topic started by: SirKnightly on March 07, 2023, 12:50:05 am
-
Here is the nightly for 07 March 2023 - Revision 2392a6cc7
Group: Win32-SSE2
nightly_20230307_2392a6cc7-builds-Win32-SSE2.zip (http://scp.indiegames.us/builds/nightly/20230307_2392a6cc7/nightly_20230307_2392a6cc7-builds-Win32-SSE2.zip) (Mirror (https://porphyrion.feralhosting.com/datacorder/builds/nightly/20230307_2392a6cc7/nightly_20230307_2392a6cc7-builds-Win32-SSE2.zip))
Group: MacOSX
nightly_20230307_2392a6cc7-builds-Mac.tar.gz (http://scp.indiegames.us/builds/nightly/20230307_2392a6cc7/nightly_20230307_2392a6cc7-builds-Mac.tar.gz) (Mirror (https://porphyrion.feralhosting.com/datacorder/builds/nightly/20230307_2392a6cc7/nightly_20230307_2392a6cc7-builds-Mac.tar.gz))
Group: Linux
nightly_20230307_2392a6cc7-builds-Linux.tar.gz (http://scp.indiegames.us/builds/nightly/20230307_2392a6cc7/nightly_20230307_2392a6cc7-builds-Linux.tar.gz) (Mirror (https://porphyrion.feralhosting.com/datacorder/builds/nightly/20230307_2392a6cc7/nightly_20230307_2392a6cc7-builds-Linux.tar.gz))
Group: Win64-SSE2
nightly_20230307_2392a6cc7-builds-x64-SSE2.zip (http://scp.indiegames.us/builds/nightly/20230307_2392a6cc7/nightly_20230307_2392a6cc7-builds-x64-SSE2.zip) (Mirror (https://porphyrion.feralhosting.com/datacorder/builds/nightly/20230307_2392a6cc7/nightly_20230307_2392a6cc7-builds-x64-SSE2.zip))
------------------------------------------------------------------------
commit 46d138669
Author: Mike Nelson
Commit: GitHub
Enhance Dynamic SEXPs with parent parameters (#5033)
code/parse/sexp.cpp | 67 ++++++++++++++++++-
code/parse/sexp.h | 9 +++
code/parse/sexp/DynamicSEXP.h | 2 +-
code/parse/sexp/EngineSEXP.cpp | 2 +-
code/parse/sexp/EngineSEXP.h | 2 +-
code/parse/sexp/LuaAISEXP.cpp | 3 +-
code/parse/sexp/LuaAISEXP.h | 2 +-
code/parse/sexp/LuaSEXP.cpp | 125 ++++++++++++++++++++++++++++++++++--
code/parse/sexp/LuaSEXP.h | 6 +-
fred2/sexp_tree.cpp | 42 +++++++++++-
fred2/sexp_tree.h | 2 +-
qtfred/src/ui/widgets/sexp_tree.cpp | 46 +++++++++++--
qtfred/src/ui/widgets/sexp_tree.h | 2 +-
13 files changed, 283 insertions(+), 27 deletions(-)
------------------------------------------------------------------------
commit 7b288deb6
Author: BMagnu
Commit: BMagnu
Add missing return statements
code/nebula/volumetrics.cpp | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
------------------------------------------------------------------------
commit 5be591a34
Author: BMagnu
Commit: BMagnu
Separate parsing from initialization and remove RAII
code/lab/renderer/lab_renderer.cpp | 3 +--
code/mission/missionparse.cpp | 3 +--
code/nebula/volumetrics.cpp | 9 +++++++--
code/nebula/volumetrics.h | 2 ++
4 files changed, 11 insertions(+), 6 deletions(-)
------------------------------------------------------------------------
commit 7893f0e3c
Author: BMagnu
Commit: GitHub
Remove superfluous comment
code/graphics/util/uniform_structs.h | 1 -
1 file changed, 1 deletion(-)
------------------------------------------------------------------------
commit c2a61c7d8
Author: BMagnu
Commit: GitHub
Update volumetric fog uniform buffer
code/graphics/util/uniform_structs.h | 23 +++++++++++++++++++----
1 file changed, 19 insertions(+), 4 deletions(-)
------------------------------------------------------------------------
commit b3502ba41
Author: Birk Magnussen
Commit: Birk Magnussen
Add GR debug scopes
code/graphics/opengl/gropengldeferred.cpp | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
------------------------------------------------------------------------
commit 391789098
Author: Birk Magnussen
Commit: Birk Magnussen
Don't render volumetrics when fog is disabled
code/graphics/opengl/gropengldeferred.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
------------------------------------------------------------------------
commit 2f4bea8b2
Author: Birk Magnussen
Commit: Birk Magnussen
Fix claaaaang
code/nebula/volumetrics.cpp | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
------------------------------------------------------------------------
commit 473f907a4
Author: Birk Magnussen
Commit: Birk Magnussen
Fix more warnings
code/nebula/volumetrics.cpp | 26 +++++++++++++-------------
lib/accidental-noise/vectortypes.h | 5 ++++-
2 files changed, 17 insertions(+), 14 deletions(-)
------------------------------------------------------------------------
commit 8af5d4cf9
Author: Birk Magnussen
Commit: Birk Magnussen
Tidy up more after lib
lib/accidental-noise/Imaging/imaging.h | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
------------------------------------------------------------------------
commit 58fd88a11
Author: Birk Magnussen
Commit: Birk Magnussen
Tidy up after lib's warnings
lib/accidental-noise/Expression/parsing.inl | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
------------------------------------------------------------------------
commit b50456c24
Author: Birk Magnussen
Commit: Birk Magnussen
Fix GCC Warns 2
code/nebula/volumetrics.cpp | 10 +++++-----
lib/accidental-noise/Expression/parsing.h | 2 +-
2 files changed, 6 insertions(+), 6 deletions(-)
------------------------------------------------------------------------
commit 97fde4d14
Author: Birk Magnussen
Commit: Birk Magnussen
Fix GCC Warns
code/nebula/volumetrics.h | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
------------------------------------------------------------------------
commit 5b06f8477
Author: Birk Magnussen
Commit: Birk Magnussen
Correct depth for FoV abberation
code/def_files/data/effects/volumetric-f.sdr | 7 +++++--
code/graphics/opengl/gropengldeferred.cpp | 2 ++
code/graphics/util/uniform_structs.h | 2 +-
3 files changed, 8 insertions(+), 3 deletions(-)
------------------------------------------------------------------------
commit e194e84c2
Author: Birk Magnussen
Commit: Birk Magnussen
Add FRED round trip support
code/nebula/volumetrics.h | 12 +++-
fred2/missionsave.cpp | 109 ++++++++++++++++++++++++++++++++++++-
qtfred/src/mission/missionsave.cpp | 109 ++++++++++++++++++++++++++++++++++++-
3 files changed, 226 insertions(+), 4 deletions(-)
------------------------------------------------------------------------
commit cfba7ec06
Author: BMagnu
Commit: BMagnu
optimize Shader performance
code/def_files/data/effects/volumetric-f.sdr | 58 +++++++++++++++-------------
1 file changed, 32 insertions(+), 26 deletions(-)
------------------------------------------------------------------------
commit 5e285e42b
Author: Birk Magnussen
Commit: Birk Magnussen
Set proper texture address mide
code/graphics/opengl/gropengldeferred.cpp | 5 ++++-
code/nebula/volumetrics.cpp | 4 ++--
2 files changed, 6 insertions(+), 3 deletions(-)
------------------------------------------------------------------------
commit 975b31dc9
Author: Birk Magnussen
Commit: Birk Magnussen
Fix nebula alpha
code/nebula/volumetrics.cpp | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
------------------------------------------------------------------------
commit 3a3d2c443
Author: BMagnu
Commit: BMagnu
Tidy up shader code
code/def_files/data/effects/volumetric-f.sdr | 18 ++++++++++--------
1 file changed, 10 insertions(+), 8 deletions(-)
------------------------------------------------------------------------
commit 4af5bf405
Author: BMagnu
Commit: BMagnu
Make volumetrics obey nebula quality settings
code/nebula/volumetrics.cpp | 18 +++++++++++++++---
1 file changed, 15 insertions(+), 3 deletions(-)
------------------------------------------------------------------------
commit 7827cb483
Author: BMagnu
Commit: BMagnu
Add Noise intnsity lab integration
code/lab/dialogs/lab_ui.cpp | 1 +
1 file changed, 1 insertion(+)
------------------------------------------------------------------------
commit db8292be0
Author: BMagnu
Commit: BMagnu
Add noise color intensity
code/def_files/data/effects/volumetric-f.sdr | 4 +++-
code/graphics/opengl/gropengldeferred.cpp | 1 +
code/graphics/util/uniform_structs.h | 3 ++-
code/nebula/volumetrics.cpp | 8 ++++++++
code/nebula/volumetrics.h | 3 +++
5 files changed, 17 insertions(+), 2 deletions(-)
------------------------------------------------------------------------
commit 1b1a8983e
Author: BMagnu
Commit: BMagnu
Properly check for uploaded textures
code/nebula/volumetrics.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
------------------------------------------------------------------------
commit 5e9dd9aef
Author: BMagnu
Commit: BMagnu
Calculate alpha for things rendered after the nebula
code/graphics/opengl/gropengldeferred.cpp | 7 ++--
code/math/vecmat.cpp | 24 +++++++++++++
code/math/vecmat.h | 32 +++++++++++++++++
code/nebula/volumetrics.cpp | 57 +++++++++++++++++++++++++++++--
code/nebula/volumetrics.h | 5 ++-
5 files changed, 117 insertions(+), 8 deletions(-)
------------------------------------------------------------------------
commit c342a2250
Author: BMagnu
Commit: BMagnu
handle 3d array access using define
code/nebula/volumetrics.cpp | 22 ++++++++++++++--------
1 file changed, 14 insertions(+), 8 deletions(-)
------------------------------------------------------------------------
commit 7f83dd8dd
Author: Birk Magnussen
Commit: Birk Magnussen
Fix volume map generation
code/nebula/volumetrics.cpp | 15 +++++++++++++--
1 file changed, 13 insertions(+), 2 deletions(-)
------------------------------------------------------------------------
commit dd1641fd1
Author: Birk Magnussen
Commit: Birk Magnussen
Fix coordinates
code/graphics/opengl/gropengldeferred.cpp | 2 +-
code/lab/renderer/lab_renderer.cpp | 5 ++---
code/nebula/volumetrics.cpp | 8 ++++----
3 files changed, 7 insertions(+), 8 deletions(-)
------------------------------------------------------------------------
commit 53b1dc690
Author: Birk Magnussen
Commit: Birk Magnussen
Enter values from empirical testing
code/nebula/volumetrics.cpp | 6 +++---
code/nebula/volumetrics.h | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
------------------------------------------------------------------------
commit 5392a0d9f
Author: Birk Magnussen
Commit: Birk Magnussen
Fix lab volumetrics
code/lab/renderer/lab_renderer.cpp | 5 +++++
code/parse/parselo.cpp | 2 +-
2 files changed, 6 insertions(+), 1 deletion(-)
------------------------------------------------------------------------
commit 2f0e2f591
Author: BMagnu
Commit: BMagnu
Adjust alpha of neb-affected effects
code/fireball/fireballs.cpp | 4 ++--
code/fireball/warpineffect.cpp | 3 ++-
code/model/modelrender.cpp | 26 ++++++++------------------
code/nebula/neb.cpp | 14 +++++++++++++-
code/nebula/neb.h | 8 +++++++-
code/nebula/volumetrics.cpp | 4 ++++
code/nebula/volumetrics.h | 2 ++
code/particle/particle.cpp | 4 ++--
code/ship/shield.cpp | 4 +---
code/ship/ship.cpp | 2 +-
code/weapon/beam.cpp | 8 ++++----
code/weapon/shockwave.cpp | 4 ++--
code/weapon/trails.cpp | 7 +++++--
code/weapon/weapons.cpp | 14 ++++++++++----
14 files changed, 63 insertions(+), 41 deletions(-)
------------------------------------------------------------------------
commit cc1e26dd2
Author: BMagnu
Commit: BMagnu
Fix skip_to_start_of_string_one_of
code/parse/parselo.cpp | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
------------------------------------------------------------------------
commit 14b37add7
Author: BMagnu
Commit: BMagnu
ImGui integration for neb settings
code/lab/dialogs/lab_ui.cpp | 41 +++++++++++++++++++++++++++++++++++++++++
code/lab/dialogs/lab_ui.h | 2 ++
code/nebula/volumetrics.h | 2 ++
3 files changed, 45 insertions(+)
------------------------------------------------------------------------
commit e1f071036
Author: BMagnu
Commit: BMagnu
Lab parse volumetric nebula
code/lab/renderer/lab_renderer.cpp | 7 ++++---
code/parse/parselo.cpp | 31 +++++++++++++++++++++++++++++++
code/parse/parselo.h | 1 +
3 files changed, 36 insertions(+), 3 deletions(-)
------------------------------------------------------------------------
commit 6b0f49cf3
Author: BMagnu
Commit: BMagnu
Begin Lab integration
code/lab/manager/lab_manager.cpp | 2 ++
code/lab/renderer/lab_renderer.cpp | 5 +++++
code/nebula/volumetrics.cpp | 2 +-
3 files changed, 8 insertions(+), 1 deletion(-)
------------------------------------------------------------------------
commit 2298c3fb3
Author: Birk Magnussen
Commit: Birk Magnussen
Properly unload volume textures
code/bmpman/bmpman.cpp | 6 +++---
freespace2/freespace.cpp | 2 ++
2 files changed, 5 insertions(+), 3 deletions(-)
------------------------------------------------------------------------
commit 8f697dd03
Author: Birk Magnussen
Commit: Birk Magnussen
Fix Noise, Fix Scale, Fix Pos
code/def_files/data/effects/volumetric-f.sdr | 14 +++++++-------
code/graphics/util/uniform_structs.h | 2 +-
code/nebula/volumetrics.cpp | 11 +++++++++--
code/nebula/volumetrics.h | 7 ++++---
4 files changed, 21 insertions(+), 13 deletions(-)
------------------------------------------------------------------------
commit a60512cfa
Author: BMagnu
Commit: BMagnu
Add parsing for nebula settings
code/def_files/data/effects/volumetric-f.sdr | 6 ++
code/graphics/2d.h | 1 +
code/graphics/opengl/gropengldeferred.cpp | 8 +-
code/graphics/opengl/gropenglshader.cpp | 4 +-
code/nebula/volumetrics.cpp | 115 +++++++++++++++++++++++++++
code/nebula/volumetrics.h | 17 ++--
6 files changed, 141 insertions(+), 10 deletions(-)
------------------------------------------------------------------------
commit 2fd24ecf2
Author: BMagnu
Commit: BMagnu
Begin integration into mission
code/graphics/opengl/gropengldeferred.cpp | 7 +++----
code/mission/missionparse.cpp | 10 ++++++++++
code/mission/missionparse.h | 2 ++
3 files changed, 15 insertions(+), 4 deletions(-)
------------------------------------------------------------------------
commit 9cdbf4b5e
Author: BMagnu
Commit: BMagnu
Load configurable noise
code/def_files/data/effects/volumetric-f.sdr | 9 +++--
code/graphics/opengl/gropengldeferred.cpp | 10 +++--
code/graphics/util/uniform_structs.h | 5 ++-
code/nebula/volumetrics.cpp | 55 ++++++++++++++++++----------
code/nebula/volumetrics.h | 30 +++++++--------
5 files changed, 64 insertions(+), 45 deletions(-)
------------------------------------------------------------------------
commit 6eee49a86
Author: Birk Magnussen
Commit: Birk Magnussen
Optimize smoothing mode of volumetrics shader
code/def_files/data/effects/volumetric-f.sdr | 22 +++++++++++++---------
1 file changed, 13 insertions(+), 9 deletions(-)
------------------------------------------------------------------------
commit b6f0e8e4e
Author: Birk Magnussen
Commit: Birk Magnussen
Build noise lib in release
lib/accidental-noise/CMakeLists.txt | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
------------------------------------------------------------------------
commit 1a5c39154
Author: BMagnu
Commit: BMagnu
Very basic volumetric noise setup
code/CMakeLists.txt | 2 +
code/def_files/data/effects/volumetric-f.sdr | 5 +-
code/graphics/opengl/gropengldeferred.cpp | 2 +-
code/nebula/volumetrics.cpp | 35 +-
lib/CMakeLists.txt | 2 +
lib/accidental-noise/CMakeLists.txt | 7 +
.../Expression/expressionbuilder.h | 42 +
.../Expression/expressionbuilder.inl | 733 +++++++++
lib/accidental-noise/Expression/parsing.h | 84 ++
lib/accidental-noise/Expression/parsing.inl | 337 +++++
lib/accidental-noise/Imaging/imaging.h | 153 ++
lib/accidental-noise/Imaging/imaging.inl | 1321 +++++++++++++++++
lib/accidental-noise/LICENSE | 22 +
lib/accidental-noise/VM/coordinate.h | 31 +
lib/accidental-noise/VM/coordinate.inl | 153 ++
lib/accidental-noise/VM/hashing.h | 17 +
lib/accidental-noise/VM/hashing.inl | 151 ++
lib/accidental-noise/VM/instruction.h | 219 +++
lib/accidental-noise/VM/kernel.h | 188 +++
lib/accidental-noise/VM/kernel.inl | 1086 ++++++++++++++
lib/accidental-noise/VM/noise_gen.h | 81 +
lib/accidental-noise/VM/noise_gen.inl | 1434 ++++++++++++++++++
lib/accidental-noise/VM/noise_lut.h | 15 +
lib/accidental-noise/VM/noise_lut.inl | 571 ++++++++
lib/accidental-noise/VM/random_gen.h | 246 ++++
lib/accidental-noise/VM/utility.h | 87 ++
lib/accidental-noise/VM/vm.h | 137 ++
lib/accidental-noise/VM/vm.inl | 1548 ++++++++++++++++++++
lib/accidental-noise/anl.h | 18 +
lib/accidental-noise/anl_impl.cpp | 13 +
lib/accidental-noise/templates/tarray1.h | 193 +++
lib/accidental-noise/templates/tarray2.h | 149 ++
lib/accidental-noise/templates/tarray3.h | 155 ++
lib/accidental-noise/templates/tarrays.h | 872 +++++++++++
lib/accidental-noise/templates/tcurve.h | 173 +++
lib/accidental-noise/templates/tvec2d.h | 241 +++
lib/accidental-noise/templates/tvec3d.h | 316 ++++
lib/accidental-noise/templates/tvec4d.h | 313 ++++
lib/accidental-noise/vectortypes.h | 155 ++
39 files changed, 11294 insertions(+), 13 deletions(-)
------------------------------------------------------------------------
commit 03e3bdb40
Author: BMagnu
Commit: BMagnu
cleanup noise
code/nebula/volumetrics.cpp | 25 ++++++++----------
code/nebula/volumetrics.h | 2 +-
code/source_groups.cmake | 1 -
code/utils/noise.h | 64 ---------------------------------------------
4 files changed, 12 insertions(+), 80 deletions(-)
------------------------------------------------------------------------
commit c127b2b98
Author: BMagnu
Commit: BMagnu
Make Edge smoothing toggleable
code/def_files/data/effects/volumetric-f.sdr | 4 ++++
code/graphics/2d.h | 2 ++
code/graphics/opengl/gropengldeferred.cpp | 3 ++-
code/graphics/opengl/gropenglshader.cpp | 2 ++
code/nebula/volumetrics.cpp | 4 ++++
code/nebula/volumetrics.h | 3 +++
6 files changed, 17 insertions(+), 1 deletion(-)
------------------------------------------------------------------------
commit 15d078aad
Author: BMagnu
Commit: BMagnu
Add edge smoothing and fix size ordering
code/def_files/data/effects/volumetric-f.sdr | 17 +++++++++++++++--
code/graphics/opengl/gropengldeferred.cpp | 3 ++-
code/nebula/volumetrics.cpp | 2 +-
code/nebula/volumetrics.h | 4 ++--
4 files changed, 20 insertions(+), 6 deletions(-)
------------------------------------------------------------------------
commit 92fc99359
Author: Birk Magnussen
Commit: Birk Magnussen
Remove UB due to Non uniform control flow
code/def_files/data/effects/volumetric-f.sdr | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
------------------------------------------------------------------------
commit 88dd1f843
Author: Birk Magnussen
Commit: Birk Magnussen
Disable noise
code/def_files/data/effects/volumetric-f.sdr | 26 +++++++++++++-------------
code/graphics/opengl/gropengldeferred.cpp | 8 ++++----
code/graphics/util/uniform_structs.h | 4 ++--
code/nebula/volumetrics.cpp | 10 +++++-----
code/nebula/volumetrics.h | 4 ++--
5 files changed, 26 insertions(+), 26 deletions(-)
------------------------------------------------------------------------
commit 084085a53
Author: Birk Magnussen
Commit: Birk Magnussen
Make noise loadable
code/def_files/data/effects/volumetric-f.sdr | 2 +-
code/nebula/volumetrics.cpp | 4 ++--
code/nebula/volumetrics.h | 6 +++---
3 files changed, 6 insertions(+), 6 deletions(-)
------------------------------------------------------------------------
commit eb81b50c5
Author: BMagnu
Commit: BMagnu
Actually load noise volume texture
code/graphics/opengl/gropengldeferred.cpp | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
------------------------------------------------------------------------
commit 6e91356f4
Author: BMagnu
Commit: BMagnu
Properly pass volumetric pso/size
code/def_files/data/effects/volumetric-f.sdr | 8 +++++---
code/graphics/opengl/gropengldeferred.cpp | 4 +++-
code/graphics/util/uniform_structs.h | 9 +++++++--
code/nebula/volumetrics.cpp | 18 ++++++++++++++++--
code/nebula/volumetrics.h | 9 ++++++++-
5 files changed, 39 insertions(+), 9 deletions(-)
------------------------------------------------------------------------
commit 9dbf5df15
Author: BMagnu
Commit: BMagnu
Add Noise sampling to volumetric shader
code/def_files/data/effects/volumetric-f.sdr | 14 +++++++++++++-
code/graphics/opengl/gropengldeferred.cpp | 3 +++
code/graphics/util/uniform_structs.h | 2 ++
code/nebula/volumetrics.cpp | 6 +++---
code/nebula/volumetrics.h | 2 +-
5 files changed, 22 insertions(+), 5 deletions(-)
------------------------------------------------------------------------
commit c2c02470d
Author: BMagnu
Commit: BMagnu
Add noise generation
code/nebula/volumetrics.cpp | 40 +++++++++++++++++++++++++++++++++++++++-
code/nebula/volumetrics.h | 22 +++++++++++++++++++++-
code/utils/noise.h | 2 +-
3 files changed, 61 insertions(+), 3 deletions(-)
------------------------------------------------------------------------
commit e78fbfb9b
Author: BMagnu
Commit: BMagnu
Add worley noise
code/source_groups.cmake | 1 +
code/utils/noise.h | 64 ++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 65 insertions(+)
------------------------------------------------------------------------
commit 756f0a973
Author: BMagnu
Commit: BMagnu
Incorporate new COLLIDE_ALL for nebula rendering
code/globalincs/vmallocator.h | 3 +++
code/nebula/volumetrics.cpp | 30 ++++++++++++++++--------------
code/nebula/volumetrics.h | 2 +-
3 files changed, 20 insertions(+), 15 deletions(-)
------------------------------------------------------------------------
commit bef3f33f6
Author: BMagnu
Commit: BMagnu
Always to sample buffer assign
code/nebula/volumetrics.cpp | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
------------------------------------------------------------------------
commit d0f051847
Author: BMagnu
Commit: BMagnu
reduce 3d texture build from O(n^3) to O(n^2)
code/nebula/volumetrics.cpp | 30 ++++++++++++++++++++----------
1 file changed, 20 insertions(+), 10 deletions(-)
------------------------------------------------------------------------
commit 3042846e6
Author: Birk Magnussen
Commit: Birk Magnussen
Fix model-based volume generation
code/graphics/opengl/gropengldeferred.cpp | 2 +-
code/nebula/volumetrics.cpp | 13 ++++++++-----
code/nebula/volumetrics.h | 4 ++--
3 files changed, 11 insertions(+), 8 deletions(-)
------------------------------------------------------------------------
commit 8b75bbbb0
Author: BMagnu
Commit: BMagnu
Add model read for 3d texture sample
code/nebula/volumetrics.cpp | 31 ++++++++++++++++++++++++++-----
code/nebula/volumetrics.h | 6 +++++-
2 files changed, 31 insertions(+), 6 deletions(-)
------------------------------------------------------------------------
commit 9220b4859
Author: BMagnu
Commit: BMagnu
Fix Typo and test oversampling
code/def_files/data/effects/volumetric-f.sdr | 6 +++---
code/graphics/opengl/gropengldeferred.cpp | 2 +-
code/graphics/util/uniform_structs.h | 2 +-
code/nebula/volumetrics.cpp | 4 ++--
code/nebula/volumetrics.h | 6 +++---
5 files changed, 10 insertions(+), 10 deletions(-)
------------------------------------------------------------------------
commit f7f2b5f02
Author: BMagnu
Commit: BMagnu
Encapsulate 3d texture render in volumetrics class
code/graphics/opengl/gropengldeferred.cpp | 8 ++--
code/nebula/volumetrics.cpp | 65 +++++++++++++++++++++++-------
code/nebula/volumetrics.h | 67 +++++++++----------------------
3 files changed, 74 insertions(+), 66 deletions(-)
------------------------------------------------------------------------
commit 2531a31b1
Author: BMagnu
Commit: BMagnu
tidyup parameters
code/def_files/data/effects/volumetric-f.sdr | 1 +
code/graphics/opengl/gropengldeferred.cpp | 37 +++++++-----------------
code/nebula/volumetrics.cpp | 36 ++++++++++++++++++++++++
code/nebula/volumetrics.h | 42 ++++++++++++++++++++++++++++
4 files changed, 89 insertions(+), 27 deletions(-)
------------------------------------------------------------------------
commit 1371dc3a0
Author: BMagnu
Commit: BMagnu
Add attribution before I forget
code/def_files/data/effects/volumetric-f.sdr | 5 +++++
1 file changed, 5 insertions(+)
------------------------------------------------------------------------
commit 4c3024e5f
Author: BMagnu
Commit: BMagnu
Add Beer-Powder absorption for diffuse lighting
code/def_files/data/effects/volumetric-f.sdr | 15 +++++++++++++--
code/graphics/opengl/gropengldeferred.cpp | 16 +++++++++++-----
code/graphics/util/uniform_structs.h | 3 ++-
3 files changed, 26 insertions(+), 8 deletions(-)
------------------------------------------------------------------------
commit a9a110e8f
Author: BMagnu
Commit: BMagnu
Add Heyney Greenstein Scattering
code/def_files/data/effects/volumetric-f.sdr | 10 +++++++++-
code/graphics/opengl/gropengldeferred.cpp | 3 +++
code/graphics/util/uniform_structs.h | 3 ++-
3 files changed, 14 insertions(+), 2 deletions(-)
------------------------------------------------------------------------
commit a71dbbab6
Author: BMagnu
Commit: BMagnu
Tidy up shader and prepare for diffuse lighting
code/def_files/data/effects/volumetric-f.sdr | 27 ++++++++++++++-------------
code/graphics/opengl/gropengldeferred.cpp | 17 +++++++++++++++--
code/graphics/util/uniform_structs.h | 4 +++-
3 files changed, 32 insertions(+), 16 deletions(-)
------------------------------------------------------------------------
commit 3e8be9c8a
Author: BMagnu
Commit: BMagnu
Fix emissive blur
code/def_files/data/effects/volumetric-f.sdr | 12 +++++-------
code/graphics/opengl/gropengldeferred.cpp | 23 ++++++++++++++++-------
code/graphics/util/uniform_structs.h | 8 +++-----
3 files changed, 24 insertions(+), 19 deletions(-)
------------------------------------------------------------------------
commit 9ac262579
Author: Birk Magnussen
Commit: Birk Magnussen
Document Emissive Attempts
code/def_files/data/effects/volumetric-f.sdr | 27 +++++++++++++++++++++-----
code/graphics/opengl/gropengldeferred.cpp | 29 +++++++++++++++++-----------
code/graphics/opengl/gropengldraw.cpp | 1 +
code/graphics/util/uniform_structs.h | 9 +++++++--
4 files changed, 48 insertions(+), 18 deletions(-)
------------------------------------------------------------------------
commit dbc2cb1c2
Author: BMagnu
Commit: BMagnu
prepare volumetric shader for multi-influence color
code/def_files/data/effects/volumetric-f.sdr | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
------------------------------------------------------------------------
commit 3c942fc40
Author: BMagnu
Commit: BMagnu
Proper step calculation based on nebula parameters
code/def_files/data/effects/volumetric-f.sdr | 9 ++++-----
code/graphics/opengl/gropengldeferred.cpp | 9 +++++++--
code/graphics/util/uniform_structs.h | 3 +--
3 files changed, 12 insertions(+), 9 deletions(-)
------------------------------------------------------------------------
commit 5f48e5599
Author: BMagnu
Commit: BMagnu
Proper alpha-considering ray marching
code/def_files/data/effects/volumetric-f.sdr | 34 +++++++++++++++++++---------
code/graphics/opengl/gropengldeferred.cpp | 4 ++++
code/graphics/util/uniform_structs.h | 2 ++
3 files changed, 29 insertions(+), 11 deletions(-)
------------------------------------------------------------------------
commit a5f634885
Author: Birk Magnussen
Commit: Birk Magnussen
Get volumetric ray marching working
code/def_files/data/effects/volumetric-f.sdr | 38 +++++++++++++++++++++++-----
code/graphics/opengl/gropengltexture.cpp | 5 +++-
code/nebula/volumetrics.h | 27 ++++++++++++++++++++
3 files changed, 63 insertions(+), 7 deletions(-)
------------------------------------------------------------------------
commit 9de6beb4c
Author: Birk Magnussen
Commit: Birk Magnussen
First working raycast
code/def_files/data/effects/deferred-f.sdr | 3 +-
code/def_files/data/effects/volumetric-f.sdr | 26 +++++++++++++++
code/graphics/2d.h | 1 +
code/graphics/opengl/gropengldeferred.cpp | 48 +++++++++++++++++++++++-----
code/graphics/opengl/gropenglshader.cpp | 3 ++
code/graphics/util/uniform_structs.h | 6 ++++
code/nebula/volumetrics.cpp | 20 ++----------
code/nebula/volumetrics.h | 21 +++++++++++-
code/source_groups.cmake | 1 +
9 files changed, 101 insertions(+), 28 deletions(-)
------------------------------------------------------------------------
commit d3701166a
Author: BMagnu
Commit: BMagnu
Properly clear new composite buffer
code/graphics/opengl/gropengldeferred.cpp | 1 +
code/graphics/opengl/gropengldraw.cpp | 7 ++++---
2 files changed, 5 insertions(+), 3 deletions(-)
------------------------------------------------------------------------
commit e1db2ca59
Author: BMagnu
Commit: BMagnu
Hooks into deferred draw code
code/graphics/opengl/gropengldeferred.cpp | 15 ++++++++++++++-
code/graphics/opengl/gropengldraw.cpp | 2 +-
2 files changed, 15 insertions(+), 2 deletions(-)
------------------------------------------------------------------------
commit 063a567fe
Author: BMagnu
Commit: BMagnu
Being volumetrics calculations
code/nebula/volumetrics.cpp | 42 ++++++++++++++++++++++++++++++++++++++++++
code/nebula/volumetrics.h | 3 +++
code/source_groups.cmake | 2 ++
3 files changed, 47 insertions(+)
------------------------------------------------------------------------
commit c32c65535
Author: BMagnu
Commit: BMagnu
Keep Emissive texture intact during deferred render step
code/bmpman/bm_internal.h | 2 +-
code/bmpman/bmpman.cpp | 9 +++++++--
code/def_files/data/effects/deferred-clear-f.sdr | 2 ++
code/def_files/data/effects/deferred-f.sdr | 3 ++-
code/graphics/opengl/gropengldeferred.cpp | 15 ++++++++-------
code/graphics/opengl/gropengldraw.cpp | 19 +++++++++++++++++++
code/graphics/opengl/gropengldraw.h | 1 +
7 files changed, 40 insertions(+), 11 deletions(-)
------------------------------------------------------------------------
commit 91d274cd6
Author: BMagnu
Commit: BMagnu
Add 3D-Texture support
code/bmpman/bmpman.cpp | 74 ++++++++++++++++++++++++++++++++
code/bmpman/bmpman.h | 28 +++++++++++-
code/graphics/grinternal.h | 1 +
code/graphics/opengl/gropengltexture.cpp | 28 +++++++++---
4 files changed, 123 insertions(+), 8 deletions(-)
------------------------------------------------------------------------
commit 288148218
Author: mjn-mixael
Commit: mjn-mixael
fix rendering of jump nodes
code/model/modelrender.cpp | 13 +++++++++++--
code/model/modelrender.h | 3 ++-
code/scripting/api/libs/ui.cpp | 22 +++++++++++++++-------
3 files changed, 28 insertions(+), 10 deletions(-)
------------------------------------------------------------------------
commit 661732a45
Author: mjn-mixael
Commit: mjn-mixael
only load the model in the retail ui
code/missionui/missionbrief.cpp | 44 +++++++++++++++++++++--------------------
1 file changed, 23 insertions(+), 21 deletions(-)
------------------------------------------------------------------------
commit 856997326
Author: mjn-mixael
Commit: mjn-mixael
some cleanup
code/missionui/missionbrief.cpp | 21 +--------------------
1 file changed, 1 insertion(+), 20 deletions(-)
------------------------------------------------------------------------
commit d52c2da8b
Author: mjn-mixael
Commit: mjn-mixael
take a break youve earned it
code/model/modelrender.cpp | 6 ++++++
1 file changed, 6 insertions(+)
------------------------------------------------------------------------
commit c6a1639a8
Author: mjn-mixael
Commit: mjn-mixael
scpui methods required for handling closeup briefing icon stuff
code/missionui/missionbrief.cpp | 36 +++++++++++----
code/missionui/missionbrief.h | 10 ++++-
code/model/modelrender.cpp | 73 +++++++++++++++++-------------
code/model/modelrender.h | 8 +++-
code/scripting/api/libs/ui.cpp | 78 +++++++++++++++++++++++++++++++++
code/scripting/api/objs/shipclass.cpp | 4 +-
code/scripting/api/objs/weaponclass.cpp | 4 +-
7 files changed, 166 insertions(+), 47 deletions(-)