From f1412927d66f48f854ec52feb90b0e9d42bc0f50 Mon Sep 17 00:00:00 2001
From: Linloir <zhangchy88@mail2.sysu.edu.cn>
Date: Mon, 12 Dec 2022 14:41:36 +0800
Subject: [PATCH] Fix Header Dependencies

---
 FinalProject/FinalProject.vcxproj         |  6 +++---
 FinalProject/FinalProject.vcxproj.filters |  6 +++---
 FinalProject/mesh.h                       |  1 +
 FinalProject/model.h                      |  1 +
 FinalProject/modelselectable.h            | 11 -----------
 FinalProject/renderable.h                 |  1 -
 6 files changed, 8 insertions(+), 18 deletions(-)

diff --git a/FinalProject/FinalProject.vcxproj b/FinalProject/FinalProject.vcxproj
index 3e58224..6941f1c 100644
--- a/FinalProject/FinalProject.vcxproj
+++ b/FinalProject/FinalProject.vcxproj
@@ -62,12 +62,12 @@
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <PostBuildEvent>
-      <Command>xcopy /y /d "$(ProjectDir)Libs\*.dll" "$(TargetDir)"</Command>
+      <Command>xcopy /y "$(SolutionDir)Libs\*.dll" "$(TargetDir)"</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <PostBuildEvent>
-      <Command>xcopy /y /d "$(ProjectDir)Libs\*.dll" "$(TargetDir)"</Command>
+      <Command>xcopy /y "$(SolutionDir)Libs\*.dll" "$(TargetDir)"</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'" Label="Configuration">
@@ -117,7 +117,7 @@
     <ClInclude Include="ebo.h" />
     <ClInclude Include="vertex.h" />
     <ClInclude Include="vao.h" />
-    <QtMoc Include="modelselectable.h" />
+    <ClInclude Include="modelselectable.h" />
     <ClInclude Include="modelselector.h" />
     <ClInclude Include="modelsetter.h" />
     <ClInclude Include="renderable.h" />
diff --git a/FinalProject/FinalProject.vcxproj.filters b/FinalProject/FinalProject.vcxproj.filters
index dcc17f2..ba9c0e2 100644
--- a/FinalProject/FinalProject.vcxproj.filters
+++ b/FinalProject/FinalProject.vcxproj.filters
@@ -90,14 +90,14 @@
     <ClInclude Include="utils.h">
       <Filter>Header Files\Utils</Filter>
     </ClInclude>
+    <ClInclude Include="modelselectable.h">
+      <Filter>Header Files\Qt Widgets</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <QtMoc Include="sceneviewer.h">
       <Filter>Header Files\Qt Widgets</Filter>
     </QtMoc>
-    <QtMoc Include="modelselectable.h">
-      <Filter>Header Files\Qt Widgets</Filter>
-    </QtMoc>
     <QtMoc Include="mainwindow.h">
       <Filter>Header Files\Qt Widgets</Filter>
     </QtMoc>
diff --git a/FinalProject/mesh.h b/FinalProject/mesh.h
index 89f261a..102324e 100644
--- a/FinalProject/mesh.h
+++ b/FinalProject/mesh.h
@@ -5,6 +5,7 @@
 #include "vertex.h"
 #include "texture.h"
 #include "vao.h"
+#include "shader.h"
 
 class Mesh {
 private:
diff --git a/FinalProject/model.h b/FinalProject/model.h
index 0d715ac..08b58c4 100644
--- a/FinalProject/model.h
+++ b/FinalProject/model.h
@@ -7,6 +7,7 @@
 #include <Assimp/postprocess.h>
 
 #include "mesh.h"
+#include "shader.h"
 
 class Model {
 private:
diff --git a/FinalProject/modelselectable.h b/FinalProject/modelselectable.h
index e3d5b9c..7fed472 100644
--- a/FinalProject/modelselectable.h
+++ b/FinalProject/modelselectable.h
@@ -4,14 +4,3 @@
 
 #include <qwidget.h>
 
-class ModelSelectable : public QWidget
-{
-    Q_OBJECT
-
-private:
-    Model* _model = nullptr;
-
-public:
-    ModelSelectable(QWidget* parent = 0);
-    ~ModelSelectable();
-};
\ No newline at end of file
diff --git a/FinalProject/renderable.h b/FinalProject/renderable.h
index 5ba2387..49f26b7 100644
--- a/FinalProject/renderable.h
+++ b/FinalProject/renderable.h
@@ -15,7 +15,6 @@ private:
 public:
     Renderable(Model* model);
     Renderable(Model* model, glm::vec3 position);
-    ~Renderable();
 
 public:
     void move(glm::vec3 deltaVec);