diff --git a/FinalProject/FinalProject.vcxproj b/FinalProject/FinalProject.vcxproj index b3ece53..307d05e 100644 --- a/FinalProject/FinalProject.vcxproj +++ b/FinalProject/FinalProject.vcxproj @@ -105,6 +105,7 @@ + @@ -129,6 +130,7 @@ + diff --git a/FinalProject/FinalProject.vcxproj.filters b/FinalProject/FinalProject.vcxproj.filters index adf8bd8..383d1d7 100644 --- a/FinalProject/FinalProject.vcxproj.filters +++ b/FinalProject/FinalProject.vcxproj.filters @@ -100,6 +100,9 @@ Source Files\Utils + + Source Files\OpenGL Abstractions + @@ -150,6 +153,9 @@ Header Files\OpenGL Abstractions + + Header Files\OpenGL Abstractions + diff --git a/FinalProject/lightCaster.cpp b/FinalProject/lightCaster.cpp new file mode 100644 index 0000000..e69de29 diff --git a/FinalProject/lightCaster.h b/FinalProject/lightCaster.h new file mode 100644 index 0000000..6f70f09 --- /dev/null +++ b/FinalProject/lightCaster.h @@ -0,0 +1 @@ +#pragma once diff --git a/FinalProject/sceneviewer.cpp b/FinalProject/sceneviewer.cpp index aa6bfef..406b3f9 100644 --- a/FinalProject/sceneviewer.cpp +++ b/FinalProject/sceneviewer.cpp @@ -65,7 +65,7 @@ void SceneViewer::initializeGL() { vertexShader.dispose(); fragmentShader.dispose(); - Model* backpackModel = new Model("D:\\ProgrammingFile\\SceneEditor\\Models\\backpack\\backpack.obj"); + Model* backpackModel = new Model("D:\\code\\ComputerGraphic\\nanosuit\\nanosuit.obj"); Logger::info("Model loaded"); Renderable backpack(backpackModel); _objects.push_back(backpack); diff --git a/FinalProject/sceneviewer.h b/FinalProject/sceneviewer.h index a854b32..b45fd4e 100644 --- a/FinalProject/sceneviewer.h +++ b/FinalProject/sceneviewer.h @@ -12,6 +12,7 @@ #include "renderable.h" #include "vao.h" #include "utils.h" +#include "lightCaster.h" class SceneViewer : public QOpenGLWidget, protected QOpenGLFunctions { @@ -21,6 +22,8 @@ private: // OpenGL section------------------------------------- // List of objects currently in the scene std::vector _objects; + // List of light casters in the scene + std::vector _casters; // Shader program for objects ShaderProgram _shaderProgram = ShaderProgram::empty(); // Main camera