EpicSparrow/SparrowEngine
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

set window flag to close instead of default

Browse Source
This commit is contained in:
Lendemor 2016-05-01 21:46:22 +02:00
parent aab6ff7575
commit d2fe787cb1
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/engine.cpp
View File

@ -41,8 +41,8 @@ void Engine::createWindow(std::string title,
{ {
m_window = new sf::Window(sf::VideoMode(w, h), m_window = new sf::Window(sf::VideoMode(w, h),
title, title,
isWindowed ? sf::Style::Default : sf::Style::Fullscreen, isWindowed ? sf::Style::Close : sf::Style::Fullscreen,
sf::ContextSettings(24)); sf::ContextSettings(24, 8, 0, 3, 3, sf::ContextSettings::Attribute::Core));
m_window->setFramerateLimit(60); m_window->setFramerateLimit(60);
m_input = new Input(m_window); m_input = new Input(m_window);
m_renderer->initGL(w, h); m_renderer->initGL(w, h);

6
src/main.cpp
View File

@ -17,7 +17,7 @@ int main(){
engine.setScene(&scene); engine.setScene(&scene);
engine.start(); engine.start();
/* GraphNode n1 = GraphNode(); /* GraphNode n1 = GraphNode();
n1.setValue(1); n1.setValue(1);
GraphNode n2 = GraphNode(); GraphNode n2 = GraphNode();
n2.setValue(2); n2.setValue(2);
@ -39,10 +39,10 @@ int main(){
std::cout << "Path Size: " << path.size() << std::endl; std::cout << "Path Size: " << path.size() << std::endl;
for(GraphNode* gn: path){ for(GraphNode* gn: path){
std::cout << gn->getValue() << std::endl; std::cout << gn->getValue() << std::endl;
}*/ }
Loader::setObjDirectory("../data/"); Loader::setObjDirectory("../data/");
Loader::setMtlDirectory("../data/"); Loader::setMtlDirectory("../data/");
Loader::setTexDirectory("../data/"); Loader::setTexDirectory("../data/");
std::vector<Mesh*> meshes = Loader::loadMesh("sword.obj"); std::vector<Mesh*> meshes = Loader::loadMesh("sword.obj");*/
} }

2
src/sparrowshell.h
View File

@ -4,7 +4,7 @@
#include <list> #include <list>
#include "system.h" #include "system.h"
#include "scene.h" #include "scenetree.h"
#include "glm/glm.hpp" #include "glm/glm.hpp"
class Input; class Input;