diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
index a80d26c7..0e87aaa4 100644
--- a/examples/CMakeLists.txt
+++ b/examples/CMakeLists.txt
@@ -37,5 +37,5 @@ if(SFML_BUILD_GRAPHICS)
endif()
endif()
if(SFML_BUILD_GRAPHICS AND SFML_BUILD_AUDIO)
- add_subdirectory(pong)
+ add_subdirectory(tennis)
endif()
diff --git a/examples/android/app/src/main/assets/canary.wav b/examples/android/app/src/main/assets/canary.wav
deleted file mode 100644
index a0f3aecc..00000000
Binary files a/examples/android/app/src/main/assets/canary.wav and /dev/null differ
diff --git a/examples/android/app/src/main/assets/orchestral.ogg b/examples/android/app/src/main/assets/orchestral.ogg
deleted file mode 100644
index f764d61d..00000000
Binary files a/examples/android/app/src/main/assets/orchestral.ogg and /dev/null differ
diff --git a/examples/android/app/src/main/assets/sansation.ttf b/examples/android/app/src/main/assets/sansation.ttf
deleted file mode 100644
index d85fbc81..00000000
Binary files a/examples/android/app/src/main/assets/sansation.ttf and /dev/null differ
diff --git a/examples/android/app/src/main/assets/tuffy.ttf b/examples/android/app/src/main/assets/tuffy.ttf
new file mode 100755
index 00000000..8ea64709
Binary files /dev/null and b/examples/android/app/src/main/assets/tuffy.ttf differ
diff --git a/examples/android/app/src/main/jni/main.cpp b/examples/android/app/src/main/jni/main.cpp
index edf67b45..10240e37 100644
--- a/examples/android/app/src/main/jni/main.cpp
+++ b/examples/android/app/src/main/jni/main.cpp
@@ -91,21 +91,13 @@ int main(int argc, char *argv[])
image.setOrigin(texture.getSize().x/2, texture.getSize().y/2);
sf::Font font;
- if (!font.loadFromFile("sansation.ttf"))
+ if (!font.loadFromFile("tuffy.ttf"))
return EXIT_FAILURE;
sf::Text text("Tap anywhere to move the logo.", font, 64);
text.setFillColor(sf::Color::Black);
text.setPosition(10, 10);
- // Loading canary.wav fails for me for now; haven't had time to test why
-
- /*sf::Music music;
- if(!music.openFromFile("canary.wav"))
- return EXIT_FAILURE;
-
- music.play();*/
-
sf::View view = window.getDefaultView();
sf::Color background = sf::Color::White;
diff --git a/examples/asset_licenses.md b/examples/asset_licenses.md
new file mode 100644
index 00000000..2857a9de
--- /dev/null
+++ b/examples/asset_licenses.md
@@ -0,0 +1,25 @@
+# Assets used by SFML's example projects.
+
+All assets are under public domain (CC0):
+
+| Name | Author | Link |
+| ------------------------------- | ------------------------- | -------------------------- |
+| Tuffy 1.1 font | Thatcher Ulrich | [Ulrich's fonts][1] |
+| sounds/resources/doodle_pop.ogg | MrZeusTheCoder | [public-domain][2] |
+| tennis/resources/ball.wav | MrZeusTheCoder | [public-domain][2] |
+| opengl/resources/background.jpg | Nidhoggn | [Open Game Art][3] |
+| shader/resources/background.jpg | Arcana Dea | [Public Domain Images][4] |
+| shader/resources/devices.png | Kenny.nl | [Game Icons Pack][5] |
+| sound/resources/ding.flac | Kenny.nl | [Interface Sounds Pack][6] |
+| win32/resources/image1.jpg | Kenny.nl | [Toon Character Pack][7] |
+| win32/resources/image2.jpg | Kenny.nl | [Toon Character Pack][7] |
+| sound/resources/killdeer.wav | US National Park Services | [Bird sounds][8] |
+
+[1]: http://tulrich.com/fonts/
+[2]: https://github.com/MrZeusTheCoder/public-domain
+[3]: https://opengameart.org/content/backgrounds-3
+[4]: https://www.publicdomainpictures.net/en/view-image.php?image=10979&picture=monarch-butterfly
+[5]: https://www.kenney.nl/assets/game-icons
+[6]: https://www.kenney.nl/assets/interface-sounds
+[7]: https://www.kenney.nl/assets/toon-characters-1
+[8]: https://www.nps.gov/subjects/sound/sounds-killdeer.htm
\ No newline at end of file
diff --git a/examples/cocoa/CMakeLists.txt b/examples/cocoa/CMakeLists.txt
index dfa46be5..e94a7d18 100644
--- a/examples/cocoa/CMakeLists.txt
+++ b/examples/cocoa/CMakeLists.txt
@@ -39,9 +39,8 @@ set(SRC ${SRCROOT}/CocoaAppDelegate.h
compile_xib(INPUT "${SRCROOT}/MainMenu.xib" OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/MainMenu.nib")
# all resource files
-set(RESOURCES ${SRCROOT}/resources/logo.png
- ${SRCROOT}/resources/icon.icns
- ${SRCROOT}/resources/sansation.ttf
+set(RESOURCES ${SRCROOT}/resources/icon.icns
+ ${SRCROOT}/resources/tuffy.ttf
${SRCROOT}/resources/blue.png
${SRCROOT}/resources/green.png
${SRCROOT}/resources/red.png
diff --git a/examples/cocoa/CocoaAppDelegate.mm b/examples/cocoa/CocoaAppDelegate.mm
index 48d402bd..9edf1699 100644
--- a/examples/cocoa/CocoaAppDelegate.mm
+++ b/examples/cocoa/CocoaAppDelegate.mm
@@ -54,7 +54,7 @@ struct SFMLmainWindow
unsigned int wh = renderWindow.getSize().y;
sprite.setPosition(sf::Vector2f(ww, wh) / 2.f);
- if (!font.loadFromFile(resPath + "/sansation.ttf"))
+ if (!font.loadFromFile(resPath + "/tuffy.ttf"))
NSLog(@"Couldn't load the font");
text.setFillColor(sf::Color::White);
diff --git a/examples/cocoa/resources/sansation.ttf b/examples/cocoa/resources/sansation.ttf
deleted file mode 100644
index d85fbc81..00000000
Binary files a/examples/cocoa/resources/sansation.ttf and /dev/null differ
diff --git a/examples/cocoa/resources/tuffy.ttf b/examples/cocoa/resources/tuffy.ttf
new file mode 100755
index 00000000..8ea64709
Binary files /dev/null and b/examples/cocoa/resources/tuffy.ttf differ
diff --git a/examples/island/Island.cpp b/examples/island/Island.cpp
index 50a8f1ea..8d1bd3ea 100644
--- a/examples/island/Island.cpp
+++ b/examples/island/Island.cpp
@@ -85,7 +85,7 @@ int main()
window.setVerticalSyncEnabled(true);
sf::Font font;
- if (!font.loadFromFile("resources/sansation.ttf"))
+ if (!font.loadFromFile("resources/tuffy.ttf"))
return EXIT_FAILURE;
// Create all of our graphics resources
diff --git a/examples/island/resources/sansation.ttf b/examples/island/resources/sansation.ttf
deleted file mode 100644
index d85fbc81..00000000
Binary files a/examples/island/resources/sansation.ttf and /dev/null differ
diff --git a/examples/island/resources/tuffy.ttf b/examples/island/resources/tuffy.ttf
new file mode 100755
index 00000000..8ea64709
Binary files /dev/null and b/examples/island/resources/tuffy.ttf differ
diff --git a/examples/joystick/Joystick.cpp b/examples/joystick/Joystick.cpp
index 0ff7cf91..864ca057 100644
--- a/examples/joystick/Joystick.cpp
+++ b/examples/joystick/Joystick.cpp
@@ -88,12 +88,12 @@ namespace
int main()
{
// Create the window of the application
- sf::RenderWindow window(sf::VideoMode(400, 680), "Joystick", sf::Style::Close);
+ sf::RenderWindow window(sf::VideoMode(400, 775), "Joystick", sf::Style::Close);
window.setVerticalSyncEnabled(true);
// Load the text font
sf::Font font;
- if (!font.loadFromFile("resources/sansation.ttf"))
+ if (!font.loadFromFile("resources/tuffy.ttf"))
return EXIT_FAILURE;
// Set up our string conversion parameters
diff --git a/examples/joystick/resources/sansation.ttf b/examples/joystick/resources/sansation.ttf
deleted file mode 100644
index d85fbc81..00000000
Binary files a/examples/joystick/resources/sansation.ttf and /dev/null differ
diff --git a/examples/joystick/resources/tuffy.ttf b/examples/joystick/resources/tuffy.ttf
new file mode 100755
index 00000000..8ea64709
Binary files /dev/null and b/examples/joystick/resources/tuffy.ttf differ
diff --git a/examples/opengl/CMakeLists.txt b/examples/opengl/CMakeLists.txt
index 29b46680..d72a5ddd 100644
--- a/examples/opengl/CMakeLists.txt
+++ b/examples/opengl/CMakeLists.txt
@@ -7,8 +7,7 @@ set(SRC ${SRCROOT}/OpenGL.cpp)
if (SFML_OS_IOS)
set(RESOURCES
${CMAKE_CURRENT_SOURCE_DIR}/resources/background.jpg
- ${CMAKE_CURRENT_SOURCE_DIR}/resources/texture.jpg
- ${CMAKE_CURRENT_SOURCE_DIR}/resources/sansation.ttf)
+ ${CMAKE_CURRENT_SOURCE_DIR}/resources/tuffy.ttf)
set_source_files_properties(${RESOURCES} PROPERTIES MACOSX_PACKAGE_LOCATION Resources)
endif()
diff --git a/examples/opengl/OpenGL.cpp b/examples/opengl/OpenGL.cpp
index e11a8c1b..30a843f8 100644
--- a/examples/opengl/OpenGL.cpp
+++ b/examples/opengl/OpenGL.cpp
@@ -55,7 +55,7 @@ int main()
// Create some text to draw on top of our OpenGL object
sf::Font font;
- if (!font.loadFromFile(resourcesDir() + "sansation.ttf"))
+ if (!font.loadFromFile(resourcesDir() + "tuffy.ttf"))
return EXIT_FAILURE;
sf::Text text("SFML / OpenGL demo", font);
sf::Text sRgbInstructions("Press space to toggle sRGB conversion", font);
@@ -63,13 +63,13 @@ int main()
text.setFillColor(sf::Color(255, 255, 255, 170));
sRgbInstructions.setFillColor(sf::Color(255, 255, 255, 170));
mipmapInstructions.setFillColor(sf::Color(255, 255, 255, 170));
- text.setPosition(250.f, 450.f);
- sRgbInstructions.setPosition(150.f, 500.f);
- mipmapInstructions.setPosition(180.f, 550.f);
+ text.setPosition(280.f, 450.f);
+ sRgbInstructions.setPosition(175.f, 500.f);
+ mipmapInstructions.setPosition(200.f, 550.f);
// Load a texture to apply to our 3D cube
sf::Texture texture;
- if (!texture.loadFromFile(resourcesDir() + "texture.jpg"))
+ if (!texture.loadFromFile(resourcesDir() + "logo.png"))
return EXIT_FAILURE;
// Attempt to generate a mipmap for our cube texture
@@ -209,7 +209,7 @@ int main()
if (mipmapEnabled)
{
// We simply reload the texture to disable mipmapping
- if (!texture.loadFromFile(resourcesDir() + "texture.jpg"))
+ if (!texture.loadFromFile(resourcesDir() + "logo.png"))
return EXIT_FAILURE;
mipmapEnabled = false;
@@ -274,7 +274,7 @@ int main()
#ifdef SFML_SYSTEM_IOS
pos = sf::Touch::getPosition(0);
#else
- pos = sf::Mouse::getPosition();
+ pos = sf::Mouse::getPosition(window);
#endif
float x = pos.x * 200.f / window.getSize().x - 100.f;
diff --git a/examples/opengl/resources/background.jpg b/examples/opengl/resources/background.jpg
index 20724fa9..fb3b4185 100644
Binary files a/examples/opengl/resources/background.jpg and b/examples/opengl/resources/background.jpg differ
diff --git a/examples/opengl/resources/logo.png b/examples/opengl/resources/logo.png
new file mode 100644
index 00000000..ffee4ce8
Binary files /dev/null and b/examples/opengl/resources/logo.png differ
diff --git a/examples/opengl/resources/sansation.ttf b/examples/opengl/resources/sansation.ttf
deleted file mode 100644
index d85fbc81..00000000
Binary files a/examples/opengl/resources/sansation.ttf and /dev/null differ
diff --git a/examples/opengl/resources/texture.jpg b/examples/opengl/resources/texture.jpg
deleted file mode 100644
index 6cf7528e..00000000
Binary files a/examples/opengl/resources/texture.jpg and /dev/null differ
diff --git a/examples/opengl/resources/tuffy.ttf b/examples/opengl/resources/tuffy.ttf
new file mode 100755
index 00000000..8ea64709
Binary files /dev/null and b/examples/opengl/resources/tuffy.ttf differ
diff --git a/examples/pong/resources/ball.wav b/examples/pong/resources/ball.wav
deleted file mode 100644
index 8b3cfbad..00000000
Binary files a/examples/pong/resources/ball.wav and /dev/null differ
diff --git a/examples/pong/resources/sansation.ttf b/examples/pong/resources/sansation.ttf
deleted file mode 100644
index d85fbc81..00000000
Binary files a/examples/pong/resources/sansation.ttf and /dev/null differ
diff --git a/examples/shader/Shader.cpp b/examples/shader/Shader.cpp
index 8a81fde3..ed75416a 100644
--- a/examples/shader/Shader.cpp
+++ b/examples/shader/Shader.cpp
@@ -17,7 +17,7 @@ class Pixelate : public Effect
public:
Pixelate() :
- Effect("pixelate")
+ Effect("Pixelate")
{
}
@@ -63,7 +63,7 @@ class WaveBlur : public Effect
public:
WaveBlur() :
- Effect("wave + blur")
+ Effect("Wave + Blur")
{
}
@@ -127,7 +127,7 @@ class StormBlink : public Effect
public:
StormBlink() :
- Effect("storm + blink")
+ Effect("Storm + Blink")
{
}
@@ -182,7 +182,7 @@ class Edge : public Effect
public:
Edge() :
- Effect("edge post-effect")
+ Effect("Edge Post-effect")
{
}
@@ -266,7 +266,7 @@ class Geometry : public Effect
public:
Geometry() :
- Effect("geometry shader billboards"),
+ Effect("Geometry Shader Billboards"),
m_pointCloud(sf::Points, 10000)
{
}
@@ -352,7 +352,7 @@ int main()
// Load the application font and pass it to the Effect class
sf::Font font;
- if (!font.loadFromFile("resources/sansation.ttf"))
+ if (!font.loadFromFile("resources/tuffy.ttf"))
return EXIT_FAILURE;
Effect::setFont(font);
@@ -438,7 +438,11 @@ int main()
effects[current]->update(clock.getElapsedTime().asSeconds(), x, y);
// Clear the window
- window.clear(sf::Color(255, 128, 0));
+ if(effects[current]->getName() == "Edge Post-effect"){
+ window.clear(sf::Color::White);
+ } else {
+ window.clear(sf::Color(50, 50, 50));
+ }
// Draw the current example
window.draw(*effects[current]);
diff --git a/examples/shader/resources/background.jpg b/examples/shader/resources/background.jpg
index f37d7aed..4c814cb4 100644
Binary files a/examples/shader/resources/background.jpg and b/examples/shader/resources/background.jpg differ
diff --git a/examples/shader/resources/devices.png b/examples/shader/resources/devices.png
index 6b1cbc85..866294a2 100644
Binary files a/examples/shader/resources/devices.png and b/examples/shader/resources/devices.png differ
diff --git a/examples/shader/resources/sansation.ttf b/examples/shader/resources/sansation.ttf
deleted file mode 100644
index d85fbc81..00000000
Binary files a/examples/shader/resources/sansation.ttf and /dev/null differ
diff --git a/examples/shader/resources/tuffy.ttf b/examples/shader/resources/tuffy.ttf
new file mode 100755
index 00000000..8ea64709
Binary files /dev/null and b/examples/shader/resources/tuffy.ttf differ
diff --git a/examples/sound/Sound.cpp b/examples/sound/Sound.cpp
index e71aa0d0..0cd91a83 100644
--- a/examples/sound/Sound.cpp
+++ b/examples/sound/Sound.cpp
@@ -15,11 +15,11 @@ void playSound()
{
// Load a sound buffer from a wav file
sf::SoundBuffer buffer;
- if (!buffer.loadFromFile("resources/canary.wav"))
+ if (!buffer.loadFromFile("resources/killdeer.wav"))
return;
// Display sound informations
- std::cout << "canary.wav:" << std::endl;
+ std::cout << "killdeer.wav:" << std::endl;
std::cout << " " << buffer.getDuration().asSeconds() << " seconds" << std::endl;
std::cout << " " << buffer.getSampleRate() << " samples / sec" << std::endl;
std::cout << " " << buffer.getChannelCount() << " channels" << std::endl;
@@ -88,7 +88,7 @@ int main()
playSound();
// Play music from an ogg file
- playMusic("orchestral.ogg");
+ playMusic("doodle_pop.ogg");
// Play music from a flac file
playMusic("ding.flac");
diff --git a/examples/sound/resources/canary.wav b/examples/sound/resources/canary.wav
deleted file mode 100644
index a0f3aecc..00000000
Binary files a/examples/sound/resources/canary.wav and /dev/null differ
diff --git a/examples/sound/resources/ding.flac b/examples/sound/resources/ding.flac
index 4e62c786..9c873290 100644
Binary files a/examples/sound/resources/ding.flac and b/examples/sound/resources/ding.flac differ
diff --git a/examples/sound/resources/doodle_pop.ogg b/examples/sound/resources/doodle_pop.ogg
new file mode 100644
index 00000000..555ea348
Binary files /dev/null and b/examples/sound/resources/doodle_pop.ogg differ
diff --git a/examples/sound/resources/killdeer.wav b/examples/sound/resources/killdeer.wav
new file mode 100644
index 00000000..46080e9f
Binary files /dev/null and b/examples/sound/resources/killdeer.wav differ
diff --git a/examples/sound/resources/orchestral.ogg b/examples/sound/resources/orchestral.ogg
deleted file mode 100644
index f764d61d..00000000
Binary files a/examples/sound/resources/orchestral.ogg and /dev/null differ
diff --git a/examples/pong/CMakeLists.txt b/examples/tennis/CMakeLists.txt
similarity index 70%
rename from examples/pong/CMakeLists.txt
rename to examples/tennis/CMakeLists.txt
index 54e70c8b..d2699368 100644
--- a/examples/pong/CMakeLists.txt
+++ b/examples/tennis/CMakeLists.txt
@@ -1,17 +1,17 @@
-set(SRCROOT ${PROJECT_SOURCE_DIR}/examples/pong)
+set(SRCROOT ${PROJECT_SOURCE_DIR}/examples/tennis)
# all source files
-set(SRC ${SRCROOT}/Pong.cpp)
+set(SRC ${SRCROOT}/Tennis.cpp)
if (SFML_OS_IOS)
set(RESOURCES
${CMAKE_CURRENT_SOURCE_DIR}/resources/ball.wav
- ${CMAKE_CURRENT_SOURCE_DIR}/resources/sansation.ttf)
+ ${CMAKE_CURRENT_SOURCE_DIR}/resources/tuffy.ttf)
set_source_files_properties(${RESOURCES} PROPERTIES MACOSX_PACKAGE_LOCATION Resources)
endif()
# define the pong target
-sfml_add_example(pong GUI_APP
+sfml_add_example(tennis GUI_APP
SOURCES ${SRC}
BUNDLE_RESOURCES ${RESOURCES}
DEPENDS sfml-audio sfml-graphics
diff --git a/examples/pong/Pong.cpp b/examples/tennis/Tennis.cpp
similarity index 91%
rename from examples/pong/Pong.cpp
rename to examples/tennis/Tennis.cpp
index 796d2ab2..734098f3 100644
--- a/examples/pong/Pong.cpp
+++ b/examples/tennis/Tennis.cpp
@@ -39,7 +39,7 @@ int main()
float ballRadius = 10.f;
// Create the window of the application
- sf::RenderWindow window(sf::VideoMode(gameWidth, gameHeight, 32), "SFML Pong",
+ sf::RenderWindow window(sf::VideoMode(gameWidth, gameHeight, 32), "SFML Tennis",
sf::Style::Titlebar | sf::Style::Close);
window.setVerticalSyncEnabled(true);
@@ -49,6 +49,14 @@ int main()
return EXIT_FAILURE;
sf::Sound ballSound(ballSoundBuffer);
+ // Create the SFML logo texture:
+ sf::Texture sfmlLogoTexture;
+ if(!sfmlLogoTexture.loadFromFile(resourcesDir() + "sfml_logo.png"))
+ return EXIT_FAILURE;
+ sf::Sprite sfmlLogo;
+ sfmlLogo.setTexture(sfmlLogoTexture);
+ sfmlLogo.setPosition(170, 50);
+
// Create the left paddle
sf::RectangleShape leftPaddle;
leftPaddle.setSize(paddleSize - sf::Vector2f(3, 3));
@@ -68,27 +76,27 @@ int main()
// Create the ball
sf::CircleShape ball;
ball.setRadius(ballRadius - 3);
- ball.setOutlineThickness(3);
+ ball.setOutlineThickness(2);
ball.setOutlineColor(sf::Color::Black);
ball.setFillColor(sf::Color::White);
ball.setOrigin(ballRadius / 2, ballRadius / 2);
// Load the text font
sf::Font font;
- if (!font.loadFromFile(resourcesDir() + "sansation.ttf"))
+ if (!font.loadFromFile(resourcesDir() + "tuffy.ttf"))
return EXIT_FAILURE;
// Initialize the pause message
sf::Text pauseMessage;
pauseMessage.setFont(font);
pauseMessage.setCharacterSize(40);
- pauseMessage.setPosition(170.f, 150.f);
+ pauseMessage.setPosition(170.f, 200.f);
pauseMessage.setFillColor(sf::Color::White);
-
+
#ifdef SFML_SYSTEM_IOS
- pauseMessage.setString("Welcome to SFML pong!\nTouch the screen to start the game");
+ pauseMessage.setString("Welcome to SFML Tennis!\nTouch the screen to start the game.");
#else
- pauseMessage.setString("Welcome to SFML pong!\nPress space to start the game");
+ pauseMessage.setString("Welcome to SFML Tennis!\n\nPress space to start the game.");
#endif
// Define the paddles properties
@@ -197,21 +205,21 @@ int main()
ball.move(std::cos(ballAngle) * factor, std::sin(ballAngle) * factor);
#ifdef SFML_SYSTEM_IOS
- const std::string inputString = "Touch the screen to restart";
+ const std::string inputString = "Touch the screen to restart.";
#else
- const std::string inputString = "Press space to restart or\nescape to exit";
+ const std::string inputString = "Press space to restart or\nescape to exit.";
#endif
// Check collisions between the ball and the screen
if (ball.getPosition().x - ballRadius < 0.f)
{
isPlaying = false;
- pauseMessage.setString("You Lost!\n" + inputString);
+ pauseMessage.setString("You Lost!\n\n" + inputString);
}
if (ball.getPosition().x + ballRadius > gameWidth)
{
isPlaying = false;
- pauseMessage.setString("You Won!\n" + inputString);
+ pauseMessage.setString("You Won!\n\n" + inputString);
}
if (ball.getPosition().y - ballRadius < 0.f)
{
@@ -259,7 +267,7 @@ int main()
}
// Clear the window
- window.clear(sf::Color(50, 200, 50));
+ window.clear(sf::Color(50, 50, 50));
if (isPlaying)
{
@@ -272,6 +280,7 @@ int main()
{
// Draw the pause message
window.draw(pauseMessage);
+ window.draw(sfmlLogo);
}
// Display things on screen
diff --git a/examples/tennis/resources/ball.wav b/examples/tennis/resources/ball.wav
new file mode 100644
index 00000000..c969f470
Binary files /dev/null and b/examples/tennis/resources/ball.wav differ
diff --git a/examples/tennis/resources/sfml_logo.png b/examples/tennis/resources/sfml_logo.png
new file mode 100644
index 00000000..509acc07
Binary files /dev/null and b/examples/tennis/resources/sfml_logo.png differ
diff --git a/examples/tennis/resources/tuffy.ttf b/examples/tennis/resources/tuffy.ttf
new file mode 100755
index 00000000..8ea64709
Binary files /dev/null and b/examples/tennis/resources/tuffy.ttf differ
diff --git a/examples/win32/resources/image1.jpg b/examples/win32/resources/image1.jpg
index 50ecf043..8e734e2d 100644
Binary files a/examples/win32/resources/image1.jpg and b/examples/win32/resources/image1.jpg differ
diff --git a/examples/win32/resources/image2.jpg b/examples/win32/resources/image2.jpg
index 73370289..f4f7e821 100644
Binary files a/examples/win32/resources/image2.jpg and b/examples/win32/resources/image2.jpg differ
diff --git a/tools/xcode/templates/SFML/SFML App.xctemplate/TemplateInfo.plist.in b/tools/xcode/templates/SFML/SFML App.xctemplate/TemplateInfo.plist.in
index a2b2dc72..5014ee45 100644
--- a/tools/xcode/templates/SFML/SFML App.xctemplate/TemplateInfo.plist.in
+++ b/tools/xcode/templates/SFML/SFML App.xctemplate/TemplateInfo.plist.in
@@ -60,9 +60,9 @@ subject to the following restrictions:
ResourcePath.mm
ResourcePath.hpp
main.cpp
- cute_image.jpg
- nice_music.ogg
- sansation.ttf
+ background.jpg
+ doodle_pop.ogg
+ tuffy.ttf
icon.png
@@ -93,26 +93,26 @@ subject to the following restrictions:
- cute_image.jpg
+ background.jpg
Path
- cute_image.jpg
+ background.jpg
Group
Resources
- nice_music.ogg
+ doodle_pop.ogg
Path
- nice_music.ogg
+ doodle_pop.ogg
Group
Resources
- sansation.ttf
+ tuffy.ttf
Path
- sansation.ttf
+ tuffy.ttf
Group
Resources
diff --git a/tools/xcode/templates/SFML/SFML App.xctemplate/background.jpg b/tools/xcode/templates/SFML/SFML App.xctemplate/background.jpg
new file mode 100644
index 00000000..bdf133d1
Binary files /dev/null and b/tools/xcode/templates/SFML/SFML App.xctemplate/background.jpg differ
diff --git a/tools/xcode/templates/SFML/SFML App.xctemplate/cute_image.jpg b/tools/xcode/templates/SFML/SFML App.xctemplate/cute_image.jpg
deleted file mode 100644
index 20724fa9..00000000
Binary files a/tools/xcode/templates/SFML/SFML App.xctemplate/cute_image.jpg and /dev/null differ
diff --git a/tools/xcode/templates/SFML/SFML App.xctemplate/doodle_pop.ogg b/tools/xcode/templates/SFML/SFML App.xctemplate/doodle_pop.ogg
new file mode 100644
index 00000000..555ea348
Binary files /dev/null and b/tools/xcode/templates/SFML/SFML App.xctemplate/doodle_pop.ogg differ
diff --git a/tools/xcode/templates/SFML/SFML App.xctemplate/main.cpp b/tools/xcode/templates/SFML/SFML App.xctemplate/main.cpp
index 58ac6660..129ff88e 100644
--- a/tools/xcode/templates/SFML/SFML App.xctemplate/main.cpp
+++ b/tools/xcode/templates/SFML/SFML App.xctemplate/main.cpp
@@ -34,14 +34,14 @@ int main(int, char const**)
// Load a sprite to display
sf::Texture texture;
- if (!texture.loadFromFile(resourcePath() + "cute_image.jpg")) {
+ if (!texture.loadFromFile(resourcePath() + "background.jpg")) {
return EXIT_FAILURE;
}
sf::Sprite sprite(texture);
// Create a graphical text to display
sf::Font font;
- if (!font.loadFromFile(resourcePath() + "sansation.ttf")) {
+ if (!font.loadFromFile(resourcePath() + "tuffy.ttf")) {
return EXIT_FAILURE;
}
sf::Text text("Hello SFML", font, 50);
@@ -49,7 +49,7 @@ int main(int, char const**)
// Load a music to play
sf::Music music;
- if (!music.openFromFile(resourcePath() + "nice_music.ogg")) {
+ if (!music.openFromFile(resourcePath() + "doodle_pop.ogg")) {
return EXIT_FAILURE;
}
diff --git a/tools/xcode/templates/SFML/SFML App.xctemplate/nice_music.ogg b/tools/xcode/templates/SFML/SFML App.xctemplate/nice_music.ogg
deleted file mode 100644
index f764d61d..00000000
Binary files a/tools/xcode/templates/SFML/SFML App.xctemplate/nice_music.ogg and /dev/null differ
diff --git a/tools/xcode/templates/SFML/SFML App.xctemplate/sansation.ttf b/tools/xcode/templates/SFML/SFML App.xctemplate/sansation.ttf
deleted file mode 100644
index d85fbc81..00000000
Binary files a/tools/xcode/templates/SFML/SFML App.xctemplate/sansation.ttf and /dev/null differ
diff --git a/tools/xcode/templates/SFML/SFML App.xctemplate/tuffy.ttf b/tools/xcode/templates/SFML/SFML App.xctemplate/tuffy.ttf
new file mode 100755
index 00000000..8ea64709
Binary files /dev/null and b/tools/xcode/templates/SFML/SFML App.xctemplate/tuffy.ttf differ
diff --git a/tools/xcode/templates/SFML/SFML CLT.xctemplate/TemplateInfo.plist b/tools/xcode/templates/SFML/SFML CLT.xctemplate/TemplateInfo.plist
index 01e20e9d..b3a494c8 100644
--- a/tools/xcode/templates/SFML/SFML CLT.xctemplate/TemplateInfo.plist
+++ b/tools/xcode/templates/SFML/SFML CLT.xctemplate/TemplateInfo.plist
@@ -58,9 +58,9 @@ subject to the following restrictions:
Nodes
main.cpp
- cute_image.jpg
- nice_music.ogg
- sansation.ttf
+ background.jpg
+ doodle_pop.ogg
+ tuffy.ttf
icon.png
@@ -77,26 +77,26 @@ subject to the following restrictions:
- cute_image.jpg
+ background.jpg
Path
- cute_image.jpg
+ background.jpg
Group
Resources
- nice_music.ogg
+ doodle_pop.ogg
Path
- nice_music.ogg
+ doodle_pop.ogg
Group
Resources
- sansation.ttf
+ tuffy.ttf
Path
- sansation.ttf
+ tuffy.ttf
Group
Resources
diff --git a/tools/xcode/templates/SFML/SFML CLT.xctemplate/background.jpg b/tools/xcode/templates/SFML/SFML CLT.xctemplate/background.jpg
new file mode 100644
index 00000000..bdf133d1
Binary files /dev/null and b/tools/xcode/templates/SFML/SFML CLT.xctemplate/background.jpg differ
diff --git a/tools/xcode/templates/SFML/SFML CLT.xctemplate/cute_image.jpg b/tools/xcode/templates/SFML/SFML CLT.xctemplate/cute_image.jpg
deleted file mode 100644
index 20724fa9..00000000
Binary files a/tools/xcode/templates/SFML/SFML CLT.xctemplate/cute_image.jpg and /dev/null differ
diff --git a/tools/xcode/templates/SFML/SFML CLT.xctemplate/doodle_pop.ogg b/tools/xcode/templates/SFML/SFML CLT.xctemplate/doodle_pop.ogg
new file mode 100644
index 00000000..555ea348
Binary files /dev/null and b/tools/xcode/templates/SFML/SFML CLT.xctemplate/doodle_pop.ogg differ
diff --git a/tools/xcode/templates/SFML/SFML CLT.xctemplate/main.cpp b/tools/xcode/templates/SFML/SFML CLT.xctemplate/main.cpp
index 106f6e2b..666cf9a3 100644
--- a/tools/xcode/templates/SFML/SFML CLT.xctemplate/main.cpp
+++ b/tools/xcode/templates/SFML/SFML CLT.xctemplate/main.cpp
@@ -5,7 +5,7 @@
//
// This code will work only if you selected window, graphics and audio.
//
-// In order to load the resources like cute_image.png, you have to set up
+// In order to load the resources like background.png, you have to set up
// your target scheme:
//
// - Select "Edit Scheme…" in the "Product" menu;
@@ -32,14 +32,14 @@ int main(int argc, char const** argv)
// Load a sprite to display
sf::Texture texture;
- if (!texture.loadFromFile("cute_image.jpg")) {
+ if (!texture.loadFromFile("background.jpg")) {
return EXIT_FAILURE;
}
sf::Sprite sprite(texture);
// Create a graphical text to display
sf::Font font;
- if (!font.loadFromFile("sansation.ttf")) {
+ if (!font.loadFromFile("tuffy.ttf")) {
return EXIT_FAILURE;
}
sf::Text text("Hello SFML", font, 50);
@@ -47,7 +47,7 @@ int main(int argc, char const** argv)
// Load a music to play
sf::Music music;
- if (!music.openFromFile("nice_music.ogg")) {
+ if (!music.openFromFile("doodle_pop.ogg")) {
return EXIT_FAILURE;
}
diff --git a/tools/xcode/templates/SFML/SFML CLT.xctemplate/nice_music.ogg b/tools/xcode/templates/SFML/SFML CLT.xctemplate/nice_music.ogg
deleted file mode 100644
index f764d61d..00000000
Binary files a/tools/xcode/templates/SFML/SFML CLT.xctemplate/nice_music.ogg and /dev/null differ
diff --git a/tools/xcode/templates/SFML/SFML CLT.xctemplate/sansation.ttf b/tools/xcode/templates/SFML/SFML CLT.xctemplate/sansation.ttf
deleted file mode 100644
index d85fbc81..00000000
Binary files a/tools/xcode/templates/SFML/SFML CLT.xctemplate/sansation.ttf and /dev/null differ
diff --git a/tools/xcode/templates/SFML/SFML CLT.xctemplate/tuffy.ttf b/tools/xcode/templates/SFML/SFML CLT.xctemplate/tuffy.ttf
new file mode 100755
index 00000000..8ea64709
Binary files /dev/null and b/tools/xcode/templates/SFML/SFML CLT.xctemplate/tuffy.ttf differ
diff --git a/tools/xcode/templates/readme.txt b/tools/xcode/templates/readme.txt
index 40f55ddb..225ea7ab 100644
--- a/tools/xcode/templates/readme.txt
+++ b/tools/xcode/templates/readme.txt
@@ -13,13 +13,14 @@ You can find more resources and information on the official web site: http://www
-Author & License
+Authors & Licenses
----------------
The templates were written by Marco Antognini and are provided under
the terms of the zlib/png license: http://opensource.org/licenses/zlib-license.php
-
+The assets including doodle_pop.ogg and background.jpg are public domain. More information
+can be found in the examples/ folder.
Features
--------