feat: #24 Try update build linux

skylicht-lab · Dec 13, 2019 · 3230d2e · 3230d2e
1 parent 8cd70a3
commit 3230d2e
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 8 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -101,8 +101,9 @@ jobs:
     - uses: actions/checkout@v1      
     - name: Install Dependencies
       run: |
-        sudo apt-get update
-        sudo apt-get install -y libglfw3-dev libsdl2-dev        
+        sudo add-apt-repository -y "deb http://archive.ubuntu.com/ubuntu `lsb_release -sc` main universe restricted multiverse"
+        sudo apt-get update -y -qq
+        sudo apt-get install -y libglfw3-dev libsdl2-dev
         sudo apt remove --purge --auto-remove cmake
         wget -q https://github.com/Kitware/CMake/releases/download/v3.15.5/cmake-3.15.5-Linux-x86_64.tar.gz
         tar -zxvf cmake-3.15.5-Linux-x86_64.tar.gz        

diff --git a/Projects/Demo/Source/Demo.cpp b/Projects/Demo/Source/Demo.cpp
@@ -13,15 +13,15 @@ Demo::Demo():
 	m_scene(NULL),
 	m_zone(NULL),
 	m_camera(NULL),
-	m_deferredRendering(NULL)
+	m_rendering(NULL)
 {
 
 }
 
 Demo::~Demo()
 {
 	delete m_scene;
-	delete m_deferredRendering;
+	delete m_rendering;
 }
 
 io::path Demo::getBuiltInPath(const char *name)
@@ -59,8 +59,8 @@ void Demo::initScene()
 	m_camera = cameraObj->addComponent<CCamera>();
 	cameraObj->initComponent();
 
-	m_deferredRendering = new CDeferredRP();
-	m_deferredRendering->initRender(app->getWidth(), app->getHeight());
+	m_rendering = new CForwardRP();
+	m_rendering->initRender(app->getWidth(), app->getHeight());
 }
 
 void Demo::onUpdate()
@@ -70,7 +70,7 @@ void Demo::onUpdate()
 
 void Demo::onRender()
 {
-	m_deferredRendering->render(m_camera);
+	m_rendering->render(m_camera);
 }
 
 void Demo::onPostRender()

diff --git a/Projects/Demo/Source/Demo.h b/Projects/Demo/Source/Demo.h
@@ -4,15 +4,19 @@
 #include "GameObject/CZone.h"
 #include "Components/Camera/CCamera.h"
 
+#include "RenderPipeline/CForwardRP.h"
 #include "RenderPipeline/CDeferredRP.h"
 
+#include "Entity/CEntityManager.h"
+
 class Demo : public IApplicationEventReceiver
 {
 protected:
 	CScene	*m_scene;
 	CZone	*m_zone;
 	CCamera	*m_camera;
-	CDeferredRP *m_deferredRendering;
+
+	CBaseRP *m_rendering;
 
 protected:
 	io::path getBuiltInPath(const char *name);