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

Updated Mac OS X code according to commits ff5b69d312 and 14ac411542

Browse source
This commit is contained in:
Marco Antognini 2012-03-12 09:19:07 +01:00
parent 4119c3bb31
commit 2ef92a2af2
32 changed files with 878 additions and 878 deletions
Download patch file Download diff file Expand all files Collapse all files

2
tools/xcode/templates/SFML/SFML Application Base.xctemplate/ResourcePath.hpp vendored
View file

@ -38,6 +38,6 @@
/// with the main bundle or an empty string is there is no bundle.
///
////////////////////////////////////////////////////////////
std::string ResourcePath(void);
std::string resourcePath(void);
#endif

2
tools/xcode/templates/SFML/SFML Application Base.xctemplate/ResourcePath.mm vendored
View file

@ -30,7 +30,7 @@
#import <Foundation/Foundation.h>
////////////////////////////////////////////////////////////
std::string ResourcePath(void)
std::string resourcePath(void)
{
NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init];

32
tools/xcode/templates/SFML/SFML Application Base.xctemplate/TemplateInfo.plist vendored
View file

@ -237,7 +237,7 @@ sf::Sprite sprite(texture);
</string>
<key>main.cpp:main:image_load</key>
<string>if (!texture.LoadFromFile(ResourcePath() + "cute_image.jpg"))</string>
<string>if (!texture.loadFromFile(resourcePath() + "cute_image.jpg"))</string>
<key>main.cpp:main:text_init</key>
<string>
@ -248,22 +248,22 @@ sf::Font font;
<key>main.cpp:main:text_finalize</key>
<string> return EXIT_FAILURE;
sf::Text text("Hello SFML", font, 50);
text.SetColor(sf::Color::Black);
text.setColor(sf::Color::Black);
</string>
<key>main.cpp:main:text_load</key>
<string>if (!font.LoadFromFile(ResourcePath() + "sansation.ttf"))</string>
<string>if (!font.loadFromFile(resourcePath() + "sansation.ttf"))</string>
<key>main.cpp:main:graphics_display</key>
<string>
// Clear screen
window.Clear();
window.clear();
// Draw the sprite
window.Draw(sprite);
window.draw(sprite);
// Draw the string
window.Draw(text);
window.draw(text);
</string>
<!-- erase window module content -->
@ -368,11 +368,11 @@ text.SetColor(sf::Color::Black);
<string>
// Load a music to play
sf::Music music;
if (!music.OpenFromFile(ResourcePath() + "nice_music.ogg"))
if (!music.openFromFile(resourcePath() + "nice_music.ogg"))
return EXIT_FAILURE;
// Play the music
music.Play();
music.play();
</string>
<key>nice_music.ogg</key>
<dict>
@ -548,26 +548,26 @@ int main (int argc, const char * argv[])
<key>main.cpp:main:event_loop</key>
<string>
// Start the game loop
while (window.IsOpen())
while (window.isOpen())
{
// Process events
sf::Event event;
while (window.PollEvent(event))
while (window.pollEvent(event))
{
// Close window : exit
if (event.Type == sf::Event::Closed)
window.Close();
if (event.type == sf::Event::Closed)
window.close();
// Escape pressed : exit
if (event.Type == sf::Event::KeyPressed &amp;&amp; event.Key.Code == sf::Keyboard::Escape)
window.Close();
if (event.type == sf::Event::KeyPressed &amp;&amp; event.key.code == sf::Keyboard::Escape)
window.close();
}
</string>
<key>main.cpp:main:display</key>
<string>
// Update the window
window.Display();
window.display();
}
</string>
@ -575,7 +575,7 @@ while (window.IsOpen())
<string>#include "ResourcePath.hpp"</string>
<key>main.cpp:main:audio_loop</key>
<string>while (music.GetStatus() == sf::Music::Playing) {
<string>while (music.getStatus() == sf::Music::Playing) {
sf::Sleep(100);
}</string>
</dict>

32
tools/xcode/templates/SFML/SFML Command Line Tool Base.xctemplate/TemplateInfo.plist vendored
View file

@ -237,7 +237,7 @@ sf::Sprite sprite(texture);
</string>
<key>main.cpp:main:image_load</key>
<string>if (!texture.LoadFromFile("cute_image.jpg"))</string>
<string>if (!texture.loadFromFile("cute_image.jpg"))</string>
<key>main.cpp:main:text_init</key>
<string>
@ -248,22 +248,22 @@ sf::Font font;
<key>main.cpp:main:text_finalize</key>
<string> return EXIT_FAILURE;
sf::Text text("Hello SFML", font, 50);
text.SetColor(sf::Color::Black);
text.setColor(sf::Color::Black);
</string>
<key>main.cpp:main:text_load</key>
<string>if (!font.LoadFromFile("sansation.ttf"))</string>
<string>if (!font.loadFromFile("sansation.ttf"))</string>
<key>main.cpp:main:graphics_display</key>
<string>
// Clear screen
window.Clear();
window.clear();
// Draw the sprite
window.Draw(sprite);
window.draw(sprite);
// Draw the string
window.Draw(text);
window.draw(text);
</string>
<!-- erase window module content -->
@ -368,11 +368,11 @@ text.SetColor(sf::Color::Black);
<string>
// Load a music to play
sf::Music music;
if (!music.OpenFromFile("nice_music.ogg"))
if (!music.openFromFile("nice_music.ogg"))
return EXIT_FAILURE;
// Play the music
music.Play();
music.play();
</string>
<key>nice_music.ogg</key>
<dict>
@ -529,26 +529,26 @@ int main (int argc, const char * argv[])
<key>main.cpp:main:event_loop</key>
<string>
// Start the game loop
while (window.IsOpen())
while (window.isOpen())
{
// Process events
sf::Event event;
while (window.PollEvent(event))
while (window.pollEvent(event))
{
// Close window : exit
if (event.Type == sf::Event::Closed)
window.Close();
if (event.type == sf::Event::Closed)
window.close();
// Escape pressed : exit
if (event.Type == sf::Event::KeyPressed &amp;&amp; event.Key.Code == sf::Keyboard::Escape)
window.Close();
if (event.type == sf::Event::KeyPressed &amp;&amp; event.key.code == sf::Keyboard::Escape)
window.close();
}
</string>
<key>main.cpp:main:display</key>
<string>
// Update the window
window.Display();
window.display();
}
</string>
@ -569,7 +569,7 @@ while (window.IsOpen())
</string>
<key>main.cpp:main:audio_loop</key>
<string>while (music.GetStatus() == sf::Music::Playing) {
<string>while (music.getStatus() == sf::Music::Playing) {
sf::Sleep(100);
}</string>
</dict>