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
Next Next commit
give scope lowest distance from camera
  • Loading branch information
@Redotix
Redotix committed Jun 19, 2024
commit ac01e5a335879cd82db90a6c56fcac0a80bdcb60
10 changes: 10 additions & 0 deletions src/Layers/xrRender/r__dsgraph_build.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,16 @@ void R_dsgraph_structure::r_dsgraph_insert_dynamic(dxRender_Visual* pVisual, Fve
// HUD rendering
if (RI.val_bHUD)
{
if (sh->flags.isScope)
{
mapHUD_Node* N = mapHUD.insertInAnyWay(EPS);
N->val.ssa = SSA;
N->val.pObject = RI.val_pObject;
N->val.pVisual = pVisual;
N->val.Matrix = *RI.val_pTransform;
N->val.se = sh;
return;
}
if (sh->flags.bStrictB2F)
{
#if RENDER!=R_R1
Expand Down
8 changes: 4 additions & 4 deletions src/Layers/xrRenderDX10/dx10ResourceManager_Scripting.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -402,6 +402,9 @@ void CResourceManager::LS_Load()
.def("zb", &adopt_compiler::_ZB, return_reference_to(_1))
.def("blend", &adopt_compiler::_blend, return_reference_to(_1))
.def("aref", &adopt_compiler::_aref, return_reference_to(_1))

.def("scope", &adopt_compiler::_o_scope, return_reference_to(_1))

// For compatibility only
.def("dx10color_write_enable", &adopt_compiler::_dx10color_write_enable, return_reference_to(_1))
.def("color_write_enable", &adopt_compiler::_dx10color_write_enable, return_reference_to(_1))
Expand All @@ -413,10 +416,7 @@ void CResourceManager::LS_Load()
.def("dx10zfunc", &adopt_compiler::_dx10ZFunc, return_reference_to(_1))

.def("dx10sampler", &adopt_compiler::_dx10sampler) // returns sampler-object
.def("dx10Options", &adopt_compiler::_dx10Options) // returns options-object


.def("dx10Scope", &adopt_compiler::_o_scope, return_reference_to(_1)),
.def("dx10Options", &adopt_compiler::_dx10Options), // returns options-object


class_<adopt_blend>("blend")
Expand Down