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 @@
- xcopy /y /d "$(ProjectDir)Libs\*.dll" "$(TargetDir)"
+ xcopy /y "$(SolutionDir)Libs\*.dll" "$(TargetDir)"
- xcopy /y /d "$(ProjectDir)Libs\*.dll" "$(TargetDir)"
+ xcopy /y "$(SolutionDir)Libs\*.dll" "$(TargetDir)"
@@ -117,7 +117,7 @@
-
+
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 @@
Header Files\Utils
+
+ Header Files\Qt Widgets
+
Header Files\Qt Widgets
-
- Header Files\Qt Widgets
-
Header Files\Qt Widgets
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
#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
-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);