Skip to content

Material system refactoring (+removal of Effects11) #51

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
steaklive merged 29 commits into from
Apr 7, 2022
Merged

Material system refactoring (+removal of Effects11) #51

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
38849ba
started working on a new material system (without effects library)
steaklive Mar 17, 2022
10f82ca
Merge branch 'material_system_refactor' into material_system_refactoring
steaklive Mar 17, 2022
1348267
started adding new ER_Material system in RenderingObject
steaklive Mar 18, 2022
6a2fab6
added entry points to ER_Material::ER_Material(); added simple BasicC…
steaklive Mar 18, 2022
bd41137
added correct prepare callback for new ER_Materials; added ER_Materia…
steaklive Mar 21, 2022
7f1d4d6
added new ER_ShadowMapMaterial, ShadowMap.hlsl; removed a lot of depr…
steaklive Mar 23, 2022
6b0f2e3
created ER_GBufferMaterial.cpp; removed old DeferredPrepass .fx and c…
steaklive Mar 24, 2022
98468ec
added ER_RenderToLightProbeMaterial, ER_DebugLightProbeMaterial; remo…
steaklive Mar 26, 2022
2340c12
added ER_VoxelizationMaterial; removed deprecated effect Voxelization…
steaklive Mar 26, 2022
2ce5be2
removed deprecated Material code from RenderingObject, Scene
steaklive Mar 26, 2022
2d3a676
moved RenderingObject from Rendering namespace to Library; removed de…
steaklive Mar 27, 2022
cf67a33
renamed RenderingObject to new format for classes (ER_RenderingObject)
steaklive Mar 27, 2022
129da9b
started refactoring PP (from effects); removed Composite pass from PP…
steaklive Mar 29, 2022
55e5638
renamed QuadRenderer to a new class format (ER_QuadRenderer)
steaklive Mar 29, 2022
a57da8e
removed deprecated FXAA effect (and its material), replaced it with a…
steaklive Mar 30, 2022
d3f6460
removed deprecated Vignette effect & material; replaced with new-styl…
steaklive Mar 31, 2022
a603e5c
removed deprecated Fog, Color grading effects & materials; replaced t…
steaklive Mar 31, 2022
92d991d
refactored SSR from effects to new-style PP pass; renamed PostProcess…
steaklive Apr 1, 2022
ff6d491
removed deprecated effects-materials from Skybox; replaced with VS/PS…
steaklive Apr 2, 2022
0e8facf
renamed Skybox to new-style class format (ER_Skybox)
steaklive Apr 2, 2022
6ab1c09
added foliage load from level file; refactored Foliage to new renderi…
steaklive Apr 6, 2022
225804d
removed deprecated SetVoxelizationTextureOutput() from Foliage
steaklive Apr 6, 2022
4f0e655
fixed grass voxelization bugs
steaklive Apr 7, 2022
f7e0677
removed last deprecated materials from the engine; removed deprecated…
steaklive Apr 7, 2022
2ba4185
renamed FoliageSystem to ER_FoliageManager
steaklive Apr 7, 2022
2259f58
renamed ER_Foliage.cpp/h to ER_FoliageManager.cpp/h
steaklive Apr 7, 2022
ec7ab04
renamed VolumetricClouds, Illumination to new style classes (ER_)
steaklive Apr 7, 2022
efef12c
completely removed Effects11 library and its dependencies from the pr…
steaklive Apr 7, 2022
8d5ebd2
Merge branch 'master' of https://github.com/steaklive/EveryRay-Render…
steaklive Apr 7, 2022
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
Binary file modified bin/x64/Debug/EveryRay - Rendering Engine.exe
View file
Open in desktop
Binary file not shown.
Binary file modified bin/x64/Debug/EveryRay - Rendering Engine.ilk
View file
Open in desktop
Binary file not shown.
Binary file modified bin/x64/Debug/EveryRay - Rendering Engine.pdb
View file
Open in desktop
Binary file not shown.
8 changes: 4 additions & 4 deletions bin/x64/Debug/imgui.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ Collapsed=0
[Window][Volumetric Clouds System]
Pos=423,110
Size=551,290
Collapsed=1
Collapsed=0

[Window][Acer Tree instances:]
Pos=426,643
Expand Down Expand Up @@ -239,12 +239,12 @@ Size=384,310
Collapsed=0

[Window][Systems Config]
Pos=419,5
Size=170,100
Pos=424,4
Size=178,189
Collapsed=0

[Window][Illumination System]
Pos=5,243
Pos=6,222
Size=412,256
Collapsed=0

Binary file modified bin/x64/Release/EveryRay - Rendering Engine.exe
View file
Open in desktop
Binary file not shown.
Binary file modified bin/x64/Release/EveryRay - Rendering Engine.pdb
View file
Open in desktop
Binary file not shown.
101 changes: 0 additions & 101 deletions content/effects/AmbientLighting.fx
View file
Open in desktop

This file was deleted.

42 changes: 0 additions & 42 deletions content/effects/BasicEffect.fx
View file
Open in desktop

This file was deleted.

145 changes: 0 additions & 145 deletions content/effects/ColorFilter.fx
View file
Open in desktop

This file was deleted.

Loading