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

Merge branch 'master' of github.com:LaurentGomila/SFML

Browse source
This commit is contained in:
Laurent Gomila 2012-03-11 19:11:00 +01:00
commit 1dad4219a6
5 changed files with 99 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

8
examples/cocoa/CocoaAppDelegate.mm
View file

@ -51,8 +51,8 @@ struct SFMLmainWindow
sprite.SetOrigin(size / 2.f);
sprite.Scale(0.3, 0.3);
unsigned int ww = renderWindow.GetWidth();
unsigned int wh = renderWindow.GetHeight();
unsigned int ww = renderWindow.GetSize().x;
unsigned int wh = renderWindow.GetSize().y;
sprite.SetPosition(sf::Vector2f(ww, wh) / 2.f);
text.SetColor(sf::Color::White);
@ -104,7 +104,7 @@ struct SFMLmainWindow
{
if (!self.initialized)
{
// Init the 1st SFML render area.
// Init the SFML render area.
self.mainWindow = new SFMLmainWindow(self.sfmlView);
self.mainWindow->text.SetString([self.textField.stringValue tostdwstring]);
self.visible = YES;
@ -141,7 +141,7 @@ struct SFMLmainWindow
self.sfmlView = nil;
self.textField = nil;
delete self.mainWindow;
delete (SFMLmainWindow *) self.mainWindow;
self.mainWindow = 0;
self.renderTimer = nil;