lauchmelder/SFML
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Renamed internal classes related to OpenGL contexts in the window module

Browse source 
git-svn-id: https://sfml.svn.sourceforge.net/svnroot/sfml/branches/sfml2@1501 4e206d99-4929-0410-ac5d-dfc041789085
This commit is contained in:
LaurentGom 2010-04-09 06:55:29 +00:00
parent 51ff7296ad
commit a512479a42
13 changed files with 105 additions and 106 deletions
Download patch file Download diff file Expand all files Collapse all files

4
include/SFML/Window/Context.hpp
View file

@ -36,7 +36,7 @@ namespace sf
{
namespace priv
{
class ContextGL;
class GlContext;
}
////////////////////////////////////////////////////////////
@ -88,7 +88,7 @@ private :
////////////////////////////////////////////////////////////
// Member data
////////////////////////////////////////////////////////////
priv::ContextGL* myContext; ///< Internal OpenGL context
priv::GlContext* myContext; ///< Internal OpenGL context
};
} // namespace sf

6
include/SFML/Window/Window.hpp
View file

@ -28,10 +28,10 @@
////////////////////////////////////////////////////////////
// Headers
////////////////////////////////////////////////////////////
#include <SFML/Window/ContextSettings.hpp>
#include <SFML/Window/Input.hpp>
#include <SFML/Window/VideoMode.hpp>
#include <SFML/Window/WindowHandle.hpp>
#include <SFML/Window/ContextSettings.hpp>
#include <SFML/Window/WindowStyle.hpp>
#include <SFML/System/Clock.hpp>
#include <SFML/System/NonCopyable.hpp>
@ -42,8 +42,8 @@ namespace sf
{
namespace priv
{
class GlContext;
class WindowImpl;
class ContextGL;
}
class Event;
@ -470,7 +470,7 @@ private :
// Member data
////////////////////////////////////////////////////////////
priv::WindowImpl* myWindow; ///< Platform-specific implementation of the window
priv::ContextGL* myContext; ///< Platform-specific implementation of the OpenGL context
priv::GlContext* myContext; ///< Platform-specific implementation of the OpenGL context
Input myInput; ///< Input manager connected to window
Clock myClock; ///< Clock for measuring the elapsed time between frames
float myLastFrameTime; ///< Time elapsed since last frame