Merge pull request #99 from flingengine/lighting

Lighting
flingengine · Oct 30, 2019 · 777a2b9 · 777a2b9
2 parents acfc83e + ebf1266
commit 777a2b9
Show file tree

Hide file tree

Showing 66 changed files with 359,337 additions and 2,393 deletions.
diff --git a/Assets/Levels/Level_1.json b/Assets/Levels/Level_1.json
diff --git a/Assets/Materials/Bronze.mat b/Assets/Materials/Bronze.mat
@@ -0,0 +1,11 @@
+{
+    "name" : "Bronze Material",
+
+    "vertex" : "Shaders/PBRDefault_vert.spv",
+    "frag" : "Shaders/PBRDefault_frag.spv",
+
+    "albedo" : "Textures/Bronze/bronze_A.png",
+    "normal" : "Textures/Bronze/bronze_N.png",
+    "metal" : "Textures/Bronze/bronze_M.png",
+    "rough" : "Textures/Bronze/bronze_R.png" 
+}
diff --git a/Assets/Materials/Cerberus.mat b/Assets/Materials/Cerberus.mat
@@ -0,0 +1,11 @@
+{
+    "name" : "Cerberus Material",
+
+    "vertex" : "Shaders/PBRDefault_vert.spv",
+    "frag" : "Shaders/PBRDefault_frag.spv",
+
+    "albedo" : "Textures/Cerberus/Cerberus_A.png",
+    "normal" : "Textures/Cerberus/Cerberus_N.png",
+    "metal" : "Textures/Cerberus/Cerberus_M.png",
+    "rough" : "Textures/Cerberus/Cerberus_R.png" 
+}
diff --git a/Assets/Materials/Cobblestone.mat b/Assets/Materials/Cobblestone.mat
@@ -0,0 +1,11 @@
+{
+    "name" : "Default Material",
+
+    "vertex" : "Shaders/PBRDefault_vert.spv",
+    "frag" : "Shaders/PBRDefault_frag.spv",
+
+    "albedo" : "Textures/cobblestone/cobblestone_A.png",
+    "normal" : "Textures/cobblestone/cobblestone_N.png",
+    "metal" : "Textures/cobblestone/cobblestone_M.png",
+    "rough" : "Textures/cobblestone/cobblestone_R.png" 
+}
diff --git a/Assets/Materials/Default.mat b/Assets/Materials/Default.mat
@@ -1,8 +1,8 @@
 {
-    "name" : "Wood Material",
+    "name" : "Default Material",
 
-    "vertex" : "Shaders/vert.spv",
-    "frag" : "Shaders/frag.spv",
+    "vertex" : "Shaders/PBRDefault_vert.spv",
+    "frag" : "Shaders/PBRDefault_frag.spv",
 
     "albedo" : "Textures/DefaultTexture.png",
     "normal" : "Textures/DefaultTexture.png",

diff --git a/Assets/Materials/Paint.mat b/Assets/Materials/Paint.mat
@@ -0,0 +1,11 @@
+{
+    "name" : "Paint Material",
+
+    "vertex" : "Shaders/PBRDefault_vert.spv",
+    "frag" : "Shaders/PBRDefault_frag.spv",
+
+    "albedo" : "Textures/Paint/paint_A.png",
+    "normal" : "Textures/Paint/paint_N.png",
+    "metal" : "Textures/Paint/paint_M.png",
+    "rough" : "Textures/Paint/paint_R.png" 
+}
diff --git a/Assets/Materials/Wood.mat b/Assets/Materials/Wood.mat
@@ -1,8 +1,8 @@
 {
-    "name" : "Default Material",
+    "name" : "Wood Material",
 
-    "vertex" : "Shaders/vert.spv",
-    "frag" : "Shaders/frag.spv",
+    "vertex" : "Shaders/PBRDefault_vert.spv",
+    "frag" : "Shaders/PBRDefault_frag.spv",
 
     "albedo" : "Textures/wood_albedo.png",
     "normal" : "Textures/wood_normals.png",