Skip to content

Commit 3ce6337

Browse files
BenjaFriendBenjaFriend
authored
Merge pull request #132 from flingengine/deferred-shading
Deferred shading
2 parents 714c513 + 1364a9a commit 3ce6337

File tree

133 files changed

+18272
-1003480
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

133 files changed

+18272
-1003480
lines changed

‎Assets/Levels/Level_1.json‎

Lines changed: 6393 additions & 57 deletions
Large diffs are not rendered by default.

‎Assets/Materials/Bronze.mat‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
{
2-
"name" : "Bronze Material",
3-
4-
"ShaderProgram" : "PBR",
5-
2+
"name" : "Bronze Material",
63
"albedo" : "Textures/Bronze/bronze_A.png",
74
"normal" : "Textures/Bronze/bronze_N.png",
85
"metal" : "Textures/Bronze/bronze_M.png",

‎Assets/Materials/Cerberus.mat‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
{
2-
"name" : "Cerberus Material",
3-
4-
"ShaderProgram": "PBR",
5-
2+
"name" : "Cerberus Material",
63
"albedo" : "Textures/Cerberus/Cerberus_A.png",
74
"normal" : "Textures/Cerberus/Cerberus_N.png",
85
"metal" : "Textures/Cerberus/Cerberus_M.png",

‎Assets/Materials/Cobblestone.mat‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
{
22
"name" : "Default Material",
3-
4-
"ShaderProgram" : "PBR",
5-
63
"albedo" : "Textures/cobblestone/cobblestone_A.png",
74
"normal" : "Textures/cobblestone/cobblestone_N.png",
85
"metal" : "Textures/cobblestone/cobblestone_M.png",

‎Assets/Materials/Damascus.mat‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
{
2+
"name": "Damascus Material",
3+
4+
"albedo": "Textures/Damascus/Damascus_A.png",
5+
"normal": "Textures/Damascus/Damascus_N.png",
6+
"metal": "Textures/Damascus/Damascus_M.png",
7+
"rough": "Textures/Damascus/Damascus_R.png"
8+
}

‎Assets/Materials/Debug.mat‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"name" : "Debug Material",
3+
"pipeline" : "DEBUG"
4+
}

‎Assets/Materials/Default.mat‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name" : "Default Material",
33

4-
"ShaderProgram" : "PBR",
4+
"pipeline" : "DEFAULT",
55

66
"albedo" : "Textures/DefaultTexture.png",
77
"normal" : "Textures/DefaultTexture.png",

‎Assets/Materials/DeferredBronzeMat.mat‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
{
2+
"name" : "Bronze Deferred Material",
3+
4+
"albedo" : "Textures/Bronze/bronze_A.png",
5+
"normal" : "Textures/Bronze/bronze_N.png",
6+
"metal" : "Textures/Bronze/bronze_M.png",
7+
"rough" : "Textures/Bronze/bronze_R.png"
8+
}

‎Assets/Materials/DotMetal.mat‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
{
2+
"name": "DotMetal Material",
3+
4+
"albedo": "Textures/DotMetal/DotMetal_A.png",
5+
"normal": "Textures/DotMetal/DotMetal_N.png",
6+
"metal": "Textures/DotMetal/DotMetal_M.png",
7+
"rough": "Textures/DotMetal/DotMetal_R.png"
8+
}

‎Assets/Materials/Paint.mat‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
{
22
"name" : "Paint Material",
33

4-
"ShaderProgram" : "PBR",
5-
64
"albedo" : "Textures/Paint/paint_A.png",
75
"normal" : "Textures/Paint/paint_N.png",
86
"metal" : "Textures/Paint/paint_M.png",

0 commit comments

Comments
 (0)