Edgaru089/SFML
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removed some trailing spaces

Browse Source
This commit is contained in:
Marco Antognini 2014-11-17 17:32:48 +01:00
parent aef8f826f1
commit 610111c687
4 changed files with 36 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/SFML/Window/iOS/EaglContext.hpp
View File

@ -59,7 +59,7 @@ public:
///
////////////////////////////////////////////////////////////
EaglContext(EaglContext* shared);
////////////////////////////////////////////////////////////
/// \brief Create a new context attached to a window
///
@ -71,7 +71,7 @@ public:
////////////////////////////////////////////////////////////
EaglContext(EaglContext* shared, const ContextSettings& settings,
const WindowImpl* owner, unsigned int bitsPerPixel);
////////////////////////////////////////////////////////////
/// \brief Create a new context that embeds its own rendering target
///
@ -81,9 +81,9 @@ public:
/// \param height Back buffer height, in pixels
///
////////////////////////////////////////////////////////////
EaglContext(EaglContext* shared, const ContextSettings& settings,
EaglContext(EaglContext* shared, const ContextSettings& settings,
unsigned int width, unsigned int height);
////////////////////////////////////////////////////////////
/// \brief Destructor
///
@ -106,7 +106,7 @@ public:
///
////////////////////////////////////////////////////////////
virtual void display();
////////////////////////////////////////////////////////////
/// \brief Enable or disable vertical synchronization
///
@ -119,9 +119,9 @@ public:
///
////////////////////////////////////////////////////////////
virtual void setVerticalSyncEnabled(bool enabled);
protected:
////////////////////////////////////////////////////////////
/// \brief Activate the context as the current target
/// for rendering
@ -130,9 +130,9 @@ protected:
///
////////////////////////////////////////////////////////////
virtual bool makeCurrent();
private:
////////////////////////////////////////////////////////////
/// \brief Create the context
///
@ -144,9 +144,9 @@ private:
////////////////////////////////////////////////////////////
void createContext(EaglContext* shared,
const WindowImplUIKit* window,
unsigned int bitsPerPixel,
unsigned int bitsPerPixel,
const ContextSettings& settings);
////////////////////////////////////////////////////////////
// Member data
////////////////////////////////////////////////////////////
@ -157,9 +157,9 @@ private:
bool m_vsyncEnabled; ///< Vertical sync activation flag
Clock m_clock; ///< Measures the elapsed time for the fake v-sync implementation
};
} // namespace priv
} // namespace sf
#endif // SFML_EAGLCONTEXT_HPP

12
src/SFML/Window/iOS/EaglContext.mm
View File

@ -56,7 +56,7 @@ m_clock ()
m_context = [[EAGLContext alloc] initWithAPI:kEAGLRenderingAPIOpenGLES1];
}
////////////////////////////////////////////////////////////
EaglContext::EaglContext(EaglContext* shared, const ContextSettings& settings,
const WindowImpl* owner, unsigned int bitsPerPixel) :
@ -74,7 +74,7 @@ m_clock ()
////////////////////////////////////////////////////////////
EaglContext::EaglContext(EaglContext* shared, const ContextSettings& settings,
EaglContext::EaglContext(EaglContext* shared, const ContextSettings& settings,
unsigned int width, unsigned int height) :
m_context (nil),
m_framebuffer (0),
@ -96,7 +96,7 @@ EaglContext::~EaglContext()
// Activate the context, so that we can destroy the buffers
EAGLContext* previousContext = [EAGLContext currentContext];
[EAGLContext setCurrentContext:m_context];
// Destroy the buffers
if (m_framebuffer)
glDeleteFramebuffersOES(1, &m_framebuffer);
@ -161,7 +161,7 @@ void EaglContext::recreateRenderBuffers(SFView* glView)
[EAGLContext setCurrentContext:previousContext];
}
////////////////////////////////////////////////////////////
bool EaglContext::makeCurrent()
{
@ -193,11 +193,11 @@ void EaglContext::setVerticalSyncEnabled(bool enabled)
m_vsyncEnabled = enabled;
}
////////////////////////////////////////////////////////////
void EaglContext::createContext(EaglContext* shared,
const WindowImplUIKit* window,
unsigned int bitsPerPixel,
unsigned int bitsPerPixel,
const ContextSettings& settings)
{
// Save the settings

10
src/SFML/Window/iOS/WindowImplUIKit.hpp
View File

@ -57,7 +57,7 @@ public:
///
////////////////////////////////////////////////////////////
WindowImplUIKit(WindowHandle handle);
////////////////////////////////////////////////////////////
/// \brief Create the window implementation
///
@ -68,7 +68,7 @@ public:
///
////////////////////////////////////////////////////////////
WindowImplUIKit(VideoMode mode, const String& title, unsigned long style, const ContextSettings& settings);
////////////////////////////////////////////////////////////
/// \brief Destructor
///
@ -82,7 +82,7 @@ public:
///
////////////////////////////////////////////////////////////
virtual WindowHandle getSystemHandle() const;
////////////////////////////////////////////////////////////
/// \brief Get the position of the window
///
@ -216,9 +216,9 @@ private:
SFViewController* m_viewController; ///< Controller attached to the view
bool m_hasFocus; ///< Current focus state of the window
};
} // namespace priv
} // namespace sf

24
src/SFML/Window/iOS/WindowImplUIKit.mm
View File

@ -47,7 +47,7 @@ WindowImplUIKit::WindowImplUIKit(WindowHandle handle)
////////////////////////////////////////////////////////////
WindowImplUIKit::WindowImplUIKit(VideoMode mode,
const String& title,
const String& title,
unsigned long style,
const ContextSettings& /*settings*/)
{
@ -67,7 +67,7 @@ WindowImplUIKit::WindowImplUIKit(VideoMode mode,
// Assign it to the application delegate
[SFAppDelegate getInstance].sfWindow = this;
// Create the view
m_view = [[SFView alloc] initWithFrame:frame];
[m_view resignFirstResponder];
@ -96,14 +96,14 @@ void WindowImplUIKit::processEvents()
;
}
////////////////////////////////////////////////////////////
WindowHandle WindowImplUIKit::getSystemHandle() const
{
return (__bridge WindowHandle)m_window;
}
////////////////////////////////////////////////////////////
Vector2i WindowImplUIKit::getPosition() const
{
@ -123,7 +123,7 @@ Vector2u WindowImplUIKit::getSize() const
return Vector2u(m_window.frame.size.width, m_window.frame.size.height);
}
////////////////////////////////////////////////////////////
void WindowImplUIKit::setSize(const Vector2u& size)
{
@ -136,35 +136,35 @@ void WindowImplUIKit::setSize(const Vector2u& size)
[[UIApplication sharedApplication] setStatusBarOrientation:UIInterfaceOrientationPortrait];
}
////////////////////////////////////////////////////////////
void WindowImplUIKit::setTitle(const String& title)
{
// Not applicable
}
////////////////////////////////////////////////////////////
void WindowImplUIKit::setIcon(unsigned int width, unsigned int height, const Uint8* pixels)
{
// Not applicable
}
////////////////////////////////////////////////////////////
void WindowImplUIKit::setVisible(bool visible)
{
// Not applicable
}
////////////////////////////////////////////////////////////
void WindowImplUIKit::setMouseCursorVisible(bool visible)
{
// Not applicable
}
////////////////////////////////////////////////////////////
void WindowImplUIKit::setKeyRepeatEnabled(bool enabled)
{
@ -213,7 +213,7 @@ void WindowImplUIKit::setVirtualKeyboardVisible(bool visible)
else
[m_view resignFirstResponder];
}
} // namespace priv
} // namespace sf