diff --git a/src/engine.cpp b/src/engine.cpp index 24f6a2a..ca2acda 100644 --- a/src/engine.cpp +++ b/src/engine.cpp @@ -41,8 +41,8 @@ void Engine::createWindow(std::string title, { m_window = new sf::Window(sf::VideoMode(w, h), title, - isWindowed ? sf::Style::Default : sf::Style::Fullscreen, - sf::ContextSettings(24)); + isWindowed ? sf::Style::Close : sf::Style::Fullscreen, + sf::ContextSettings(24, 8, 0, 3, 3, sf::ContextSettings::Attribute::Core)); m_window->setFramerateLimit(60); m_input = new Input(m_window); m_renderer->initGL(w, h); diff --git a/src/main.cpp b/src/main.cpp index 95a775e..2380807 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -17,7 +17,7 @@ int main(){ engine.setScene(&scene); engine.start(); - /* GraphNode n1 = GraphNode(); + /* GraphNode n1 = GraphNode(); n1.setValue(1); GraphNode n2 = GraphNode(); n2.setValue(2); @@ -39,10 +39,10 @@ int main(){ std::cout << "Path Size: " << path.size() << std::endl; for(GraphNode* gn: path){ std::cout << gn->getValue() << std::endl; - }*/ + } Loader::setObjDirectory("../data/"); Loader::setMtlDirectory("../data/"); Loader::setTexDirectory("../data/"); - std::vector meshes = Loader::loadMesh("sword.obj"); + std::vector meshes = Loader::loadMesh("sword.obj");*/ } diff --git a/src/sparrowshell.h b/src/sparrowshell.h index baa89e2..1873631 100644 --- a/src/sparrowshell.h +++ b/src/sparrowshell.h @@ -4,7 +4,7 @@ #include #include "system.h" -#include "scene.h" +#include "scenetree.h" #include "glm/glm.hpp" class Input;