Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add a cvar to convert compressed binary model formats #9

Open
wants to merge 2,430 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
2430 commits
Select commit Hold shift + click to select a range
3fe0b2d
Renamed DX12/Vulkan specific cvars with a r_vk/r_dx prefix
RobertBeckebans Apr 2, 2024
11eb7e8
Set execution flag on cmake-linux-retail.sh
RobertBeckebans Apr 2, 2024
ef2b398
Check for valid allocations before freeing Bink Decoder bundles
SRSaunders Apr 2, 2024
e7cd9bb
When playing testVideos, skip sRGB to linear conversion only when con…
SRSaunders Apr 2, 2024
1875560
Fix testVideo to check for viewDef->viewEntitys (i.e. 3D/2D) not cons…
SRSaunders Apr 2, 2024
d716661
Don't let VR options of other VR builds to break rendering of the non…
RobertBeckebans Apr 10, 2024
75bee81
Create cmake-vs2022-arm64.bat
CodeLikeCXK Apr 22, 2024
99ff365
Update cmake-vs2022-arm64.bat
CodeLikeCXK Apr 22, 2024
f8a5329
Read Blender lights directly through the KHR_lights_punctual glTF ext…
RobertBeckebans Apr 24, 2024
0a1a591
Updated .plan
RobertBeckebans Apr 24, 2024
82455c1
macOS: Support non-system Vulkan SDK installs & enable cmake regen fo…
SRSaunders Apr 29, 2024
c7f5dd7
Update README to document DXC_CUSTOM_PATH as an alternative to modify…
SRSaunders Apr 29, 2024
719c0bc
Merge branch 'RobertBeckebans:master' into master
CodeLikeCXK Apr 29, 2024
0d59622
Merge pull request #883 from SRSaunders/macos-cmake-regen
RobertBeckebans Apr 30, 2024
117b41c
Support linked group instances by TrenchBroom. close #700
RobertBeckebans May 1, 2024
7d0f68b
Merge branch 'master' of github.com:RobertBeckebans/RBDOOM-3-BFG
RobertBeckebans May 1, 2024
4357e0f
Restored internal envprobe fallback if map has no envprobes. close #836
RobertBeckebans May 1, 2024
9933722
Removed unused alternative idTarget_Level in EndLevel.cpp
RobertBeckebans May 1, 2024
bbaffcd
Save .bcanim files under generated/cameraanim/. close #866
RobertBeckebans May 1, 2024
4fe3823
Added filter option all to extractResourceFile cmd #166
RobertBeckebans May 1, 2024
6966fda
WIP .idwav -> .wav export code
RobertBeckebans May 1, 2024
33b74a7
extractResourceFiles can export .wav files. closes #166
RobertBeckebans May 2, 2024
0f5030e
Merge branch 'RobertBeckebans:master' into master
CodeLikeCXK May 9, 2024
4a374f9
Fixed clang, gcc compile errors with newer versions #885
RobertBeckebans May 10, 2024
0a438ad
Remove unneeded VkPhysicalDeviceBufferAddressFeaturesEXT from CreateD…
SRSaunders May 8, 2024
0176862
Remove VK_EXT_debug_utils and enable VK_EXT_debug_marker only when de…
SRSaunders May 8, 2024
30f92b8
Suppress Vulkan [Shader-OutputNotConsumed] validation layer message s…
SRSaunders May 10, 2024
23adc49
Suppress DX12 [RESOURCE_BARRIER_BEFORE_AFTER_MISMATCH] error caused b…
SRSaunders May 10, 2024
41f8a22
Split lights with brushes/patches into light groups for TrenchBroom #825
RobertBeckebans May 10, 2024
d16c130
Fix Vulkan & D3D12 pipeline validation warnings if no color attachmen…
SRSaunders May 10, 2024
9ee8f94
Fixed leaking problems when converting a map to valve 220 format
RobertBeckebans May 11, 2024
a4558ff
Optimized convertMapToValve220 output with sane 3 point plane definit…
RobertBeckebans May 11, 2024
ca012ce
Changed important console cmds to CONSOLE_COMMAND_SHIP for new ModDB …
RobertBeckebans May 11, 2024
985d736
Don't mess up material names when loading patches from valve 220 format
RobertBeckebans May 11, 2024
0efc9e2
Revert VK_EXT_debug_marker change and enable VK_EXT_Debug_Report as p…
SRSaunders May 11, 2024
70a616e
Enable VK_KHR_maintenance4 for relaxed interface matching between inp…
SRSaunders May 11, 2024
37927c9
Revert no-color attachment change, instead suppress DX12 & Vulkan val…
SRSaunders May 11, 2024
d5920c0
Minor tweak to Vulkan extension order
SRSaunders May 11, 2024
7290133
Killed remnants of renderLight precalculated shadowvolume models
RobertBeckebans May 13, 2024
f2acbba
Introduced idLight::modelTarget key for TrenchBroom light group setup
RobertBeckebans May 16, 2024
1d57505
rvmLightStyleState_t -> iceLightStyleState_t
RobertBeckebans May 16, 2024
2398670
Bumped savegame version for idLight::modelTarget
RobertBeckebans May 16, 2024
f913426
Allow scalable models like in Quake 3. Close #668
RobertBeckebans May 17, 2024
0657a59
Don't try to cache models by the new model* keywords
RobertBeckebans May 17, 2024
5561411
Sync non-SSE bounding box calcuation in idRenderModelGLTF::UpdateSurface
RobertBeckebans May 17, 2024
133c63f
First draft of the makeMaterials command
RobertBeckebans May 18, 2024
f548ee5
Revert VK_KHR_maintenance4 and suppress messageID=0x609a13b for older…
SRSaunders May 18, 2024
fa8a7a9
Tweaked exportFGD to display correctly func_animate ents in TrenchBroom
RobertBeckebans May 18, 2024
788e485
Added overview how Blender identifies PBR textures
RobertBeckebans May 18, 2024
6d19aa5
Merge pull request #886 from SRSaunders/validation-fixes
RobertBeckebans May 18, 2024
8613b2b
Fixed crash with Vulkan when using the colorProcess shader. Close #891
RobertBeckebans May 21, 2024
c4d9514
Automatically sign in master user if compiled without DOOM_CLASSIC. c…
RobertBeckebans May 21, 2024
112b4a6
Merge branch 'master' into 841-makeMaterials-command
RobertBeckebans May 21, 2024
6ef34ee
Enable vkResetQueryPoolEXT as fallback if vkResetQueryPool not available
SRSaunders May 23, 2024
706eb6d
Discover and assign dynamic VulkanFunctions for each device/node vs. …
SRSaunders May 24, 2024
0261154
Check for nullptr before overwriting vkResetQueryPool and vkGetPastPr…
SRSaunders May 24, 2024
3688e0c
Replace UNICODE test with TEXT() macro in optick_common.h
SRSaunders May 25, 2024
2c9d4e0
Explicit font's position's type is signed char
glKarin May 30, 2024
bef28ab
Make move type is signed char
glKarin May 30, 2024
d1c63f8
Linux arm 32bits compile
glKarin May 30, 2024
8690de7
Merge pull request #894 from glKarin/master
RobertBeckebans Jun 2, 2024
c463d69
Merge pull request #895 from CodeLikeCXK/master
RobertBeckebans Jun 2, 2024
3a94408
Fixed typo in cmake-vs2022-arm64.bat
RobertBeckebans Jun 2, 2024
d91b94d
Extended makeMaterials command
RobertBeckebans Jun 13, 2024
526e097
Merge branch 'master' into 841-makeMaterials-command
RobertBeckebans Jun 13, 2024
41254b3
Merge branch 'RobertBeckebans:master' into optick-vk-resync
SRSaunders Jun 14, 2024
c39fc05
makeMaterials command is ready for testing. #close 841
RobertBeckebans Jun 14, 2024
c4b9fc4
Updated FGD files
RobertBeckebans Jun 14, 2024
4a36f07
Updated .plan in release notes
RobertBeckebans Jun 14, 2024
9337596
Started rbdmap.exe CMake project
RobertBeckebans Jun 15, 2024
b0abbe4
rbdmap.exe compiles but does not run yet
RobertBeckebans Jun 17, 2024
68bd54a
rbdmap.exe can compile a map
RobertBeckebans Jun 17, 2024
aab5a48
Print dmap output in console and Visual Studio
RobertBeckebans Jun 18, 2024
c035a5b
Allow static glTF2 models to be inlined in dmap and kicked unused Col…
RobertBeckebans Jun 18, 2024
2262599
Replaced JPG/PNG code with stb_image snippets from dhewm3
RobertBeckebans Jun 19, 2024
ab2ee06
Removed flipVertical option from R_WritePNG
RobertBeckebans Jun 19, 2024
869e699
Adjusted EngineStubPosix for Linux rbdmap
RobertBeckebans Jun 19, 2024
b01e7b0
Added back collision manager and AAS builder to dmap
RobertBeckebans Jun 19, 2024
35f683c
Allow rbdmap.exe +set fs_game <mod_path> <mapname>
RobertBeckebans Jun 19, 2024
a9cb4bd
Imtui hello world
RobertBeckebans Jun 20, 2024
f925217
Hooked common->Prints into ImTui for testing
RobertBeckebans Jun 20, 2024
c5e5cfe
Drastic dmap speed boost by reducing prints like in q3map
RobertBeckebans Jun 21, 2024
caebeef
Added rbdmap -t or -nogui option because pdcurdes does not work with TB
RobertBeckebans Jun 21, 2024
9deff76
Redraw Imtui when DmapPacifierCompileProgressIncrement() hits a thres…
RobertBeckebans Jun 21, 2024
7234a42
Added ncurses dep to Linux rbdmap
RobertBeckebans Jun 22, 2024
9f2cf5d
Synced rbdmap posix code
RobertBeckebans Jun 22, 2024
24df557
rbdmap compiles on Linux
RobertBeckebans Jun 22, 2024
8642820
Extended Linux version of Sys_DefaultBasePath()
RobertBeckebans Jun 22, 2024
70b757e
rbdmap filesystem works on Linux
RobertBeckebans Jun 22, 2024
c93e84f
Fixed small compiler warning
RobertBeckebans Jun 22, 2024
c5e3917
Fixed FPU_StackIsEmpty() fallback on Windows side
RobertBeckebans Jun 22, 2024
f539821
Merge branch 'optick-vk-resync'
RobertBeckebans Jun 22, 2024
2478622
Updated .plan in release notes
RobertBeckebans Jun 22, 2024
5ce9a3b
Minor fixes related to jpeg/png libs -> stb changes
SRSaunders Jun 22, 2024
10f87b2
Merge pull request #903 from SRSaunders/stb-fixes
RobertBeckebans Jun 23, 2024
338123f
Fixed path command to show the lookup order for files in .resources f…
RobertBeckebans Jun 23, 2024
b448fa8
Removed unused premake files
RobertBeckebans Jun 23, 2024
af0e94f
Changed file lookup order in .resources paks like in previous id Tech…
RobertBeckebans Jun 24, 2024
30316e0
Fixed a bug in idFileSystemLocal::AddResourceFile
RobertBeckebans Jun 24, 2024
440368c
Added back .pk4 support but only for paks without a dll inside
RobertBeckebans Jun 26, 2024
c31dec4
Added missing script event so we can boot vanilla Doom 3
RobertBeckebans Jun 26, 2024
e7dfa30
Display .pk4 files first in path cmd
RobertBeckebans Jun 26, 2024
d147b7f
Added classic flashlight from Doom BFA and detection for Doom 2004/2019
RobertBeckebans Jun 27, 2024
ce68905
Replaced flashlight shadows option with classic flashlight
RobertBeckebans Jun 27, 2024
53925f9
Fixed compile error with clang
RobertBeckebans Jun 27, 2024
504e7f5
Made classic flashlight single player only
RobertBeckebans Jun 28, 2024
c226650
Fixed PBR _rmao lookup hack on the wrong textures. Close #905
RobertBeckebans Jun 28, 2024
5aedf14
A small loading screen progressbar experiment
RobertBeckebans Jun 28, 2024
d256e33
Updated .plan
RobertBeckebans Jun 28, 2024
134f3ec
Probably fixed VRAM memory leak when reloading maps. #904
RobertBeckebans Jun 28, 2024
7a94a9c
Removed never called idDeferredImage code
RobertBeckebans Jun 28, 2024
1759ecb
Show binarization indicator for 2D packed mipchain EXR files
RobertBeckebans Jun 28, 2024
c3ecc7b
Refactored FinalizeImage back to ActuallyLoadImage
RobertBeckebans Jun 29, 2024
8389318
Allow skipping intro videos with Escape/Gamepad Start
RobertBeckebans Jun 29, 2024
578a051
Linux build fixes
RobertBeckebans Jun 29, 2024
ca72a72
Merge branch '837-loading-screen-progressbar'
RobertBeckebans Jun 29, 2024
b52d2ee
Merged some smaller changes and fixes from icedhellfire
RobertBeckebans Jun 29, 2024
1639c37
Fixed a couple of bugs regarding Flash JSON reimport
RobertBeckebans Jul 1, 2024
22cc101
Fixed alpha decompression of Flash atlas .bimage files
RobertBeckebans Jul 1, 2024
a3fb4a0
Added hack to get swf/pda.json running
RobertBeckebans Jul 1, 2024
e90f65a
Fixed gcc compile error. Close #911 #909
RobertBeckebans Jul 10, 2024
5060bc8
Extended listCvars with -new option to show all RBDoom related cvars
RobertBeckebans Jul 10, 2024
2b47fb2
Added binaryLoadGuis and a few CVAR_NEW flags
RobertBeckebans Jul 10, 2024
17b2812
Updated compile instructions for Linux #884
RobertBeckebans Jul 10, 2024
ff002be
Updated README to reflect some of the newer changes
RobertBeckebans Jul 10, 2024
a9c8a27
Updated .plan
RobertBeckebans Jul 11, 2024
834018c
Fixed missing private polygon offset. Close #754
RobertBeckebans Jul 16, 2024
645e26d
Updated Linux compile instructions for Fedora 40
RobertBeckebans Jul 18, 2024
6b57056
FFMPEG=OFF BINKDEC=ON is the new default, easier for Linux
RobertBeckebans Jul 19, 2024
eaeb833
Updated dependencies on Fedora
RobertBeckebans Jul 19, 2024
70846d6
Fixed -DUSE_SYSTEM_ZLIB=ON close #913
RobertBeckebans Jul 19, 2024
093fd4b
Update RELEASE-NOTES.md
runlevel5 Jul 23, 2024
f54ef25
Merge pull request #916 from runlevel5/patch-1
RobertBeckebans Jul 23, 2024
d703327
Summarized temporary Discord .plan entries for 1.6 release notes
RobertBeckebans Jul 26, 2024
0f253c3
Merge branch 'master' of github.com:RobertBeckebans/RBDOOM-3-BFG
RobertBeckebans Jul 26, 2024
4de091b
Chad-ified release notes
RobertBeckebans Jul 26, 2024
b88afae
Extended license exceptions for Imtui & PDCurses
RobertBeckebans Jul 26, 2024
a23ed41
Tweaked release notes
RobertBeckebans Jul 26, 2024
333bc48
Implemented typical PSX style vertex jittering
RobertBeckebans Jan 8, 2024
a41c475
Skip TAA in PSX mode
RobertBeckebans Jul 26, 2024
cebba26
Made PSX vertex jitter resolution independent
RobertBeckebans Jul 26, 2024
a3a52c9
Some experiments similar to Obra Dinn and fixed old SSAO
RobertBeckebans Jul 30, 2024
449f56a
More triplanar shader tests
RobertBeckebans Jul 30, 2024
ea78cf4
Store world normals in gbuffer
RobertBeckebans Jul 31, 2024
676c970
Added Gameboy and NES render modes
RobertBeckebans Jul 31, 2024
9fb2120
Added 4 color CGA shader
RobertBeckebans Jul 31, 2024
21645ee
Removed SSAO test from CPC shader
RobertBeckebans Jul 31, 2024
fe959aa
Ported RetroArch Easymode CRT shader WIP
RobertBeckebans Jul 31, 2024
00a4a40
Got Easymode CRT working but it looks bad
RobertBeckebans Jul 31, 2024
5331074
Update DataQueue.h to fix a build failure in Append method
LocutusOfBorg Aug 1, 2024
a4de5a1
Tweaked CRT shaders
RobertBeckebans Aug 1, 2024
cef666f
Easymode CRT shader works correctly
RobertBeckebans Aug 1, 2024
e14d6d5
Ported RetroArch Aperture CRT shader but not much better than Easymode
RobertBeckebans Aug 1, 2024
ea56713
DataQueue.h
LocutusOfBorg Aug 2, 2024
885bf8d
Combined easymode CRT with a NTSC signal
RobertBeckebans Aug 2, 2024
4d15543
Merge pull request #917 from LocutusOfBorg/patch-1
RobertBeckebans Aug 3, 2024
4c79e21
macOS: Fix compile failure when configuring metal argument buffers wi…
SRSaunders Aug 3, 2024
3eb260a
macOS: Add CVAR_NEW tag to r_mvk* cvar declarations
SRSaunders Aug 3, 2024
9a3d78c
Suppress clang deprecated-non-prototype warnings for ZLIB sources
SRSaunders Aug 5, 2024
c78f16c
Merge pull request #919 from SRSaunders/mvk-arg-buffers
RobertBeckebans Aug 5, 2024
802075f
Merge pull request #923 from SRSaunders/zlib-warnings
RobertBeckebans Aug 5, 2024
e66754b
Easymode CRT looks like the games on my TV in the 90s
RobertBeckebans Aug 5, 2024
25e2208
Ported advanced CRT shader by whkrmrgks0
RobertBeckebans Aug 7, 2024
91351f8
Astyle
RobertBeckebans Aug 11, 2024
ab589eb
PSX affine texture mapping
RobertBeckebans Aug 17, 2024
dbddb34
Fixed PSX vertex jiggle in hell sky
RobertBeckebans Aug 17, 2024
aa8ca62
Renamed Easymode in menu to Advanced
RobertBeckebans Aug 17, 2024
b66a4d1
Merge branch '761-psx-rendermode'
RobertBeckebans Aug 17, 2024
3473591
Updated release notes
RobertBeckebans Aug 17, 2024
4d34957
Respect basePath parameter vs hardcoded path in R_WritePNG()
SRSaunders Aug 21, 2024
f6cd238
Merge pull request #926 from SRSaunders/basepath-fix
RobertBeckebans Aug 21, 2024
9e919c8
Added Masked Software Occlusion Culling lib by Intel
RobertBeckebans Aug 21, 2024
1fda97e
Masked Software Occlusion Culling kinda works
RobertBeckebans Aug 21, 2024
dba7404
Don't let TAA mess with masked culling
RobertBeckebans Aug 21, 2024
fc6c1fe
Query only draw surface boxes with MOC
RobertBeckebans Aug 22, 2024
5107d12
Don't cull objects that we run into
RobertBeckebans Aug 22, 2024
e121472
Point lights can be culled. #756
RobertBeckebans Aug 26, 2024
a7d1d7f
All lights can be culled now
RobertBeckebans Aug 26, 2024
930c968
Turn off occlusion culling for mirrors and subviews
RobertBeckebans Aug 26, 2024
387c4a1
Fix rbdmap / idlib PCH mismatch and cleanup rbdmap PCH files after build
SRSaunders Aug 26, 2024
5c8881c
rbdmap: Suppress warnings from zlib and minizip third-party source li…
SRSaunders Aug 26, 2024
79ab0b6
rbdmap for linux/posix: Replace deprecated readdir_r() with readdir()…
SRSaunders Aug 26, 2024
1a2f19b
rbdmap for win32: Suppress warnings from imtui / imgui / pdcurses / w…
SRSaunders Aug 26, 2024
c4e39bd
Skip Masked Occlusion Culling on non-SSE2 CPUs
RobertBeckebans Aug 27, 2024
e54fc22
Merge pull request #928 from SRSaunders/rbdmap-fixes
RobertBeckebans Aug 27, 2024
59c309c
Merge branch 'master' into 756-masked-software-occlusion-culling
RobertBeckebans Aug 27, 2024
747878e
Indented USE_PRECOMPILED_HEADERS blocks
RobertBeckebans Aug 27, 2024
0921667
Merge branch 'master' into 756-masked-software-occlusion-culling
RobertBeckebans Aug 27, 2024
d34eaf0
Fixed compiling on Linux without MOC
RobertBeckebans Aug 27, 2024
d747be2
Fixed compiling MOC on Linux
RobertBeckebans Aug 27, 2024
06c6dd0
Fixed viewInsideSurface check which caused much flickering
RobertBeckebans Aug 27, 2024
8a57cf2
Increased vertex cache limits for TSM mod #918 #660
RobertBeckebans Aug 28, 2024
529beb5
Changed branch name to Masked Software Occlusion Culling
RobertBeckebans Aug 28, 2024
09224fe
Show masked occlusion time with com_showFPS 3
RobertBeckebans Aug 28, 2024
fcf363e
Fixed a few bugs in the convertMapQuakeToDoom command
RobertBeckebans Aug 30, 2024
4be1312
Formatted MOC code
RobertBeckebans Aug 30, 2024
b889c56
Raster triangles faster at the expense of memory
RobertBeckebans Aug 30, 2024
b3a22ff
Some MOC multithreaded code, not working
RobertBeckebans Aug 30, 2024
abff151
Round moc buffer width and height
RobertBeckebans Aug 30, 2024
1e2b1be
Copied CullingThreadPool to renderer for making an id Tech 5 version
RobertBeckebans Sep 2, 2024
6c00d6b
Only draw BSP surfs/patches to masked buffer to reduce tris
RobertBeckebans Sep 2, 2024
dc7b80a
Added material textures/common/occlusion
RobertBeckebans Sep 3, 2024
036318e
Fixed glTF normals when transforms have not been applied in Blender. …
RobertBeckebans Sep 4, 2024
6f19bff
Wrote some debug code for capturing env probes
RobertBeckebans Sep 4, 2024
009ed19
Updated release notes
RobertBeckebans Sep 6, 2024
c0bd4d6
Added MOC Apache license to LICENSE_EXCEPTIONS.md
RobertBeckebans Sep 6, 2024
fb8d82c
Fix linux/macOS PCH builds for cmake policy versions > 3.2
SRSaunders Sep 8, 2024
666f554
Consolidate USE_PRECOMPILED_HEADERS sections in CMakeLists.txt
SRSaunders Sep 9, 2024
f1ce7a7
Win/Linux/macOS: Update MOC cpuidex() and xgetbv() defs for cross-pla…
SRSaunders Sep 9, 2024
d7165b1
Copied MaskedOcclusionCulling.h to renderer for USE_INTRINSICS_SSE=OF…
SRSaunders Sep 9, 2024
eb8825a
Merge pull request #932 from SRSaunders/moc-opt2-pch-fixes
RobertBeckebans Sep 10, 2024
4f05177
Remove the .gch files when running cmake-linux*.sh
RobertBeckebans Sep 10, 2024
cbee44b
Revert "Copied MaskedOcclusionCulling.h to renderer for USE_INTRINSIC…
RobertBeckebans Oct 11, 2024
5f1a5db
Deleted renderer/CullingThreadpool.cpp, we stick to the single thread…
RobertBeckebans Oct 11, 2024
1dde25a
Merge branch '756-masked-software-occlusion-culling-optimized2' of gi…
RobertBeckebans Oct 11, 2024
b05d296
Bumped GLMB_MAGIC and BRM_MAGIC to save the MOC per model data
RobertBeckebans Oct 11, 2024
1056b50
Fixed some light flickering when MOC is enabled
RobertBeckebans Oct 11, 2024
9a99185
Renamed ENGINE_BRANCH back to master
RobertBeckebans Oct 12, 2024
590cc61
Better env_probe interpolation when triangles form a line
RobertBeckebans Oct 15, 2024
05a5642
Yet another env_probe interpolation idea
RobertBeckebans Oct 15, 2024
ca3f8cd
Interpolate env_probes over 2 seconds when running into new triangle set
RobertBeckebans Oct 17, 2024
eca0544
Render MOC faster at half res like in Avalanche Engine
RobertBeckebans Oct 18, 2024
b9669d3
Updated VMA library to newest stable 3.1.0 version
RobertBeckebans Oct 23, 2024
d6dabb6
Fixed TAA bug where the frameIndex was a mismatch in renderer fronten…
RobertBeckebans Oct 23, 2024
6f2aace
Deleted old unused OpenGL and Vulkan code that lead up to confusion
RobertBeckebans Oct 24, 2024
9521760
Use g++ instead of system default in cmake-linux-debug.sh
RobertBeckebans Oct 24, 2024
6a1b2cf
Fixed crash on Linux caused by VMA vs MOC aligned_alloc conflict. clo…
RobertBeckebans Oct 24, 2024
2b2d4a1
Use precompiled headers for release builds on Linux
RobertBeckebans Oct 24, 2024
e7fbad9
Keep motion vectors at zero for TAA for ingame 3D guis
RobertBeckebans Oct 26, 2024
685e02a
Updated NVRHI with Nvidia's latest patches
RobertBeckebans Oct 30, 2024
025627b
Backported SMAA and TAA bugfixes from openvr3 branch
RobertBeckebans Nov 26, 2024
775aa00
Fixed Linux build. Close #945
RobertBeckebans Nov 27, 2024
9ba5e92
Added new PBR roughness estimation by Kennedith98
RobertBeckebans Nov 27, 2024
17deefb
More PBR light tweaks towards less specular aliasing
RobertBeckebans Nov 27, 2024
4448296
Updated release notes
RobertBeckebans Nov 27, 2024
80c52c5
Fixed progressbar printing of baking cmds
RobertBeckebans Nov 28, 2024
f3fd486
Failed specular AA experiment but better PBR shader
RobertBeckebans Nov 28, 2024
78bebe9
Added small metal detection hack for new PBR shader
RobertBeckebans Nov 29, 2024
249397b
Added bumpyenvironment2 shader for some reflective blood experiments
RobertBeckebans Nov 29, 2024
e8c226e
Fixed reflections in bumpyenvironment2
RobertBeckebans Nov 30, 2024
dc378ec
Enabled parallax box reflections for blood decals
RobertBeckebans Nov 30, 2024
192742a
Started to port SSR code by Mara & McGuire
RobertBeckebans Dec 1, 2024
1f3c9aa
Small progress towards SSR. Needs more debugging
RobertBeckebans Dec 3, 2024
93affb3
DDA SSR code works now but could be better
RobertBeckebans Dec 5, 2024
c94b2ca
Blend normals for SSR blood decals with the background
RobertBeckebans Dec 6, 2024
ecb67f0
Only run SSR if we have a HiZ pass
RobertBeckebans Dec 6, 2024
5df21bd
Merge branch '946-better-blood'
RobertBeckebans Dec 6, 2024
6cb57a5
Updated readme + .plan
RobertBeckebans Dec 6, 2024
5418c99
Added new .bproc format to avoid crashes with custom maps
RobertBeckebans Dec 12, 2024
647a1d2
Small improvements in makeMaterials cmd
RobertBeckebans Dec 17, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Added filter option all to extractResourceFile cmd #166
  • Loading branch information
RobertBeckebans committed May 1, 2024
commit 4fe3823733badda67fe72a6fbf5dca9b017538a6
128 changes: 64 additions & 64 deletions base/extract_resources.cfg
Original file line number Diff line number Diff line change
@@ -1,65 +1,65 @@
extractResourceFile _common.resources basedev 1
extractResourceFile _ordered.resources basedev 1
extractResourceFile _sound_pc.resources basedev 1
extractResourceFile _sound_pc_en.resources basedev 1
extractResourceFile _common.resources baseref 1
extractResourceFile _ordered.resources baseref 1
extractResourceFile _sound_pc.resources baseref 1
extractResourceFile _sound_pc_en.resources baseref 1

extractResourceFile maps/admin.resources basedev 1
extractResourceFile maps/alphalabs1.resources basedev 1
extractResourceFile maps/alphalabs2.resources basedev 1
extractResourceFile maps/alphalabs3.resources basedev 1
extractResourceFile maps/alphalabs4.resources basedev 1
extractResourceFile maps/caverns1.resources basedev 1 1
extractResourceFile maps/caverns2.resources basedev 1
extractResourceFile maps/comm1.resources basedev 1
extractResourceFile maps/commoutside.resources basedev 1
extractResourceFile maps/cpu.resources basedev 1
extractResourceFile maps/cpuboss.resources basedev 1
extractResourceFile maps/d3ctf1.resources basedev 1
extractResourceFile maps/d3ctf2.resources basedev 1
extractResourceFile maps/d3ctf3.resources basedev 1
extractResourceFile maps/d3ctf4.resources basedev 1
extractResourceFile maps/d3dm1.resources basedev 1
extractResourceFile maps/d3dm2.resources basedev 1
extractResourceFile maps/d3dm3.resources basedev 1
extractResourceFile maps/d3dm4.resources basedev 1
extractResourceFile maps/d3dm5.resources basedev 1
extractResourceFile maps/d3xpdm1.resources basedev 1
extractResourceFile maps/d3xpdm2.resources basedev 1
extractResourceFile maps/d3xpdm3.resources basedev 1
extractResourceFile maps/d3xpdm4.resources basedev 1
extractResourceFile maps/delta1.resources basedev 1
extractResourceFile maps/delta2a.resources basedev 1
extractResourceFile maps/delta2b.resources basedev 1
extractResourceFile maps/delta3.resources basedev 1
extractResourceFile maps/delta4.resources basedev 1
extractResourceFile maps/delta5.resources basedev 1
extractResourceFile maps/deltax.resources basedev 1
extractResourceFile maps/enpro.resources basedev 1
extractResourceFile maps/erebus1.resources basedev 1
extractResourceFile maps/erebus2.resources basedev 1
extractResourceFile maps/erebus3.resources basedev 1
extractResourceFile maps/erebus4.resources basedev 1
extractResourceFile maps/erebus5.resources basedev 1
extractResourceFile maps/erebus6.resources basedev 1
extractResourceFile maps/hell.resources basedev 1
extractResourceFile maps/hell1.resources basedev 1
extractResourceFile maps/hellhole.resources basedev 1
extractResourceFile maps/le_enpro1.resources basedev 1
extractResourceFile maps/le_enpro2.resources basedev 1
extractResourceFile maps/le_exis1.resources basedev 1
extractResourceFile maps/le_exis2.resources basedev 1
extractResourceFile maps/le_hell.resources basedev 1
extractResourceFile maps/le_hell_post.resources basedev 1
extractResourceFile maps/le_underground.resources basedev 1
extractResourceFile maps/le_underground2.resources basedev 1
extractResourceFile maps/mars_city1.resources basedev 1
extractResourceFile maps/mars_city2.resources basedev 1
extractResourceFile maps/mc_underground.resources basedev 1
extractResourceFile maps/monorail.resources basedev 1
extractResourceFile maps/phobos1.resources basedev 1
extractResourceFile maps/phobos2.resources basedev 1
extractResourceFile maps/phobos3.resources basedev 1
extractResourceFile maps/phobos4.resources basedev 1
extractResourceFile maps/recycling1.resources basedev 1
extractResourceFile maps/recycling2.resources basedev 1
extractResourceFile maps/site3.resources basedev 1
extractResourceFile maps/admin.resources baseref 1
extractResourceFile maps/alphalabs1.resources baseref 1
extractResourceFile maps/alphalabs2.resources baseref 1
extractResourceFile maps/alphalabs3.resources baseref 1
extractResourceFile maps/alphalabs4.resources baseref 1
extractResourceFile maps/caverns1.resources baseref 1 1
extractResourceFile maps/caverns2.resources baseref 1
extractResourceFile maps/comm1.resources baseref 1
extractResourceFile maps/commoutside.resources baseref 1
extractResourceFile maps/cpu.resources baseref 1
extractResourceFile maps/cpuboss.resources baseref 1
extractResourceFile maps/d3ctf1.resources baseref 1
extractResourceFile maps/d3ctf2.resources baseref 1
extractResourceFile maps/d3ctf3.resources baseref 1
extractResourceFile maps/d3ctf4.resources baseref 1
extractResourceFile maps/d3dm1.resources baseref 1
extractResourceFile maps/d3dm2.resources baseref 1
extractResourceFile maps/d3dm3.resources baseref 1
extractResourceFile maps/d3dm4.resources baseref 1
extractResourceFile maps/d3dm5.resources baseref 1
extractResourceFile maps/d3xpdm1.resources baseref 1
extractResourceFile maps/d3xpdm2.resources baseref 1
extractResourceFile maps/d3xpdm3.resources baseref 1
extractResourceFile maps/d3xpdm4.resources baseref 1
extractResourceFile maps/delta1.resources baseref 1
extractResourceFile maps/delta2a.resources baseref 1
extractResourceFile maps/delta2b.resources baseref 1
extractResourceFile maps/delta3.resources baseref 1
extractResourceFile maps/delta4.resources baseref 1
extractResourceFile maps/delta5.resources baseref 1
extractResourceFile maps/deltax.resources baseref 1
extractResourceFile maps/enpro.resources baseref 1
extractResourceFile maps/erebus1.resources baseref 1
extractResourceFile maps/erebus2.resources baseref 1
extractResourceFile maps/erebus3.resources baseref 1
extractResourceFile maps/erebus4.resources baseref 1
extractResourceFile maps/erebus5.resources baseref 1
extractResourceFile maps/erebus6.resources baseref 1
extractResourceFile maps/hell.resources baseref 1
extractResourceFile maps/hell1.resources baseref 1
extractResourceFile maps/hellhole.resources baseref 1
extractResourceFile maps/le_enpro1.resources baseref 1
extractResourceFile maps/le_enpro2.resources baseref 1
extractResourceFile maps/le_exis1.resources baseref 1
extractResourceFile maps/le_exis2.resources baseref 1
extractResourceFile maps/le_hell.resources baseref 1
extractResourceFile maps/le_hell_post.resources baseref 1
extractResourceFile maps/le_underground.resources baseref 1
extractResourceFile maps/le_underground2.resources baseref 1
extractResourceFile maps/mars_city1.resources baseref 1
extractResourceFile maps/mars_city2.resources baseref 1
extractResourceFile maps/mc_underground.resources baseref 1
extractResourceFile maps/monorail.resources baseref 1
extractResourceFile maps/phobos1.resources baseref 1
extractResourceFile maps/phobos2.resources baseref 1
extractResourceFile maps/phobos3.resources baseref 1
extractResourceFile maps/phobos4.resources baseref 1
extractResourceFile maps/recycling1.resources baseref 1
extractResourceFile maps/recycling2.resources baseref 1
extractResourceFile maps/site3.resources baseref 1
23 changes: 20 additions & 3 deletions neo/framework/FileSystem.cpp
Original file line number Diff line number Diff line change
@@ -2656,14 +2656,31 @@ void idFileSystemLocal::ExtractResourceFile_f( const idCmdArgs& args )
{
if( args.Argc() < 3 )
{
common->Printf( "Usage: extractResourceFile <resource file> <outpath> <copysound>\n" );
common->Printf( "Usage: extractResourceFile <resource file> <outpath> <copysound> <all>\n" );
return;
}

idStr filename = args.Argv( 1 );
idStr outPath = args.Argv( 2 );
bool copyWaves = ( args.Argc() > 3 );
idResourceContainer::ExtractResourceFile( filename, outPath, copyWaves );
bool copyWaves = false;
bool allFileTypes = false;

for( int i = 1; i < args.Argc(); i++ )
{
idStr option = args.Argv( i );
option.StripLeading( '-' );

if( option.Icmp( "copysound" ) == 0 )
{
copyWaves = true;
}
else if( option.Icmp( "all" ) == 0 )
{
allFileTypes = true;
}
}

idResourceContainer::ExtractResourceFile( filename, outPath, copyWaves, allFileTypes );
}

/*
24 changes: 23 additions & 1 deletion neo/framework/File_Resource.cpp
Original file line number Diff line number Diff line change
@@ -330,7 +330,7 @@ void idResourceContainer::SetContainerIndex( const int& _idx )
idResourceContainer::ExtractResourceFile
========================
*/
void idResourceContainer::ExtractResourceFile( const char* _fileName, const char* _outPath, bool _copyWavs )
void idResourceContainer::ExtractResourceFile( const char* _fileName, const char* _outPath, bool _copyWavs, bool _all )
{
idFile* inFile = fileSystem->OpenFileRead( _fileName );

@@ -368,8 +368,11 @@ void idResourceContainer::ExtractResourceFile( const char* _fileName, const char
rt.filename.BackSlashesToSlashes();
rt.filename.ToLower();
byte* fbuf = NULL;

if( _copyWavs && ( rt.filename.Find( ".idwav" ) >= 0 || rt.filename.Find( ".idxma" ) >= 0 || rt.filename.Find( ".idmsf" ) >= 0 ) )
{
// TODO make this work #166

rt.filename.SetFileExtension( "wav" );
rt.filename.Replace( "generated/", "" );
int len = fileSystem->GetFileLength( rt.filename );
@@ -378,10 +381,29 @@ void idResourceContainer::ExtractResourceFile( const char* _fileName, const char
}
else
{
// RB: filter out all unwanted binary files
if( !_all && (
rt.filename.IcmpPrefix( "renderprogs") == 0 ||
rt.filename.IcmpPrefix( "generated") == 0 )
/*
rt.filename.Find( ".bcmodel") >= 0 ||
rt.filename.Find( ".bcanim") >= 0 ||
rt.filename.Find( ".bmd5mesh") >= 0 ||
rt.filename.Find( ".bmd5anim") >= 0 ||
rt.filename.Find( ".bimage") >= 0 ||
rt.filename.Find( ".base") >= 0 ||
rt.filename.Find( ".blwo") >= 0 ||
rt.filename.Find( ".bprt") >= 0 ||
rt.filename.Find( ".bswf") >= 0 )*/ )
{
continue;
}

inFile->Seek( rt.offset, FS_SEEK_SET );
fbuf = ( byte* )Mem_Alloc( rt.length, TAG_RESOURCE );
inFile->Read( fbuf, rt.length );
}

idStr outName = _outPath;
outName.AppendPath( rt.filename );
idFile* outFile = fileSystem->OpenExplicitFileWrite( outName );
2 changes: 1 addition & 1 deletion neo/framework/File_Resource.h
Original file line number Diff line number Diff line change
@@ -95,7 +95,7 @@ class idResourceContainer
static void WriteResourceFile( const char* fileName, const idStrList& manifest, const bool& _writeManifest );
static void WriteManifestFile( const char* name, const idStrList& list );
static int ReadManifestFile( const char* filename, idStrList& list );
static void ExtractResourceFile( const char* fileName, const char* outPath, bool copyWavs );
static void ExtractResourceFile( const char* fileName, const char* outPath, bool copyWavs, bool all );
static void UpdateResourceFile( const char* filename, const idStrList& filesToAdd );
idFile* OpenFile( const char* fileName );
const char* GetFileName() const