Merge branch 'master' of https://github.com/evol3d/evol-sandbox

res/project/res/scenes/MainScene.evsc

@@ -6,7 +6,7 @@
       "components": [
         {
           "type": "TransformComponent",
-          "position": [0.0, 0.0, 5.0],
+          "position": [0.0, -2.0, -11.0],
           "rotation": [0.0, 0.0, 0.0],
           "scale": [1.0, 1.0, 1.0]
         },
@@ -243,5 +243,43 @@
       ]
     }
   ],
+  "materials": [
+    {
+      "id": "GreenMaterial",
+      "pipeline": "DefaultPipeline",
+      "baseColor": [0.0, 1.0, 0.0, 1.0]
+    },
+    {
+      "id": "RedMaterial",
+      "pipeline": "DefaultPipeline",
+      "baseColor": [1.0, 0.0, 0.0, 1.0]
+    },
+    {
+      "id": "BlueMaterial",
+      "pipeline": "DefaultPipeline",
+      "baseColor": [0.0, 0.0, 1.0, 1.0]
+    },
+    {
+      "id": "WhiteMaterial",
+      "pipeline": "DefaultPipeline",
+      "baseColor": [1.0, 1.0, 0.0, 1.0]
+    },
+  ],
+
+  "pipelines": [
+    {
+      "id": "DefaultPipeline",
+      "shaderStages": [
+        {
+          "type": "Vertex",
+          "shaderPath": "shaders://default.vert"
+        },
+        {
+          "type": "Fragment",
+          "shaderPath": "shaders://default.frag"
+        }
+      ]
+    }
+  ],
   "activeCamera": "Camera.RotationHelper"
 }

res/project/res/scenes/SideScene.evsc

@@ -128,5 +128,43 @@
       ]
     }
   ],
+  "materials": [
+    {
+      "id": "GreenMaterial",
+      "pipeline": "DefaultPipeline",
+      "baseColor": [0.0, 1.0, 0.0, 1.0]
+    },
+    {
+      "id": "RedMaterial",
+      "pipeline": "DefaultPipeline",
+      "baseColor": [1.0, 0.0, 0.0, 1.0]
+    },
+    {
+      "id": "BlueMaterial",
+      "pipeline": "DefaultPipeline",
+      "baseColor": [0.0, 0.0, 1.0, 1.0]
+    },
+    {
+      "id": "WhiteMaterial",
+      "pipeline": "DefaultPipeline",
+      "baseColor": [1.0, 1.0, 0.0, 1.0]
+    },
+  ],
+
+  "pipelines": [
+    {
+      "id": "DefaultPipeline",
+      "shaderStages": [
+        {
+          "type": "Vertex",
+          "shaderPath": "shaders://default.vert"
+        },
+        {
+          "type": "Fragment",
+          "shaderPath": "shaders://default.frag"
+        }
+      ]
+    }
+  ],
   "activeCamera": "Camera"
 }

res/project/res/scenes/TestScene.evsc

@@ -1459,5 +1459,43 @@
       ]
     }
   ],
+  "materials": [
+    {
+      "id": "GreenMaterial",
+      "pipeline": "DefaultPipeline",
+      "baseColor": [0.0, 1.0, 0.0, 1.0]
+    },
+    {
+      "id": "RedMaterial",
+      "pipeline": "DefaultPipeline",
+      "baseColor": [1.0, 0.0, 0.0, 1.0]
+    },
+    {
+      "id": "BlueMaterial",
+      "pipeline": "DefaultPipeline",
+      "baseColor": [0.0, 0.0, 1.0, 1.0]
+    },
+    {
+      "id": "WhiteMaterial",
+      "pipeline": "DefaultPipeline",
+      "baseColor": [1.0, 1.0, 0.0, 1.0]
+    },
+  ],
+
+  "pipelines": [
+    {
+      "id": "DefaultPipeline",
+      "shaderStages": [
+        {
+          "type": "Vertex",
+          "shaderPath": "shaders://default.vert"
+        },
+        {
+          "type": "Fragment",
+          "shaderPath": "shaders://default.frag"
+        }
+      ]
+    }
+  ],
   "activeCamera": "CameraTransformOverride.Camera.RotationHelper",
 }

src/main.c

@@ -173,6 +173,7 @@ load_project()
       evstring_free(path_id);
     }
 
+    Renderer->setWindow((GenericHandle)State.window);
 
     // Loading Scenes
     double scene_count = evjs_get(project_desc.json_data, "scenes.len")->as_num;
@@ -197,16 +198,15 @@ load_project()
   }
 
   evstring_free(project_dir);
-
 }
 
 void
 unload_project()
 {
+  evol_unloadmodule(State.renderer_mod);
   evol_unloadmodule(State.game_mod);
   evol_unloadmodule(State.input_mod);
   evol_unloadmodule(State.window_mod);
-  evol_unloadmodule(State.renderer_mod);
 }
 
 int main(int argc, char **argv)