Deferred Lighting

resources/models/Forest/forest.json

@@ -5,207 +5,207 @@
       "ID": "Background_Tree_Atlas.001_Background_Tree_Atlas_0_0",
       "MaterialID": "forest-mat-0",
       "OffsetVertex": 0,
-      "VertexSize": 2085440,
+      "VertexSize": 5860960,
       "OffsetIndex": 0,
       "IndexSize": 1125636
     },
     {
       "ID": "Background_Tree_Atlas.002_Metal_Fence_0_1",
       "MaterialID": "forest-mat-1",
-      "OffsetVertex": 2085440,
-      "VertexSize": 3280,
+      "OffsetVertex": 5860960,
+      "VertexSize": 9184,
       "OffsetIndex": 1125636,
       "IndexSize": 984
     },
     {
       "ID": "Background_Tree_Atlas.003_Dirt_Road_Bare_0_2",
       "MaterialID": "forest-mat-2",
-      "OffsetVertex": 2088720,
-      "VertexSize": 4700,
+      "OffsetVertex": 5870144,
+      "VertexSize": 13160,
       "OffsetIndex": 1126620,
       "IndexSize": 4740
     },
     {
       "ID": "Background_Tree_Atlas.004_Trunk_Birch_0_3",
       "MaterialID": "forest-mat-3",
-      "OffsetVertex": 2093420,
-      "VertexSize": 240720,
+      "OffsetVertex": 5883304,
+      "VertexSize": 674016,
       "OffsetIndex": 1131360,
       "IndexSize": 155052
     },
     {
       "ID": "Background_Tree_Atlas.005_Wood_Log_0_4",
       "MaterialID": "forest-mat-4",
-      "OffsetVertex": 2334140,
-      "VertexSize": 20160,
+      "OffsetVertex": 6557320,
+      "VertexSize": 56448,
       "OffsetIndex": 1286412,
       "IndexSize": 10584
     },
     {
       "ID": "Background_Tree_Atlas.006_Trunk_Oak_0_5",
       "MaterialID": "forest-mat-5",
-      "OffsetVertex": 2354300,
-      "VertexSize": 1306960,
+      "OffsetVertex": 6613768,
+      "VertexSize": 3659488,
       "OffsetIndex": 1296996,
       "IndexSize": 841836
     },
     {
       "ID": "Background_Tree_Atlas.007_Fallen_Generic_Leaves_0_6",
       "MaterialID": "forest-mat-6",
-      "OffsetVertex": 3661260,
-      "VertexSize": 135500,
+      "OffsetVertex": 10273256,
+      "VertexSize": 379400,
       "OffsetIndex": 2138832,
       "IndexSize": 91788
     },
     {
       "ID": "Background_Tree_Atlas.008_Ground_Dirt_0_7",
       "MaterialID": "forest-mat-7",
-      "OffsetVertex": 3796760,
-      "VertexSize": 161440,
+      "OffsetVertex": 10652656,
+      "VertexSize": 452032,
       "OffsetIndex": 2230620,
       "IndexSize": 41844
     },
     {
       "ID": "Background_Tree_Atlas.009_Forest_Bush_0_8",
       "MaterialID": "forest-mat-8",
-      "OffsetVertex": 3958200,
-      "VertexSize": 259640,
+      "OffsetVertex": 11104688,
+      "VertexSize": 726992,
       "OffsetIndex": 2272464,
       "IndexSize": 102840
     },
     {
       "ID": "Background_Tree_Atlas.010_Grass_Vegetation_Dry_0_9",
       "MaterialID": "forest-mat-9",
-      "OffsetVertex": 4217840,
-      "VertexSize": 669040,
+      "OffsetVertex": 11831680,
+      "VertexSize": 1873312,
       "OffsetIndex": 2375304,
       "IndexSize": 200712
     },
     {
       "ID": "Background_Tree_Atlas.011_Grass_Vegetation_Green_0_10",
       "MaterialID": "forest-mat-10",
-      "OffsetVertex": 4886880,
-      "VertexSize": 1046480,
+      "OffsetVertex": 13704992,
+      "VertexSize": 2930144,
       "OffsetIndex": 2576016,
       "IndexSize": 313512
     },
     {
       "ID": "Background_Tree_Atlas.012_Fallen_Maple_Leaves_0_11",
       "MaterialID": "forest-mat-11",
-      "OffsetVertex": 5933360,
-      "VertexSize": 208400,
+      "OffsetVertex": 16635136,
+      "VertexSize": 583520,
       "OffsetIndex": 2889528,
       "IndexSize": 138060
     },
     {
       "ID": "Background_Tree_Atlas.013_Rock_Decal_0_12",
       "MaterialID": "forest-mat-12",
-      "OffsetVertex": 6141760,
-      "VertexSize": 307820,
+      "OffsetVertex": 17218656,
+      "VertexSize": 861896,
       "OffsetIndex": 3027588,
       "IndexSize": 246348
     },
     {
       "ID": "Background_Tree_Atlas.014_Mud_Pile_0_13",
       "MaterialID": "forest-mat-13",
-      "OffsetVertex": 6449580,
-      "VertexSize": 17400,
+      "OffsetVertex": 18080552,
+      "VertexSize": 48720,
       "OffsetIndex": 3273936,
       "IndexSize": 18108
     },
     {
       "ID": "Background_Tree_Atlas.015_Dirt_Road_Trails_0_14",
       "MaterialID": "forest-mat-14",
-      "OffsetVertex": 6466980,
-      "VertexSize": 60640,
+      "OffsetVertex": 18129272,
+      "VertexSize": 169792,
       "OffsetIndex": 3292044,
       "IndexSize": 63504
     },
     {
       "ID": "Background_Tree_Atlas.016_Road_Edge_Gravel_Dusty_0_15",
       "MaterialID": "forest-mat-15",
-      "OffsetVertex": 6527620,
-      "VertexSize": 36560,
+      "OffsetVertex": 18299064,
+      "VertexSize": 102368,
       "OffsetIndex": 3355548,
       "IndexSize": 37512
     },
     {
       "ID": "Background_Tree_Atlas.017_Puddle_Streaks_0_16",
       "MaterialID": "forest-mat-16",
-      "OffsetVertex": 6564180,
-      "VertexSize": 40660,
+      "OffsetVertex": 18401432,
+      "VertexSize": 113848,
       "OffsetIndex": 3393060,
       "IndexSize": 44316
     },
     {
       "ID": "Background_Tree_Atlas.018_Wood_Fence_0_17",
       "MaterialID": "forest-mat-17",
-      "OffsetVertex": 6604840,
-      "VertexSize": 22600,
+      "OffsetVertex": 18515280,
+      "VertexSize": 63280,
       "OffsetIndex": 3437376,
       "IndexSize": 8016
     },
     {
       "ID": "Background_Tree_Atlas.019_Sloped_Rock_0_18",
       "MaterialID": "forest-mat-18",
-      "OffsetVertex": 6627440,
-      "VertexSize": 491300,
+      "OffsetVertex": 18578560,
+      "VertexSize": 1375640,
       "OffsetIndex": 3445392,
       "IndexSize": 123444
     },
     {
       "ID": "Background_Tree_Atlas.020_Terrain_Far_0_19",
       "MaterialID": "forest-mat-19",
-      "OffsetVertex": 7118740,
-      "VertexSize": 55780,
+      "OffsetVertex": 19954200,
+      "VertexSize": 156184,
       "OffsetIndex": 3568836,
       "IndexSize": 31728
     },
     {
       "ID": "Background_Tree_Atlas.021_Aerial_Grass_0_20",
       "MaterialID": "forest-mat-20",
-      "OffsetVertex": 7174520,
-      "VertexSize": 383080,
+      "OffsetVertex": 20110384,
+      "VertexSize": 1072624,
       "OffsetIndex": 3600564,
       "IndexSize": 128748
     },
     {
       "ID": "Background_Tree_Atlas.022_Tall_Cliff_0_21",
       "MaterialID": "forest-mat-21",
-      "OffsetVertex": 7557600,
-      "VertexSize": 387380,
+      "OffsetVertex": 21183008,
+      "VertexSize": 1084664,
       "OffsetIndex": 3729312,
       "IndexSize": 93840
     },
     {
       "ID": "Background_Tree_Atlas.023_Cobblestone_0_22",
       "MaterialID": "forest-mat-22",
-      "OffsetVertex": 7944980,
-      "VertexSize": 40720,
+      "OffsetVertex": 22267672,
+      "VertexSize": 114016,
       "OffsetIndex": 3823152,
       "IndexSize": 10860
     },
     {
       "ID": "Background_Tree_Atlas.024_Grass_Close_0_23",
       "MaterialID": "forest-mat-23",
-      "OffsetVertex": 7985700,
-      "VertexSize": 168280,
+      "OffsetVertex": 22381688,
+      "VertexSize": 471184,
       "OffsetIndex": 3834012,
       "IndexSize": 87936
     },
     {
       "ID": "Background_Tree_Atlas.025_Dirt_Road_0_24",
       "MaterialID": "forest-mat-24",
-      "OffsetVertex": 8153980,
-      "VertexSize": 109260,
+      "OffsetVertex": 22852872,
+      "VertexSize": 305928,
       "OffsetIndex": 3921948,
       "IndexSize": 120624
     },
     {
       "ID": "Background_Tree_Atlas.026_Broken_Rocks_0_25",
       "MaterialID": "forest-mat-25",
-      "OffsetVertex": 8263240,
-      "VertexSize": 225980,
+      "OffsetVertex": 23158800,
+      "VertexSize": 632744,
       "OffsetIndex": 4042572,
       "IndexSize": 50736
     }

resources/models/Forest/forest_mat.json

@@ -2,271 +2,379 @@
   {
     "ID": "forest-mat-0",
     "TexturePath": "resources\\models\\Forest\\ModelTexture0.png",
+    "NormalTexturePath": "resources\\models\\Forest\\ModelTexture2.png",
+    "MetalRoughnessMap": "resources\\models\\Forest\\ModelTexture1.png",
     "DiffuseColour": {
       "X": 0.3347269,
       "Y": 0.3347269,
       "Z": 0.3347269,
       "W": 1.0
-    }
+    },
+    "Roughness": 1.0,
+    "Metallic": 0.0
   },
   {
     "ID": "forest-mat-1",
     "TexturePath": "resources\\models\\Forest\\ModelTexture4.png",
+    "NormalTexturePath": "resources\\models\\Forest\\ModelTexture6.png",
+    "MetalRoughnessMap": "resources\\models\\Forest\\ModelTexture5.png",
     "DiffuseColour": {
       "X": 1.0,
       "Y": 1.0,
       "Z": 1.0,
       "W": 1.0
-    }
+    },
+    "Roughness": 1.0,
+    "Metallic": 0.0
   },
   {
     "ID": "forest-mat-2",
     "TexturePath": "resources\\models\\Forest\\ModelTexture7.png",
+    "NormalTexturePath": "resources\\models\\Forest\\ModelTexture9.png",
+    "MetalRoughnessMap": "resources\\models\\Forest\\ModelTexture8.png",
     "DiffuseColour": {
       "X": 1.0,
       "Y": 1.0,
       "Z": 1.0,
       "W": 1.0
-    }
+    },
+    "Roughness": 1.0,
+    "Metallic": 0.0
   },
   {
     "ID": "forest-mat-3",
     "TexturePath": "resources\\models\\Forest\\ModelTexture10.png",
+    "NormalTexturePath": "resources\\models\\Forest\\ModelTexture12.png",
+    "MetalRoughnessMap": "resources\\models\\Forest\\ModelTexture11.png",
     "DiffuseColour": {
       "X": 0.8147891,
       "Y": 0.8147891,
       "Z": 0.8147891,
       "W": 1.0
-    }
+    },
+    "Roughness": 1.0,
+    "Metallic": 0.0
   },
   {
     "ID": "forest-mat-4",
     "TexturePath": "resources\\models\\Forest\\ModelTexture13.png",
+    "NormalTexturePath": "",
+    "MetalRoughnessMap": "",
     "DiffuseColour": {
       "X": 1.0,
       "Y": 1.0,
       "Z": 1.0,
       "W": 1.0
-    }
+    },
+    "Roughness": 0.9849378,
+    "Metallic": 0.0
   },
   {
     "ID": "forest-mat-5",
     "TexturePath": "resources\\models\\Forest\\ModelTexture14.png",
+    "NormalTexturePath": "resources\\models\\Forest\\ModelTexture16.png",
+    "MetalRoughnessMap": "resources\\models\\Forest\\ModelTexture15.png",
     "DiffuseColour": {
       "X": 0.9180937,
       "Y": 0.9180937,
       "Z": 0.9180937,
       "W": 1.0
-    }
+    },
+    "Roughness": 1.0,
+    "Metallic": 0.0
   },
   {
     "ID": "forest-mat-6",
     "TexturePath": "resources\\models\\Forest\\ModelTexture17.png",
+    "NormalTexturePath": "resources\\models\\Forest\\ModelTexture19.png",
+    "MetalRoughnessMap": "resources\\models\\Forest\\ModelTexture18.png",
     "DiffuseColour": {
       "X": 1.0,
       "Y": 1.0,
       "Z": 1.0,
       "W": 1.0
-    }
+    },
+    "Roughness": 1.0,
+    "Metallic": 0.0
   },
   {
     "ID": "forest-mat-7",
     "TexturePath": "resources\\models\\Forest\\ModelTexture20.png",
+    "NormalTexturePath": "resources\\models\\Forest\\ModelTexture22.png",
+    "MetalRoughnessMap": "resources\\models\\Forest\\ModelTexture21.png",
     "DiffuseColour": {
       "X": 1.0,
       "Y": 1.0,
       "Z": 1.0,
       "W": 1.0
-    }
+    },
+    "Roughness": 1.0,
+    "Metallic": 0.0
   },
   {
     "ID": "forest-mat-8",
     "TexturePath": "resources\\models\\Forest\\ModelTexture23.png",
+    "NormalTexturePath": "resources\\models\\Forest\\ModelTexture24.png",
+    "MetalRoughnessMap": "",
     "DiffuseColour": {
       "X": 1.0,
       "Y": 1.0,
       "Z": 1.0,
       "W": 1.0
-    }
+    },
+    "Roughness": 1.0,
+    "Metallic": 0.0
   },
   {
     "ID": "forest-mat-9",
     "TexturePath": "resources\\models\\Forest\\ModelTexture25.png",
+    "NormalTexturePath": "resources\\models\\Forest\\ModelTexture27.png",
+    "MetalRoughnessMap": "resources\\models\\Forest\\ModelTexture26.png",
     "DiffuseColour": {
       "X": 1.0,
       "Y": 1.0,
       "Z": 1.0,
       "W": 1.0
-    }
+    },
+    "Roughness": 1.0,
+    "Metallic": 0.0
   },
   {
     "ID": "forest-mat-10",
     "TexturePath": "resources\\models\\Forest\\ModelTexture28.png",
+    "NormalTexturePath": "resources\\models\\Forest\\ModelTexture27.png",
+    "MetalRoughnessMap": "resources\\models\\Forest\\ModelTexture26.png",
     "DiffuseColour": {
       "X": 1.0,
       "Y": 1.0,
       "Z": 1.0,
       "W": 1.0
-    }
+    },
+    "Roughness": 1.0,
+    "Metallic": 0.0
   },
   {
     "ID": "forest-mat-11",
     "TexturePath": "resources\\models\\Forest\\ModelTexture29.png",
+    "NormalTexturePath": "resources\\models\\Forest\\ModelTexture31.png",
+    "MetalRoughnessMap": "resources\\models\\Forest\\ModelTexture30.png",
     "DiffuseColour": {
       "X": 1.0,
       "Y": 1.0,
       "Z": 1.0,
       "W": 1.0
-    }
+    },
+    "Roughness": 1.0,
+    "Metallic": 0.0
   },
   {
     "ID": "forest-mat-12",
     "TexturePath": "resources\\models\\Forest\\ModelTexture32.png",
+    "NormalTexturePath": "resources\\models\\Forest\\ModelTexture34.png",
+    "MetalRoughnessMap": "resources\\models\\Forest\\ModelTexture33.png",
     "DiffuseColour": {
       "X": 1.0,
       "Y": 1.0,
       "Z": 1.0,
       "W": 1.0
-    }
+    },
+    "Roughness": 1.0,
+    "Metallic": 0.0
   },
   {
     "ID": "forest-mat-13",
     "TexturePath": "resources\\models\\Forest\\ModelTexture35.png",
+    "NormalTexturePath": "resources\\models\\Forest\\ModelTexture37.png",
+    "MetalRoughnessMap": "resources\\models\\Forest\\ModelTexture36.png",
     "DiffuseColour": {
       "X": 0.79048216,
       "Y": 0.79048216,
       "Z": 0.79048216,
       "W": 1.0
-    }
+    },
+    "Roughness": 1.0,
+    "Metallic": 0.0
   },
   {
     "ID": "forest-mat-14",
     "TexturePath": "resources\\models\\Forest\\ModelTexture38.png",
+    "NormalTexturePath": "resources\\models\\Forest\\ModelTexture40.png",
+    "MetalRoughnessMap": "resources\\models\\Forest\\ModelTexture39.png",
     "DiffuseColour": {
       "X": 1.0,
       "Y": 1.0,
       "Z": 1.0,
       "W": 1.0
-    }
+    },
+    "Roughness": 1.0,
+    "Metallic": 0.0
   },
   {
     "ID": "forest-mat-15",
     "TexturePath": "resources\\models\\Forest\\ModelTexture41.png",
+    "NormalTexturePath": "resources\\models\\Forest\\ModelTexture43.png",
+    "MetalRoughnessMap": "resources\\models\\Forest\\ModelTexture42.png",
     "DiffuseColour": {
       "X": 0.6446405,
       "Y": 0.6446405,
       "Z": 0.6446405,
       "W": 1.0
-    }
+    },
+    "Roughness": 1.0,
+    "Metallic": 0.0
   },
   {
     "ID": "forest-mat-16",
     "TexturePath": "resources\\models\\Forest\\ModelTexture44.png",
+    "NormalTexturePath": "resources\\models\\Forest\\ModelTexture46.png",
+    "MetalRoughnessMap": "resources\\models\\Forest\\ModelTexture45.png",
     "DiffuseColour": {
       "X": 1.0,
       "Y": 1.0,
       "Z": 1.0,
       "W": 1.0
-    }
+    },
+    "Roughness": 0.7783287,
+    "Metallic": 0.0
   },
   {
     "ID": "forest-mat-17",
     "TexturePath": "resources\\models\\Forest\\ModelTexture47.png",
+    "NormalTexturePath": "",
+    "MetalRoughnessMap": "",
     "DiffuseColour": {
       "X": 1.0,
       "Y": 1.0,
       "Z": 1.0,
       "W": 1.0
-    }
+    },
+    "Roughness": 0.9484773,
+    "Metallic": 0.0
   },
   {
     "ID": "forest-mat-18",
     "TexturePath": "resources\\models\\Forest\\ModelTexture48.png",
+    "NormalTexturePath": "resources\\models\\Forest\\ModelTexture50.png",
+    "MetalRoughnessMap": "resources\\models\\Forest\\ModelTexture49.png",
     "DiffuseColour": {
       "X": 0.74186826,
       "Y": 0.74186826,
       "Z": 0.74186826,
       "W": 1.0
-    }
+    },
+    "Roughness": 1.0,
+    "Metallic": 0.0
   },
   {
     "ID": "forest-mat-19",
     "TexturePath": "resources\\models\\Forest\\ModelTexture51.png",
+    "NormalTexturePath": "",
+    "MetalRoughnessMap": "",
     "DiffuseColour": {
       "X": 1.0,
       "Y": 1.0,
       "Z": 1.0,
       "W": 1.0
-    }
+    },
+    "Roughness": 1.0,
+    "Metallic": 0.0
   },
   {
     "ID": "forest-mat-20",
     "TexturePath": "resources\\models\\Forest\\ModelTexture52.png",
+    "NormalTexturePath": "resources\\models\\Forest\\ModelTexture54.png",
+    "MetalRoughnessMap": "resources\\models\\Forest\\ModelTexture53.png",
     "DiffuseColour": {
       "X": 1.0,
       "Y": 1.0,
       "Z": 1.0,
       "W": 1.0
-    }
+    },
+    "Roughness": 1.0,
+    "Metallic": 0.0
   },
   {
     "ID": "forest-mat-21",
     "TexturePath": "resources\\models\\Forest\\ModelTexture55.png",
+    "NormalTexturePath": "resources\\models\\Forest\\ModelTexture57.png",
+    "MetalRoughnessMap": "resources\\models\\Forest\\ModelTexture56.png",
     "DiffuseColour": {
       "X": 1.0,
       "Y": 1.0,
       "Z": 1.0,
       "W": 1.0
-    }
+    },
+    "Roughness": 1.0,
+    "Metallic": 0.0
   },
   {
     "ID": "forest-mat-22",
     "TexturePath": "resources\\models\\Forest\\ModelTexture58.png",
+    "NormalTexturePath": "resources\\models\\Forest\\ModelTexture60.png",
+    "MetalRoughnessMap": "resources\\models\\Forest\\ModelTexture59.png",
     "DiffuseColour": {
       "X": 1.0,
       "Y": 1.0,
       "Z": 1.0,
       "W": 1.0
-    }
+    },
+    "Roughness": 1.0,
+    "Metallic": 0.0
   },
   {
     "ID": "forest-mat-23",
     "TexturePath": "resources\\models\\Forest\\ModelTexture61.png",
+    "NormalTexturePath": "resources\\models\\Forest\\ModelTexture63.png",
+    "MetalRoughnessMap": "resources\\models\\Forest\\ModelTexture62.png",
     "DiffuseColour": {
       "X": 0.8998634,
       "Y": 0.8998634,
       "Z": 0.8998634,
       "W": 1.0
-    }
+    },
+    "Roughness": 1.0,
+    "Metallic": 0.0
   },
   {
     "ID": "forest-mat-24",
     "TexturePath": "resources\\models\\Forest\\ModelTexture64.png",
+    "NormalTexturePath": "resources\\models\\Forest\\ModelTexture66.png",
+    "MetalRoughnessMap": "resources\\models\\Forest\\ModelTexture65.png",
     "DiffuseColour": {
       "X": 1.0,
       "Y": 1.0,
       "Z": 1.0,
       "W": 1.0
-    }
+    },
+    "Roughness": 1.0,
+    "Metallic": 0.0
   },
   {
     "ID": "forest-mat-25",
     "TexturePath": "resources\\models\\Forest\\ModelTexture67.png",
+    "NormalTexturePath": "resources\\models\\Forest\\ModelTexture69.png",
+    "MetalRoughnessMap": "resources\\models\\Forest\\ModelTexture68.png",
     "DiffuseColour": {
       "X": 1.0,
       "Y": 1.0,
       "Z": 1.0,
       "W": 1.0
-    }
+    },
+    "Roughness": 1.0,
+    "Metallic": 0.0
   },
   {
     "ID": "forest-mat-26",
     "TexturePath": "",
+    "NormalTexturePath": "",
+    "MetalRoughnessMap": "",
     "DiffuseColour": {
       "X": 1.0,
       "Y": 1.0,
       "Z": 1.0,
       "W": 1.0
-    }
+    },
+    "Roughness": 1.0,
+    "Metallic": 1.0
   }
 ]

resources/models/MusicParticle/MusicParticle.json

@@ -5,7 +5,7 @@
       "ID": "plane_0",
       "MaterialID": "MusicParticle-mat-1",
       "OffsetVertex": 0,
-      "VertexSize": 80,
+      "VertexSize": 224,
       "OffsetIndex": 0,
       "IndexSize": 24
     }

resources/models/MusicParticle/MusicParticle_mat.json

@@ -2,31 +2,64 @@
   {
     "ID": "MusicParticle-mat-0",
     "TexturePath": "",
+    "NormalTexturePath": "",
+    "MetalRoughnessMap": "",
+    "EmissiveMapPath": "",
     "DiffuseColour": {
       "X": 0.6,
       "Y": 0.6,
       "Z": 0.6,
       "W": 1.0
-    }
+    },
+    "EmissiveColour": {
+      "X": 0.0,
+      "Y": 0.0,
+      "Z": 0.0,
+      "W": 0.0
+    },
+    "Roughness": 0.0,
+    "Metallic": 0.0
   },
   {
     "ID": "MusicParticle-mat-1",
     "TexturePath": "resources\\models\\MusicParticle\\texture.png",
+    "NormalTexturePath": "",
+    "MetalRoughnessMap": "",
+    "EmissiveMapPath": "",
     "DiffuseColour": {
       "X": 0.6,
       "Y": 0.6,
       "Z": 0.6,
       "W": 1.0
-    }
+    },
+    "EmissiveColour": {
+      "X": 0.0,
+      "Y": 0.0,
+      "Z": 0.0,
+      "W": 0.0
+    },
+    "Roughness": 0.0,
+    "Metallic": 0.0
   },
   {
     "ID": "MusicParticle-mat-2",
     "TexturePath": "",
+    "NormalTexturePath": "",
+    "MetalRoughnessMap": "",
+    "EmissiveMapPath": "",
     "DiffuseColour": {
       "X": 0.6,
       "Y": 0.6,
       "Z": 0.6,
       "W": 1.0
-    }
+    },
+    "EmissiveColour": {
+      "X": 0.0,
+      "Y": 0.0,
+      "Z": 0.0,
+      "W": 0.0
+    },
+    "Roughness": 0.0,
+    "Metallic": 0.0
   }
 ]

resources/models/melona/melona.json

@@ -5,15 +5,15 @@
       "ID": "m_6d7d0384-980c-6574-37d9-8a8b11a5fdda_0",
       "MaterialID": "melona-mat-1",
       "OffsetVertex": 0,
-      "VertexSize": 8320,
+      "VertexSize": 24192,
       "OffsetIndex": 0,
       "IndexSize": 2640
     },
     {
       "ID": "none_1",
       "MaterialID": "melona-mat-2",
-      "OffsetVertex": 8320,
-      "VertexSize": 160,
+      "OffsetVertex": 24192,
+      "VertexSize": 672,
       "OffsetIndex": 2640,
       "IndexSize": 96
     }

resources/models/melona/melona_mat.json

@@ -2,31 +2,43 @@
   {
     "ID": "melona-mat-0",
     "TexturePath": "",
+    "NormalTexturePath": "",
+    "MetalRoughnessMap": "",
     "DiffuseColour": {
       "X": 0.6,
       "Y": 0.6,
       "Z": 0.6,
       "W": 1.0
-    }
+    },
+    "Roughness": 0.0,
+    "Metallic": 0.0
   },
   {
     "ID": "melona-mat-1",
     "TexturePath": "resources\\models\\melona\\Melonamodel.png",
+    "NormalTexturePath": "",
+    "MetalRoughnessMap": "",
     "DiffuseColour": {
       "X": 0.6,
       "Y": 0.6,
       "Z": 0.6,
       "W": 1.0
-    }
+    },
+    "Roughness": 0.0,
+    "Metallic": 0.0
   },
   {
     "ID": "melona-mat-2",
     "TexturePath": "",
+    "NormalTexturePath": "",
+    "MetalRoughnessMap": "",
     "DiffuseColour": {
       "X": 0.6,
       "Y": 0.6,
       "Z": 0.6,
       "W": 1.0
-    }
+    },
+    "Roughness": 0.0,
+    "Metallic": 0.0
   }
 ]

resources/models/radio/radio.json

@@ -5,7 +5,7 @@
       "ID": "Radio_20 - Default_0_0",
       "MaterialID": "radio-mat-0",
       "OffsetVertex": 0,
-      "VertexSize": 19920,
+      "VertexSize": 55776,
       "OffsetIndex": 0,
       "IndexSize": 10104
     }

resources/models/radio/radio_mat.json

@@ -2,21 +2,43 @@
   {
     "ID": "radio-mat-0",
     "TexturePath": "resources\\models\\radio\\ModelTexture0.png",
+    "NormalTexturePath": "resources\\models\\radio\\ModelTexture2.png",
+    "MetalRoughnessMap": "resources\\models\\radio\\ModelTexture1.png",
+    "EmissiveMapPath": "",
     "DiffuseColour": {
       "X": 0.8042929,
       "Y": 0.8042929,
       "Z": 0.8042929,
       "W": 1.0
-    }
+    },
+    "EmissiveColour": {
+      "X": 0.0,
+      "Y": 0.0,
+      "Z": 0.0,
+      "W": 0.0
+    },
+    "Roughness": 1.0,
+    "Metallic": 1.0
   },
   {
     "ID": "radio-mat-1",
     "TexturePath": "",
+    "NormalTexturePath": "",
+    "MetalRoughnessMap": "",
+    "EmissiveMapPath": "",
     "DiffuseColour": {
       "X": 1.0,
       "Y": 1.0,
       "Z": 1.0,
       "W": 1.0
-    }
+    },
+    "EmissiveColour": {
+      "X": 0.0,
+      "Y": 0.0,
+      "Z": 0.0,
+      "W": 0.0
+    },
+    "Roughness": 1.0,
+    "Metallic": 1.0
   }
 ]

resources/models/train/trainModel.mtl

@@ -0,0 +1,4 @@
+# Made in Blockbench 5.1.4
+newmtl m_160d78d2-c530-14d3-613b-c69c320835f0
+map_Kd Train.png
+newmtl none