Separated OpenGL contexts from Window implementations
Added support for OpenGL 3.0 Replaced WindowSettings with ContextSettings Synchronized with trunk git-svn-id: https://sfml.svn.sourceforge.net/svnroot/sfml/branches/sfml2@1065 4e206d99-4929-0410-ac5d-dfc041789085
This commit is contained in:
commit
9c370e38da
110 changed files with 2758 additions and 2335 deletions
|
@ -67,7 +67,7 @@
|
|||
LinkIncremental="2"
|
||||
GenerateDebugInformation="true"
|
||||
ProgramDatabaseFile="$(IntDir)$(TargetName).pdb"
|
||||
SubSystem="2"
|
||||
SubSystem="1"
|
||||
TargetMachine="1"
|
||||
/>
|
||||
<Tool
|
||||
|
|
|
@ -3,6 +3,7 @@
|
|||
// Headers
|
||||
////////////////////////////////////////////////////////////
|
||||
#include <SFML/Graphics.hpp>
|
||||
#include <SFML/OpenGL.hpp>
|
||||
#include <iostream>
|
||||
|
||||
|
||||
|
|
|
@ -3,6 +3,7 @@
|
|||
// Headers
|
||||
////////////////////////////////////////////////////////////
|
||||
#include <SFML/Graphics.hpp>
|
||||
#include <windows.h>
|
||||
#include <cmath>
|
||||
|
||||
HWND Button;
|
||||
|
|
|
@ -1,11 +1,44 @@
|
|||
/*
|
||||
#include <SFML/Window.hpp>
|
||||
|
||||
void f(void*)
|
||||
{
|
||||
sf::Context context;
|
||||
}
|
||||
|
||||
int main()
|
||||
{
|
||||
{
|
||||
sf::Thread t(&f);
|
||||
t.Launch();
|
||||
}
|
||||
|
||||
{
|
||||
sf::Window window(sf::VideoMode(640, 480), "Test");
|
||||
|
||||
{
|
||||
sf::Thread t(&f);
|
||||
t.Launch();
|
||||
}
|
||||
}
|
||||
|
||||
{
|
||||
sf::Thread t(&f);
|
||||
t.Launch();
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
*/
|
||||
|
||||
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
// Headers
|
||||
////////////////////////////////////////////////////////////
|
||||
#include <SFML/Window.hpp>
|
||||
#include <fstream>
|
||||
#include <SFML/OpenGL.hpp>
|
||||
|
||||
#include <iostream>
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
/// Entry point of application
|
||||
|
@ -117,3 +150,4 @@ int main()
|
|||
|
||||
return EXIT_SUCCESS;
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue