Merged with upstream

Signed-off-by: Robear Selwans <robear.selwans@outlook.com>

scenes/DamagedHelmet.evsc

@@ -20,6 +20,14 @@
       "metallicFactor": 1,
       "pipeline": "DefferedPipeline",
       "roughnessFactor": 1
+    },
+    {
+      "baseColor":[1.0,1.0,1.0,1.0],
+      "emissiveFactor":[1.0,1.0,1.0],
+      "id":"LightMaterial",
+      "metallicFactor":1.0,
+      "pipeline":"LightSpherePipeline",
+      "roughnessFactor":1.0
     }
   ],
   "nodes": [
@@ -59,11 +67,16 @@
     {
     "components": [
         {
-          "position": [  -2, 1, 2],
-          "rotation": [-180, 0, 0],
+          "position": [  0, 1, 0],
+          "rotation": [0, 0, 0],
           "scale": [ 1, 1, 1],
           "type": "TransformComponent"
         },
+        {
+          "material":"LightMaterial",
+          "mesh":"assets://meshes/lightSphere_Sphere.mesh",
+          "type":"RenderComponent"
+        },
         {
           "color": [1.0, 1.0, 1.0, 1.0],
           "intensity": 20,
@@ -79,6 +92,11 @@
           "scale": [ 1, 1, 1],
           "type": "TransformComponent"
         },
+        {
+          "material":"LightMaterial",
+          "mesh":"assets://meshes/lightSphere_Sphere.mesh",
+          "type":"RenderComponent"
+        },
         {
           "color": [1.0, 1.0, 1.0, 1.0],
           "intensity": 200,
@@ -94,6 +112,11 @@
           "scale": [ 1, 1, 1],
           "type": "TransformComponent"
         },
+        {
+          "material":"LightMaterial",
+          "mesh":"assets://meshes/lightSphere_Sphere.mesh",
+          "type":"RenderComponent"
+        },
         {
           "color": [1.0, 1.0, 1.0, 1.0],
           "intensity": 200,
@@ -109,6 +132,11 @@
           "scale": [ 1, 1, 1],
           "type": "TransformComponent"
         },
+        {
+          "material":"LightMaterial",
+          "mesh":"assets://meshes/lightSphere_Sphere.mesh",
+          "type":"RenderComponent"
+        },
         {
           "color": [1.0, 1.0, 1.0, 1.0],
           "intensity": 200,

scenes/MainScene.evsc

@@ -273,6 +273,19 @@
         }
       ]
     },
+    {
+      "id": "LightSpherePipeline",
+      "shaderStages": [
+        {
+          "type": "Vertex",
+          "shaderPath": "shaders://lightObject.vert"
+        },
+        {
+          "type": "Fragment",
+          "shaderPath": "shaders://lightObject.frag"
+        }
+      ]
+    },
     {
       "id": "DefferedPipeline",
       "shaderStages": [