More terrain work and added demo scene.

* Separated SceneBase with a new DemoSponza scene. * Terrain logic almost done. Shaders are soon.

Author: htmlboss

MP-APS/.vs/MP-APS/v15/.suo

@@ -0,0 +1,22 @@
+#include "DemoCrytekSponza.h"
+
+#include "../ResourceManager.h"
+
+
+/***********************************************************************************/
+DemoCrytekSponza::DemoCrytekSponza(const std::size_t width, const std::size_t height) : SceneBase(width, height) {
+}
+
+/***********************************************************************************/
+void DemoCrytekSponza::Init(const std::string_view sceneName) {
+SceneBase::Init(sceneName);
+
+auto model = ResourceManager::GetInstance().GetModel("Sponza", "Data/Models/crytek-sponza/sponza.obj");
+model->Translate(glm::vec3(0.0f));
+model->Scale(glm::vec3(0.01f));
+m_sceneModels.push_back(model);
+
+// Sun
+m_staticDirectionalLights.emplace_back(StaticDirectionalLight(glm::vec3(5.0f, 5.0f, 4.5f), { 25.0f, 50.0f, 10.0f }));
+}
+

MP-APS/.vs/MP-APS/v15/Browse.VC.db

@@ -0,0 +1,12 @@
+#pragma once
+
+#include "../SceneBase.h"
+
+class DemoCrytekSponza : public SceneBase {
+
+public:
+DemoCrytekSponza(const std::size_t width, const std::size_t height);
+~DemoCrytekSponza() = default;
+
+void Init(const std::string_view sceneName) override;
+};

MP-APS/Demos/DemoCrytekSponza.cpp

@@ -43,8 +43,8 @@ Engine::Engine(const std::string_view configPath) : m_mainWindow{},
 }
 
 /***********************************************************************************/
-void Engine::AddScene(const SceneBase& scene) {
-m_scenes.try_emplace(scene.GetName(), scene);
+void Engine::AddScene(const std::shared_ptr<SceneBase>& scene) {
+m_scenes.try_emplace(scene->GetName(), scene);
 }
 
 /***********************************************************************************/
@@ -56,7 +56,7 @@ void Engine::SetActiveScene(const std::string_view sceneName) {
 return;
 }
 
-m_activeScene = &scene->second;
+m_activeScene = scene->second.get();
 m_renderer.InitView(m_activeScene->GetCamera());
 }
 

MP-APS/Demos/DemoCrytekSponza.h

@@ -21,7 +21,7 @@ class Engine {
 
 ~Engine() = default;
 
-void AddScene(const SceneBase& scene);
+void AddScene(const std::shared_ptr<SceneBase>& scene);
 void SetActiveScene(const std::string_view sceneName);
 
 void Execute();
@@ -38,7 +38,7 @@ class Engine {
 GUISystem m_guiSystem;
 
 // All loaded scenes stored in memory
-std::unordered_map<std::string, SceneBase> m_scenes;
+std::unordered_map<std::string, std::shared_ptr<SceneBase>> m_scenes;
 // Current scene being processed by renderer
 SceneBase* m_activeScene;
 };

MP-APS/Engine.cpp

@@ -2,9 +2,9 @@
 
 #include "Input.h"
 #include "ViewFrustum.h"
-#include "ResourceManager.h"
 
 #include <ppl.h> // Concurrency library
+#include <iostream>
 
 /***********************************************************************************/
 SceneBase::SceneBase(const std::size_t width, const std::size_t height) :	m_width(width), 
@@ -16,13 +16,7 @@ void SceneBase::Init(const std::string_view sceneName) {
 
 m_sceneName = sceneName;
 
-auto model = ResourceManager::GetInstance().GetModel("Sponza", "Data/Models/crytek-sponza/sponza.obj");
-model->Translate(glm::vec3(0.0f));
-model->Scale(glm::vec3(0.01f));
-m_sceneModels.push_back(model);
-
-// Sun
-m_staticDirectionalLights.emplace_back(StaticDirectionalLight(glm::vec3(5.0f, 5.0f, 4.5f), {25.0f, 50.0f, 10.0f}));
+std::cout << "Loading scene: " << sceneName << std::endl;
 }
 
 /***********************************************************************************/

MP-APS/Engine.h

@@ -7,7 +7,10 @@
 #include "Graphics/StaticPointLight.h"
 #include "Graphics/StaticSpotLight.h"
 
+/***********************************************************************************/
+// Forward Declarations
 class RenderSystem;
+
 /***********************************************************************************/
 class SceneBase {
 friend class RenderSystem;

MP-APS/SceneBase.cpp

@@ -272,6 +272,7 @@
  <ClCompile Include="Core\GUISystem.cpp" />
  <ClCompile Include="Core\RenderSystem.cpp" />
  <ClCompile Include="Core\WindowSystem.cpp" />
+ <ClCompile Include="Demos\DemoCrytekSponza.cpp" />
  <ClCompile Include="Engine.cpp" />
  <ClCompile Include="Graphics\GLFramebuffer.cpp" />
  <ClCompile Include="Graphics\GLShader.cpp" />
@@ -285,7 +286,6 @@
  <ClCompile Include="SceneBase.cpp" />
  <ClCompile Include="Skybox.cpp" />
  <ClCompile Include="Terrain\Terrain.cpp" />
- <ClCompile Include="Terrain\TerrainRenderer.cpp" />
  <ClCompile Include="Timer.cpp" />
  <ClCompile Include="ViewFrustum.cpp" />
  </ItemGroup>
@@ -298,6 +298,7 @@
  <ClInclude Include="Core\GUISystem.h" />
  <ClInclude Include="Core\RenderSystem.h" />
  <ClInclude Include="Core\WindowSystem.h" />
+ <ClInclude Include="Demos\DemoCrytekSponza.h" />
  <ClInclude Include="Engine.h" />
  <ClInclude Include="Graphics\StaticDirectionalLight.h" />
  <ClInclude Include="Graphics\GLFramebuffer.h" />
@@ -313,7 +314,7 @@
  <ClInclude Include="ResourceManager.h" />
  <ClInclude Include="SceneBase.h" />
  <ClInclude Include="Skybox.h" />
- <ClInclude Include="Terrain\TerrainRenderer.h" />
+ <ClInclude Include="Terrain\Terrain.h" />
  <ClInclude Include="Terrain\TerrainNode.h" />
  <ClInclude Include="Timer.h" />
  <ClInclude Include="ViewFrustum.h" />

MP-APS/SceneBase.h

@@ -21,6 +21,9 @@
  <Filter Include="AI">
  <UniqueIdentifier>{0d636b6d-aaa3-4bc1-9375-8b5a52311ed6}</UniqueIdentifier>
  </Filter>
+ <Filter Include="Demos">
+ <UniqueIdentifier>{eefd2842-47fc-4817-9cac-65f6078fc562}</UniqueIdentifier>
+ </Filter>
  </ItemGroup>
  <ItemGroup>
  <ClCompile Include="Mesh.cpp">
@@ -80,17 +83,17 @@
  <ClCompile Include="PBRMaterial.cpp">
  <Filter>Source Files</Filter>
  </ClCompile>
- <ClCompile Include="Terrain\Terrain.cpp">
- <Filter>Terrain</Filter>
- </ClCompile>
  <ClCompile Include="Core\GUISystem.cpp">
  <Filter>Core</Filter>
  </ClCompile>
  <ClCompile Include="AI\AISystem.cpp">
  <Filter>AI</Filter>
  </ClCompile>
- <ClCompile Include="Terrain\TerrainRenderer.cpp">
- <Filter>Source Files</Filter>
+ <ClCompile Include="Terrain\Terrain.cpp">
+ <Filter>Terrain</Filter>
+ </ClCompile>
+ <ClCompile Include="Demos\DemoCrytekSponza.cpp">
+ <Filter>Demos</Filter>
  </ClCompile>
  </ItemGroup>
  <ItemGroup>
@@ -172,9 +175,12 @@
  <ClInclude Include="AI\AISystem.h">
  <Filter>AI</Filter>
  </ClInclude>
- <ClInclude Include="Terrain\TerrainRenderer.h">
+ <ClInclude Include="Terrain\Terrain.h">
  <Filter>Terrain</Filter>
  </ClInclude>
+ <ClInclude Include="Demos\DemoCrytekSponza.h">
+ <Filter>Demos</Filter>
+ </ClInclude>
  </ItemGroup>
  <ItemGroup>
  <None Include="..\README.md" />