Skip to content

3D Shader scopes rendering adjustments #62

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.

Sign up for GitHub

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

Merged
themrdemonized merged 18 commits into from
Aug 25, 2024
Merged

3D Shader scopes rendering adjustments #62

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
d4c8438
Create Scope Flag
Redotix Jun 18, 2024
ac01e5a
give scope lowest distance from camera
Redotix Jun 19, 2024
d5edebb
Add Second lense with lowerst priority in render order
Redotix Jun 21, 2024
9bbd2b5
Creating a fetchable texture from our zbuffer snapshot
Redotix Jun 23, 2024
96aacaf
ACTUALY create a sample-able zbuffer snapshot
Redotix Jun 24, 2024
acfae04
Create a separate NodeTree for the scope
Redotix Jun 25, 2024
debc91a
Add a Release to resource
Redotix Jun 25, 2024
6f97206
moved reticle rendering to seperate pass
Redotix Jun 29, 2024
c3a1b04
added console toggle for 3DSS
Redotix Jul 10, 2024
977952a
Include position in Render target
Redotix Aug 17, 2024
02dc093
Merge remote-tracking branch 'origin/all-in-one-vs2022-wpo' into Scop…
Redotix Aug 17, 2024
7d0497d
Reverted uncesarry changes to the zbuffer
Redotix Aug 19, 2024
ff6e446
Merge remote-tracking branch 'origin/all-in-one-vs2022-wpo' into Scop…
Redotix Aug 19, 2024
5608ca3
Merge remote-tracking branch 'origin/all-in-one-vs2022-wpo' into Scop…
Redotix Aug 20, 2024
9486e6e
Merge remote-tracking branch 'origin/all-in-one-vs2022-wpo' into Scop…
Redotix Aug 21, 2024
eb5a63f
Refactor of custom shader flags and removed of redundant code
Redotix Aug 24, 2024
688362e
Added compiler flags and comments
Redotix Aug 24, 2024
74098e5
Gave up on Dx10, successfully built every dx version
Redotix Aug 24, 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
Gave up on Dx10, successfully built every dx version
  • Loading branch information
@Redotix
Redotix committed Aug 24, 2024
commit 74098e5a419c8d08b84907f0223119deb4762af7
2 changes: 1 addition & 1 deletion src/Layers/xrRender/r__dsgraph_build.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ void R_dsgraph_structure::r_dsgraph_insert_dynamic(dxRender_Visual* pVisual, Fve
// NOTE: Invisible elements exist only in R1
_MatrixItem item = {SSA, RI.val_pObject, pVisual, *RI.val_pTransform};

#if defined(USE_DX10) || defined(USE_DX11) // Redotix99: for 3D Shader Based Scopes
#if defined(USE_DX11) // Redotix99: for 3D Shader Based Scopes
switch (sh->flags.iScopeLense) {
case 0:
break;
Expand Down
4 changes: 2 additions & 2 deletions src/Layers/xrRender/r__dsgraph_render.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -603,7 +603,7 @@ void R_dsgraph_structure::r_dsgraph_render_hud(bool NoPS)

rmNormal();

#if defined(USE_DX10) || defined(USE_DX11) // Redotix99: for 3D Shader Based Scopes
#if defined(USE_DX11) // Redotix99: for 3D Shader Based Scopes

if (scope_3D_fake_enabled)
{
Expand Down Expand Up @@ -681,7 +681,7 @@ void R_dsgraph_structure::r_dsgraph_render_sorted()
RCache.set_xform_project(Device.mProject);
}

#if defined(USE_DX10) || defined(USE_DX11)
#if defined(USE_DX11)
//////////////////////////////////////////////////////////////////////////
// strict-sorted render
void R_dsgraph_structure::r_dsgraph_render_ScopeSorted() // Redotix99: for 3D Shader Based Scopes
Expand Down
4 changes: 2 additions & 2 deletions src/Layers/xrRender/r__dsgraph_structure.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ class R_dsgraph_structure : public IRender_interface, public pureFrame
R_dsgraph::mapLOD_T mapLOD;
R_dsgraph::mapSorted_T mapDistort;
R_dsgraph::mapHUD_T mapHUDSorted;
#if defined(USE_DX10) || defined(USE_DX11)
#if defined(USE_DX11)
R_dsgraph::mapScopeHUD_T mapScopeHUD; // Redotix99: for 3D Shader Based Scopes
R_dsgraph::mapScopeHUD_T mapScopeHUDSorted;
#endif
Expand Down Expand Up @@ -201,7 +201,7 @@ class R_dsgraph_structure : public IRender_interface, public pureFrame
void r_dsgraph_render_hud_ui();
void r_dsgraph_render_lods(bool _setup_zb, bool _clear);
void r_dsgraph_render_sorted();
#if defined(USE_DX10) || defined(USE_DX11)
#if defined(USE_DX11)
void r_dsgraph_render_ScopeSorted(); // Redotix99: for 3D Shader Based Scopes
#endif
void r_dsgraph_render_emissive();
Expand Down
2 changes: 1 addition & 1 deletion src/Layers/xrRender/r__dsgraph_types.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@ namespace R_dsgraph
typedef FixedMAP<float, _MatrixItemS, render_allocator> mapHUD_T;
typedef mapHUD_T::TNode mapHUD_Node;

#if defined(USE_DX10) || defined(USE_DX11)
#if defined(USE_DX11)
typedef FixedMAP<float, _MatrixItemS, render_allocator> mapScopeHUD_T; // Redotix99: for 3D Shader Based Scopes
typedef mapScopeHUD_T::TNode mapScopeHUD_T_Node;
#endif
Expand Down
2 changes: 1 addition & 1 deletion src/Layers/xrRender/rendertarget_phase_nightvision.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ void CRenderTarget::phase_heatvision()
};
//--DSR-- HeatVision_start

#if defined(USE_DX10) || defined(USE_DX11) // Redotix99: for 3D Shader Based Scopes (sorry for using the nightvision phase file)
#if defined(USE_DX11) // Redotix99: for 3D Shader Based Scopes (sorry for using the nightvision phase file)
void CRenderTarget::phase_3DSSReticle()
{
HW.pContext->CopyResource(rt_Generic_temp->pTexture->surface_get(), rt_Generic_0->pTexture->surface_get());
Expand Down