Commit Graph

4 Commits

Author SHA1 Message Date
Laurent Gomila
eeff685255 Merge branch 'master' into drawables
Conflicts:
	include/SFML/Graphics/Sprite.hpp
	include/SFML/Graphics/Text.hpp
	src/SFML/Graphics/Sprite.cpp
2011-12-02 20:58:14 +01:00
Laurent Gomila
5bae08a2d8 Implemented the new graphics API:
- Removed the internal classes sf::Renderer and sf::Matrix3
- Split sf::Drawable into sf::Drawable and sf::Transformable
- Added sf::Transform
- Added sf::Vertex
- Added sf::VertexArray
- Types of shapes are now handled with their own derived class
- Modified the Pong example
2011-12-01 23:24:58 +01:00
Laurent Gomila
017ef652f9 Removed the Resource and ResourcePtr classes 2011-11-05 15:50:44 +01:00
Laurent Gomila
e509f01180 Split sf::Image into sf::Image and sf::Texture (implements issue #18) 2011-07-22 22:31:27 +02:00