From bf614690ad029776554b1ae2882e565b54e88d0b Mon Sep 17 00:00:00 2001 From: Laurent Gomila Date: Tue, 1 May 2012 20:21:00 +0200 Subject: [PATCH] Some functions were still using the old naming convention --- include/SFML/Audio/Music.h | 2 +- include/SFML/Audio/SoundBuffer.h | 2 +- include/SFML/Audio/SoundStream.h | 52 ++++++++--------- include/SFML/Graphics/CircleShape.h | 4 +- include/SFML/Graphics/RectangleShape.h | 78 +++++++++++++------------- include/SFML/Graphics/Shader.h | 2 +- include/SFML/Network/Http.h | 2 +- include/SFML/Network/SocketSelector.h | 2 +- include/SFML/Network/TcpListener.h | 2 +- include/SFML/Network/UdpSocket.h | 2 +- include/SFML/Window/Window.h | 4 +- src/SFML/Graphics/Shader.cpp | 4 +- src/SFML/Window/Window.cpp | 2 +- 13 files changed, 79 insertions(+), 79 deletions(-) diff --git a/include/SFML/Audio/Music.h b/include/SFML/Audio/Music.h index a8f1716..9cc586e 100644 --- a/include/SFML/Audio/Music.h +++ b/include/SFML/Audio/Music.h @@ -158,7 +158,7 @@ CSFML_AUDIO_API void sfMusic_pause(sfMusic* music); /// /// This function stops the music if it was playing or paused, /// and does nothing if it was already stopped. -/// It also resets the playing position (unlike sfMusic_Pause). +/// It also resets the playing position (unlike sfMusic_pause). /// /// \param music Music object /// diff --git a/include/SFML/Audio/SoundBuffer.h b/include/SFML/Audio/SoundBuffer.h index 6a96043..c1d8ecc 100644 --- a/include/SFML/Audio/SoundBuffer.h +++ b/include/SFML/Audio/SoundBuffer.h @@ -132,7 +132,7 @@ CSFML_AUDIO_API sfBool sfSoundBuffer_saveToFile(const sfSoundBuffer* soundBuffer /// /// The format of the returned samples is 16 bits signed integer /// (sfInt16). The total number of samples in this array -/// is given by the sfSoundBuffer_GetSampleCount function. +/// is given by the sfSoundBuffer_getSampleCount function. /// /// \param soundBuffer Sound buffer object /// diff --git a/include/SFML/Audio/SoundStream.h b/include/SFML/Audio/SoundStream.h index 75afc6e..b63f13e 100644 --- a/include/SFML/Audio/SoundStream.h +++ b/include/SFML/Audio/SoundStream.h @@ -61,7 +61,7 @@ typedef void (*sfSoundStreamSeekCallback)(sfTime, void*); ///< /// \return A new sfSoundStream object /// //////////////////////////////////////////////////////////// -CSFML_AUDIO_API sfSoundStream* sfSoundStream_Create(sfSoundStreamGetDataCallback onGetData, +CSFML_AUDIO_API sfSoundStream* sfSoundStream_create(sfSoundStreamGetDataCallback onGetData, sfSoundStreamSeekCallback onSeek, unsigned int channelCount, unsigned int sampleRate, @@ -73,7 +73,7 @@ CSFML_AUDIO_API sfSoundStream* sfSoundStream_Create(sfSoundStreamGetDataCallback /// \param soundStream Sound stream to destroy /// //////////////////////////////////////////////////////////// -CSFML_AUDIO_API void sfSoundStream_Destroy(sfSoundStream* soundStream); +CSFML_AUDIO_API void sfSoundStream_destroy(sfSoundStream* soundStream); //////////////////////////////////////////////////////////// /// \brief Start or resume playing a sound stream @@ -87,7 +87,7 @@ CSFML_AUDIO_API void sfSoundStream_Destroy(sfSoundStream* soundStream); /// \param soundStream Sound stream object /// //////////////////////////////////////////////////////////// -CSFML_AUDIO_API void sfSoundStream_Play(sfSoundStream* soundStream); +CSFML_AUDIO_API void sfSoundStream_play(sfSoundStream* soundStream); //////////////////////////////////////////////////////////// /// \brief Pause a sound stream @@ -98,19 +98,19 @@ CSFML_AUDIO_API void sfSoundStream_Play(sfSoundStream* soundStream); /// \param soundStream Sound stream object /// //////////////////////////////////////////////////////////// -CSFML_AUDIO_API void sfSoundStream_Pause(sfSoundStream* soundStream); +CSFML_AUDIO_API void sfSoundStream_pause(sfSoundStream* soundStream); //////////////////////////////////////////////////////////// /// \brief Stop playing a sound stream /// /// This function stops the stream if it was playing or paused, /// and does nothing if it was already stopped. -/// It also resets the playing position (unlike sfSoundStream_Pause). +/// It also resets the playing position (unlike sfSoundStream_pause). /// /// \param soundStream Sound stream object /// //////////////////////////////////////////////////////////// -CSFML_AUDIO_API void sfSoundStream_Stop(sfSoundStream* soundStream); +CSFML_AUDIO_API void sfSoundStream_stop(sfSoundStream* soundStream); //////////////////////////////////////////////////////////// /// \brief Get the current status of a sound stream (stopped, paused, playing) @@ -120,7 +120,7 @@ CSFML_AUDIO_API void sfSoundStream_Stop(sfSoundStream* soundStream); /// \return Current status /// //////////////////////////////////////////////////////////// -CSFML_AUDIO_API sfSoundStatus sfSoundStream_GetStatus(const sfSoundStream* soundStream); +CSFML_AUDIO_API sfSoundStatus sfSoundStream_getStatus(const sfSoundStream* soundStream); //////////////////////////////////////////////////////////// /// \brief Return the number of channels of a sound stream @@ -132,7 +132,7 @@ CSFML_AUDIO_API sfSoundStatus sfSoundStream_GetStatus(const sfSoundStream* sound /// \return Number of channels /// //////////////////////////////////////////////////////////// -CSFML_AUDIO_API unsigned int sfSoundStream_GetChannelCount(const sfSoundStream* soundStream); +CSFML_AUDIO_API unsigned int sfSoundStream_getChannelCount(const sfSoundStream* soundStream); //////////////////////////////////////////////////////////// /// \brief Get the sample rate of a sound stream @@ -145,7 +145,7 @@ CSFML_AUDIO_API unsigned int sfSoundStream_GetChannelCount(const sfSoundStream* /// \return Sample rate, in number of samples per second /// //////////////////////////////////////////////////////////// -CSFML_AUDIO_API unsigned int sfSoundStream_GetSampleRate(const sfSoundStream* soundStream); +CSFML_AUDIO_API unsigned int sfSoundStream_getSampleRate(const sfSoundStream* soundStream); //////////////////////////////////////////////////////////// /// \brief Set the pitch of a sound stream @@ -160,7 +160,7 @@ CSFML_AUDIO_API unsigned int sfSoundStream_GetSampleRate(const sfSoundStream* so /// \param pitch New pitch to apply to the stream /// //////////////////////////////////////////////////////////// -CSFML_AUDIO_API void sfSoundStream_SetPitch(sfSoundStream* soundStream, float pitch); +CSFML_AUDIO_API void sfSoundStream_setPitch(sfSoundStream* soundStream, float pitch); //////////////////////////////////////////////////////////// /// \brief Set the volume of a sound stream @@ -172,7 +172,7 @@ CSFML_AUDIO_API void sfSoundStream_SetPitch(sfSoundStream* soundStream, float pi /// \param volume Volume of the stream /// //////////////////////////////////////////////////////////// -CSFML_AUDIO_API void sfSoundStream_SetVolume(sfSoundStream* soundStream, float volume); +CSFML_AUDIO_API void sfSoundStream_setVolume(sfSoundStream* soundStream, float volume); //////////////////////////////////////////////////////////// /// \brief Set the 3D position of a sound stream in the audio scene @@ -185,7 +185,7 @@ CSFML_AUDIO_API void sfSoundStream_SetVolume(sfSoundStream* soundStream, float v /// \param position Position of the stream in the scene /// //////////////////////////////////////////////////////////// -CSFML_AUDIO_API void sfSoundStream_SetPosition(sfSoundStream* soundStream, sfVector3f position); +CSFML_AUDIO_API void sfSoundStream_setPosition(sfSoundStream* soundStream, sfVector3f position); //////////////////////////////////////////////////////////// /// \brief Make a sound stream's position relative to the listener or absolute @@ -200,7 +200,7 @@ CSFML_AUDIO_API void sfSoundStream_SetPosition(sfSoundStream* soundStream, sfVec /// \param relative sfTrue to set the position relative, sfFalse to set it absolute /// //////////////////////////////////////////////////////////// -CSFML_AUDIO_API void sfSoundStream_SetRelativeToListener(sfSoundStream* soundStream, sfBool relative); +CSFML_AUDIO_API void sfSoundStream_setRelativeToListener(sfSoundStream* soundStream, sfBool relative); //////////////////////////////////////////////////////////// /// \brief Set the minimum distance of a sound stream @@ -216,7 +216,7 @@ CSFML_AUDIO_API void sfSoundStream_SetRelativeToListener(sfSoundStream* soundStr /// \param distance New minimum distance of the stream /// //////////////////////////////////////////////////////////// -CSFML_AUDIO_API void sfSoundStream_SetMinDistance(sfSoundStream* soundStream, float distance); +CSFML_AUDIO_API void sfSoundStream_setMinDistance(sfSoundStream* soundStream, float distance); //////////////////////////////////////////////////////////// /// \brief Set the attenuation factor of a sound stream @@ -234,7 +234,7 @@ CSFML_AUDIO_API void sfSoundStream_SetMinDistance(sfSoundStream* soundStream, fl /// \param attenuation New attenuation factor of the stream /// //////////////////////////////////////////////////////////// -CSFML_AUDIO_API void sfSoundStream_SetAttenuation(sfSoundStream* soundStream, float attenuation); +CSFML_AUDIO_API void sfSoundStream_setAttenuation(sfSoundStream* soundStream, float attenuation); //////////////////////////////////////////////////////////// /// \brief Change the current playing position of a sound stream @@ -246,21 +246,21 @@ CSFML_AUDIO_API void sfSoundStream_SetAttenuation(sfSoundStream* soundStream, fl /// \param timeOffset New playing position /// //////////////////////////////////////////////////////////// -CSFML_AUDIO_API void sfSoundStream_SetPlayingOffset(sfSoundStream* soundStream, sfTime timeOffset); +CSFML_AUDIO_API void sfSoundStream_setPlayingOffset(sfSoundStream* soundStream, sfTime timeOffset); //////////////////////////////////////////////////////////// /// \brief Set whether or not a sound stream should loop after reaching the end /// /// If set, the stream will restart from beginning after /// reaching the end and so on, until it is stopped or -/// sfSoundStream_SetLoop(stream, sfFalse) is called. +/// sfSoundStream_setLoop(stream, sfFalse) is called. /// The default looping state for sound streams is false. /// /// \param soundStream Sound stream object /// \param loop sfTrue to play in loop, sfFalse to play once /// //////////////////////////////////////////////////////////// -CSFML_AUDIO_API void sfSoundStream_SetLoop(sfSoundStream* soundStream, sfBool loop); +CSFML_AUDIO_API void sfSoundStream_setLoop(sfSoundStream* soundStream, sfBool loop); //////////////////////////////////////////////////////////// /// \brief Get the pitch of a sound stream @@ -270,7 +270,7 @@ CSFML_AUDIO_API void sfSoundStream_SetLoop(sfSoundStream* soundStream, sfBool lo /// \return Pitch of the stream /// //////////////////////////////////////////////////////////// -CSFML_AUDIO_API float sfSoundStream_GetPitch(const sfSoundStream* soundStream); +CSFML_AUDIO_API float sfSoundStream_getPitch(const sfSoundStream* soundStream); //////////////////////////////////////////////////////////// /// \brief Get the volume of a sound stream @@ -280,7 +280,7 @@ CSFML_AUDIO_API float sfSoundStream_GetPitch(const sfSoundStream* soundStream); /// \return Volume of the stream, in the range [0, 100] /// //////////////////////////////////////////////////////////// -CSFML_AUDIO_API float sfSoundStream_GetVolume(const sfSoundStream* soundStream); +CSFML_AUDIO_API float sfSoundStream_getVolume(const sfSoundStream* soundStream); //////////////////////////////////////////////////////////// /// \brief Get the 3D position of a sound stream in the audio scene @@ -290,7 +290,7 @@ CSFML_AUDIO_API float sfSoundStream_GetVolume(const sfSoundStream* soundStream); /// \return Position of the stream in the world /// //////////////////////////////////////////////////////////// -CSFML_AUDIO_API sfVector3f sfSoundStream_GetPosition(const sfSoundStream* soundStream); +CSFML_AUDIO_API sfVector3f sfSoundStream_getPosition(const sfSoundStream* soundStream); //////////////////////////////////////////////////////////// /// \brief Tell whether a sound stream's position is relative to the @@ -301,7 +301,7 @@ CSFML_AUDIO_API sfVector3f sfSoundStream_GetPosition(const sfSoundStream* soundS /// \return sfTrue if the position is relative, sfFalse if it's absolute /// //////////////////////////////////////////////////////////// -CSFML_AUDIO_API sfBool sfSoundStream_IsRelativeToListener(const sfSoundStream* soundStream); +CSFML_AUDIO_API sfBool sfSoundStream_isRelativeToListener(const sfSoundStream* soundStream); //////////////////////////////////////////////////////////// /// \brief Get the minimum distance of a sound stream @@ -311,7 +311,7 @@ CSFML_AUDIO_API sfBool sfSoundStream_IsRelativeToListener(const sfSoundStream* s /// \return Minimum distance of the stream /// //////////////////////////////////////////////////////////// -CSFML_AUDIO_API float sfSoundStream_GetMinDistance(const sfSoundStream* soundStream); +CSFML_AUDIO_API float sfSoundStream_getMinDistance(const sfSoundStream* soundStream); //////////////////////////////////////////////////////////// /// \brief Get the attenuation factor of a sound stream @@ -321,7 +321,7 @@ CSFML_AUDIO_API float sfSoundStream_GetMinDistance(const sfSoundStream* soundStr /// \return Attenuation factor of the stream /// //////////////////////////////////////////////////////////// -CSFML_AUDIO_API float sfSoundStream_GetAttenuation(const sfSoundStream* soundStream); +CSFML_AUDIO_API float sfSoundStream_getAttenuation(const sfSoundStream* soundStream); //////////////////////////////////////////////////////////// /// \brief Tell whether or not a sound stream is in loop mode @@ -331,7 +331,7 @@ CSFML_AUDIO_API float sfSoundStream_GetAttenuation(const sfSoundStream* soundStr /// \return sfTrue if the music is looping, sfFalse otherwise /// //////////////////////////////////////////////////////////// -CSFML_AUDIO_API sfBool sfSoundStream_GetLoop(const sfSoundStream* soundStream); +CSFML_AUDIO_API sfBool sfSoundStream_getLoop(const sfSoundStream* soundStream); //////////////////////////////////////////////////////////// /// \brief Get the current playing position of a sound stream @@ -341,7 +341,7 @@ CSFML_AUDIO_API sfBool sfSoundStream_GetLoop(const sfSoundStream* soundStream); /// \return Current playing position /// //////////////////////////////////////////////////////////// -CSFML_AUDIO_API sfTime sfSoundStream_GetPlayingOffset(const sfSoundStream* soundStream); +CSFML_AUDIO_API sfTime sfSoundStream_getPlayingOffset(const sfSoundStream* soundStream); #endif // SFML_SOUNDSTREAM_H diff --git a/include/SFML/Graphics/CircleShape.h b/include/SFML/Graphics/CircleShape.h index bd2a069..a211c05 100644 --- a/include/SFML/Graphics/CircleShape.h +++ b/include/SFML/Graphics/CircleShape.h @@ -146,7 +146,7 @@ CSFML_GRAPHICS_API float sfCircleShape_getRotation(const sfCircleShape* shape); /// \return Current scale factors /// //////////////////////////////////////////////////////////// -CSFML_GRAPHICS_API sfVector2f sfCircleShape_GetScale(const sfCircleShape* shape); +CSFML_GRAPHICS_API sfVector2f sfCircleShape_getScale(const sfCircleShape* shape); //////////////////////////////////////////////////////////// /// \brief Get the local origin of a circle shape @@ -156,7 +156,7 @@ CSFML_GRAPHICS_API sfVector2f sfCircleShape_GetScale(const sfCircleShape* shape) /// \return Current origin /// //////////////////////////////////////////////////////////// -CSFML_GRAPHICS_API sfVector2f sfCircleShape_GetOrigin(const sfCircleShape* shape); +CSFML_GRAPHICS_API sfVector2f sfCircleShape_getOrigin(const sfCircleShape* shape); //////////////////////////////////////////////////////////// /// \brief Move a circle shape by a given offset diff --git a/include/SFML/Graphics/RectangleShape.h b/include/SFML/Graphics/RectangleShape.h index a802f7d..8327c82 100644 --- a/include/SFML/Graphics/RectangleShape.h +++ b/include/SFML/Graphics/RectangleShape.h @@ -41,7 +41,7 @@ /// \return A new sfRectangleShape object, or NULL if it failed /// //////////////////////////////////////////////////////////// -CSFML_GRAPHICS_API sfRectangleShape* sfRectangleShape_Create(void); +CSFML_GRAPHICS_API sfRectangleShape* sfRectangleShape_create(void); //////////////////////////////////////////////////////////// /// \brief Copy an existing rectangle shape @@ -51,7 +51,7 @@ CSFML_GRAPHICS_API sfRectangleShape* sfRectangleShape_Create(void); /// \return Copied object /// //////////////////////////////////////////////////////////// -CSFML_GRAPHICS_API sfRectangleShape* sfRectangleShape_Copy(sfRectangleShape* shape); +CSFML_GRAPHICS_API sfRectangleShape* sfRectangleShape_copy(sfRectangleShape* shape); //////////////////////////////////////////////////////////// /// \brief Destroy an existing rectangle shape @@ -59,46 +59,46 @@ CSFML_GRAPHICS_API sfRectangleShape* sfRectangleShape_Copy(sfRectangleShape* sha /// \param Shape Shape to delete /// //////////////////////////////////////////////////////////// -CSFML_GRAPHICS_API void sfRectangleShape_Destroy(sfRectangleShape* shape); +CSFML_GRAPHICS_API void sfRectangleShape_destroy(sfRectangleShape* shape); //////////////////////////////////////////////////////////// /// \brief Set the position of a rectangle shape /// /// This function completely overwrites the previous position. -/// See sfRectangleShape_Move to apply an offset based on the previous position instead. +/// See sfRectangleShape_move to apply an offset based on the previous position instead. /// The default position of a circle Shape object is (0, 0). /// /// \param shape Shape object /// \param position New position /// //////////////////////////////////////////////////////////// -CSFML_GRAPHICS_API void sfRectangleShape_SetPosition(sfRectangleShape* shape, sfVector2f position); +CSFML_GRAPHICS_API void sfRectangleShape_setPosition(sfRectangleShape* shape, sfVector2f position); //////////////////////////////////////////////////////////// /// \brief Set the orientation of a rectangle shape /// /// This function completely overwrites the previous rotation. -/// See sfRectangleShape_Rotate to add an angle based on the previous rotation instead. +/// See sfRectangleShape_rotate to add an angle based on the previous rotation instead. /// The default rotation of a circle Shape object is 0. /// /// \param shape Shape object /// \param angle New rotation, in degrees /// //////////////////////////////////////////////////////////// -CSFML_GRAPHICS_API void sfRectangleShape_SetRotation(sfRectangleShape* shape, float angle); +CSFML_GRAPHICS_API void sfRectangleShape_setRotation(sfRectangleShape* shape, float angle); //////////////////////////////////////////////////////////// /// \brief Set the scale factors of a rectangle shape /// /// This function completely overwrites the previous scale. -/// See sfRectangleShape_Scale to add a factor based on the previous scale instead. +/// See sfRectangleShape_scale to add a factor based on the previous scale instead. /// The default scale of a circle Shape object is (1, 1). /// /// \param shape Shape object /// \param scale New scale factors /// //////////////////////////////////////////////////////////// -CSFML_GRAPHICS_API void sfRectangleShape_SetScale(sfRectangleShape* shape, sfVector2f scale); +CSFML_GRAPHICS_API void sfRectangleShape_setScale(sfRectangleShape* shape, sfVector2f scale); //////////////////////////////////////////////////////////// /// \brief Set the local origin of a rectangle shape @@ -114,7 +114,7 @@ CSFML_GRAPHICS_API void sfRectangleShape_SetScale(sfRectangleShape* shape, sfVec /// \param origin New origin /// //////////////////////////////////////////////////////////// -CSFML_GRAPHICS_API void sfRectangleShape_SetOrigin(sfRectangleShape* shape, sfVector2f origin); +CSFML_GRAPHICS_API void sfRectangleShape_setOrigin(sfRectangleShape* shape, sfVector2f origin); //////////////////////////////////////////////////////////// /// \brief Get the position of a rectangle shape @@ -124,7 +124,7 @@ CSFML_GRAPHICS_API void sfRectangleShape_SetOrigin(sfRectangleShape* shape, sfVe /// \return Current position /// //////////////////////////////////////////////////////////// -CSFML_GRAPHICS_API sfVector2f sfRectangleShape_GetPosition(const sfRectangleShape* shape); +CSFML_GRAPHICS_API sfVector2f sfRectangleShape_getPosition(const sfRectangleShape* shape); //////////////////////////////////////////////////////////// /// \brief Get the orientation of a rectangle shape @@ -136,7 +136,7 @@ CSFML_GRAPHICS_API sfVector2f sfRectangleShape_GetPosition(const sfRectangleShap /// \return Current rotation, in degrees /// //////////////////////////////////////////////////////////// -CSFML_GRAPHICS_API float sfRectangleShape_GetRotation(const sfRectangleShape* shape); +CSFML_GRAPHICS_API float sfRectangleShape_getRotation(const sfRectangleShape* shape); //////////////////////////////////////////////////////////// /// \brief Get the current scale of a rectangle shape @@ -146,7 +146,7 @@ CSFML_GRAPHICS_API float sfRectangleShape_GetRotation(const sfRectangleShape* sh /// \return Current scale factors /// //////////////////////////////////////////////////////////// -CSFML_GRAPHICS_API sfVector2f sfRectangleShape_GetScale(const sfRectangleShape* shape); +CSFML_GRAPHICS_API sfVector2f sfRectangleShape_getScale(const sfRectangleShape* shape); //////////////////////////////////////////////////////////// /// \brief Get the local origin of a rectangle shape @@ -156,43 +156,43 @@ CSFML_GRAPHICS_API sfVector2f sfRectangleShape_GetScale(const sfRectangleShape* /// \return Current origin /// //////////////////////////////////////////////////////////// -CSFML_GRAPHICS_API sfVector2f sfRectangleShape_GetOrigin(const sfRectangleShape* shape); +CSFML_GRAPHICS_API sfVector2f sfRectangleShape_getOrigin(const sfRectangleShape* shape); //////////////////////////////////////////////////////////// /// \brief Move a rectangle shape by a given offset /// /// This function adds to the current position of the object, -/// unlike sfRectangleShape_SetPosition which overwrites it. +/// unlike sfRectangleShape_setPosition which overwrites it. /// /// \param shape Shape object /// \param offset Offset /// //////////////////////////////////////////////////////////// -CSFML_GRAPHICS_API void sfRectangleShape_Move(sfRectangleShape* shape, sfVector2f offset); +CSFML_GRAPHICS_API void sfRectangleShape_move(sfRectangleShape* shape, sfVector2f offset); //////////////////////////////////////////////////////////// /// \brief Rotate a rectangle shape /// /// This function adds to the current rotation of the object, -/// unlike sfRectangleShape_SetRotation which overwrites it. +/// unlike sfRectangleShape_setRotation which overwrites it. /// /// \param shape Shape object /// \param angle Angle of rotation, in degrees /// //////////////////////////////////////////////////////////// -CSFML_GRAPHICS_API void sfRectangleShape_Rotate(sfRectangleShape* shape, float angle); +CSFML_GRAPHICS_API void sfRectangleShape_rotate(sfRectangleShape* shape, float angle); //////////////////////////////////////////////////////////// /// \brief Scale a rectangle shape /// /// This function multiplies the current scale of the object, -/// unlike sfRectangleShape_SetScale which overwrites it. +/// unlike sfRectangleShape_setScale which overwrites it. /// /// \param shape Shape object /// \param factors Scale factors /// //////////////////////////////////////////////////////////// -CSFML_GRAPHICS_API void sfRectangleShape_Scale(sfRectangleShape* shape, sfVector2f factors); +CSFML_GRAPHICS_API void sfRectangleShape_scale(sfRectangleShape* shape, sfVector2f factors); //////////////////////////////////////////////////////////// /// \brief Get the combined transform of a rectangle shape @@ -202,7 +202,7 @@ CSFML_GRAPHICS_API void sfRectangleShape_Scale(sfRectangleShape* shape, sfVector /// \return Transform combining the position/rotation/scale/origin of the object /// //////////////////////////////////////////////////////////// -CSFML_GRAPHICS_API const sfTransform* sfRectangleShape_GetTransform(const sfRectangleShape* shape); +CSFML_GRAPHICS_API const sfTransform* sfRectangleShape_getTransform(const sfRectangleShape* shape); //////////////////////////////////////////////////////////// /// \brief Get the inverse of the combined transform of a rectangle shape @@ -212,7 +212,7 @@ CSFML_GRAPHICS_API const sfTransform* sfRectangleShape_GetTransform(const sfRect /// \return Inverse of the combined transformations applied to the object /// //////////////////////////////////////////////////////////// -CSFML_GRAPHICS_API const sfTransform* sfRectangleShape_GetInverseTransform(const sfRectangleShape* shape); +CSFML_GRAPHICS_API const sfTransform* sfRectangleShape_getInverseTransform(const sfRectangleShape* shape); //////////////////////////////////////////////////////////// /// \brief Change the source texture of a rectangle shape @@ -233,7 +233,7 @@ CSFML_GRAPHICS_API const sfTransform* sfRectangleShape_GetInverseTransform(const /// \param resetRect Should the texture rect be reset to the size of the new texture? /// //////////////////////////////////////////////////////////// -CSFML_GRAPHICS_API void sfRectangleShape_SetTexture(sfRectangleShape* shape, const sfTexture* texture, sfBool resetRect); +CSFML_GRAPHICS_API void sfRectangleShape_setTexture(sfRectangleShape* shape, const sfTexture* texture, sfBool resetRect); //////////////////////////////////////////////////////////// /// \brief Set the sub-rectangle of the texture that a rectangle shape will display @@ -246,7 +246,7 @@ CSFML_GRAPHICS_API void sfRectangleShape_SetTexture(sfRectangleShape* shape, con /// \param rect Rectangle defining the region of the texture to display /// //////////////////////////////////////////////////////////// -CSFML_GRAPHICS_API void sfRectangleShape_SetTextureRect(sfRectangleShape* shape, sfIntRect rect); +CSFML_GRAPHICS_API void sfRectangleShape_setTextureRect(sfRectangleShape* shape, sfIntRect rect); //////////////////////////////////////////////////////////// /// \brief Set the fill color of a rectangle shape @@ -262,7 +262,7 @@ CSFML_GRAPHICS_API void sfRectangleShape_SetTextureRect(sfRectangleShape* shape, /// \param color New color of the shape /// //////////////////////////////////////////////////////////// -CSFML_GRAPHICS_API void sfRectangleShape_SetFillColor(sfRectangleShape* shape, sfColor color); +CSFML_GRAPHICS_API void sfRectangleShape_setFillColor(sfRectangleShape* shape, sfColor color); //////////////////////////////////////////////////////////// /// \brief Set the outline color of a rectangle shape @@ -274,7 +274,7 @@ CSFML_GRAPHICS_API void sfRectangleShape_SetFillColor(sfRectangleShape* shape, s /// \param color New outline color of the shape /// //////////////////////////////////////////////////////////// -CSFML_GRAPHICS_API void sfRectangleShape_SetOutlineColor(sfRectangleShape* shape, sfColor color); +CSFML_GRAPHICS_API void sfRectangleShape_setOutlineColor(sfRectangleShape* shape, sfColor color); //////////////////////////////////////////////////////////// /// \brief Set the thickness of a rectangle shape's outline @@ -287,7 +287,7 @@ CSFML_GRAPHICS_API void sfRectangleShape_SetOutlineColor(sfRectangleShape* shape /// \param thickness New outline thickness /// //////////////////////////////////////////////////////////// -CSFML_GRAPHICS_API void sfRectangleShape_SetOutlineThickness(sfRectangleShape* shape, float thickness); +CSFML_GRAPHICS_API void sfRectangleShape_setOutlineThickness(sfRectangleShape* shape, float thickness); //////////////////////////////////////////////////////////// /// \brief Get the source texture of a rectangle shape @@ -301,7 +301,7 @@ CSFML_GRAPHICS_API void sfRectangleShape_SetOutlineThickness(sfRectangleShape* s /// \return Pointer to the shape's texture /// //////////////////////////////////////////////////////////// -CSFML_GRAPHICS_API const sfTexture* sfRectangleShape_GetTexture(const sfRectangleShape* shape); +CSFML_GRAPHICS_API const sfTexture* sfRectangleShape_getTexture(const sfRectangleShape* shape); //////////////////////////////////////////////////////////// /// \brief Get the sub-rectangle of the texture displayed by a rectangle shape @@ -311,7 +311,7 @@ CSFML_GRAPHICS_API const sfTexture* sfRectangleShape_GetTexture(const sfRectangl /// \return Texture rectangle of the shape /// //////////////////////////////////////////////////////////// -CSFML_GRAPHICS_API sfIntRect sfRectangleShape_GetTextureRect(const sfRectangleShape* shape); +CSFML_GRAPHICS_API sfIntRect sfRectangleShape_getTextureRect(const sfRectangleShape* shape); //////////////////////////////////////////////////////////// /// \brief Get the fill color of a rectangle shape @@ -321,7 +321,7 @@ CSFML_GRAPHICS_API sfIntRect sfRectangleShape_GetTextureRect(const sfRectangleSh /// \return Fill color of the shape /// //////////////////////////////////////////////////////////// -CSFML_GRAPHICS_API sfColor sfRectangleShape_GetFillColor(const sfRectangleShape* shape); +CSFML_GRAPHICS_API sfColor sfRectangleShape_getFillColor(const sfRectangleShape* shape); //////////////////////////////////////////////////////////// /// \brief Get the outline color of a rectangle shape @@ -331,7 +331,7 @@ CSFML_GRAPHICS_API sfColor sfRectangleShape_GetFillColor(const sfRectangleShape* /// \return Outline color of the shape /// //////////////////////////////////////////////////////////// -CSFML_GRAPHICS_API sfColor sfRectangleShape_GetOutlineColor(const sfRectangleShape* shape); +CSFML_GRAPHICS_API sfColor sfRectangleShape_getOutlineColor(const sfRectangleShape* shape); //////////////////////////////////////////////////////////// /// \brief Get the outline thickness of a rectangle shape @@ -341,7 +341,7 @@ CSFML_GRAPHICS_API sfColor sfRectangleShape_GetOutlineColor(const sfRectangleSha /// \return Outline thickness of the shape /// //////////////////////////////////////////////////////////// -CSFML_GRAPHICS_API float sfRectangleShape_GetOutlineThickness(const sfRectangleShape* shape); +CSFML_GRAPHICS_API float sfRectangleShape_getOutlineThickness(const sfRectangleShape* shape); //////////////////////////////////////////////////////////// /// \brief Get the total number of points of a rectangle shape @@ -351,7 +351,7 @@ CSFML_GRAPHICS_API float sfRectangleShape_GetOutlineThickness(const sfRectangleS /// \return Number of points of the shape /// //////////////////////////////////////////////////////////// -CSFML_GRAPHICS_API unsigned int sfRectangleShape_GetPointCount(const sfRectangleShape* shape); +CSFML_GRAPHICS_API unsigned int sfRectangleShape_getPointCount(const sfRectangleShape* shape); //////////////////////////////////////////////////////////// /// \brief Get a point of a rectangle shape @@ -359,12 +359,12 @@ CSFML_GRAPHICS_API unsigned int sfRectangleShape_GetPointCount(const sfRectangle /// The result is undefined if \a index is out of the valid range. /// /// \param shape Shape object -/// \param index Index of the point to get, in range [0 .. GetPointCount() - 1] +/// \param index Index of the point to get, in range [0 .. getPointCount() - 1] /// /// \return Index-th point of the shape /// //////////////////////////////////////////////////////////// -CSFML_GRAPHICS_API sfVector2f sfRectangleShape_GetPoint(const sfRectangleShape* shape, unsigned int index); +CSFML_GRAPHICS_API sfVector2f sfRectangleShape_getPoint(const sfRectangleShape* shape, unsigned int index); //////////////////////////////////////////////////////////// /// \brief Set the size of a rectangle shape @@ -373,7 +373,7 @@ CSFML_GRAPHICS_API sfVector2f sfRectangleShape_GetPoint(const sfRectangleShape* /// \param size New size of the rectangle /// //////////////////////////////////////////////////////////// -CSFML_GRAPHICS_API void sfRectangleShape_SetSize(sfRectangleShape* shape, sfVector2f size); +CSFML_GRAPHICS_API void sfRectangleShape_setSize(sfRectangleShape* shape, sfVector2f size); //////////////////////////////////////////////////////////// /// \brief Get the size of a rectangle shape @@ -383,7 +383,7 @@ CSFML_GRAPHICS_API void sfRectangleShape_SetSize(sfRectangleShape* shape, sfVect /// \return height Size of the rectangle /// //////////////////////////////////////////////////////////// -CSFML_GRAPHICS_API sfVector2f sfRectangleShape_GetSize(const sfRectangleShape* shape); +CSFML_GRAPHICS_API sfVector2f sfRectangleShape_getSize(const sfRectangleShape* shape); //////////////////////////////////////////////////////////// /// \brief Get the local bounding rectangle of a rectangle shape @@ -399,7 +399,7 @@ CSFML_GRAPHICS_API sfVector2f sfRectangleShape_GetSize(const sfRectangleShape* s /// \return Local bounding rectangle of the entity /// //////////////////////////////////////////////////////////// -CSFML_GRAPHICS_API sfFloatRect sfRectangleShape_GetLocalBounds(const sfRectangleShape* shape); +CSFML_GRAPHICS_API sfFloatRect sfRectangleShape_getLocalBounds(const sfRectangleShape* shape); //////////////////////////////////////////////////////////// /// \brief Get the global bounding rectangle of a rectangle shape @@ -415,7 +415,7 @@ CSFML_GRAPHICS_API sfFloatRect sfRectangleShape_GetLocalBounds(const sfRectangle /// \return Global bounding rectangle of the entity /// //////////////////////////////////////////////////////////// -CSFML_GRAPHICS_API sfFloatRect sfRectangleShape_GetGlobalBounds(const sfRectangleShape* shape); +CSFML_GRAPHICS_API sfFloatRect sfRectangleShape_getGlobalBounds(const sfRectangleShape* shape); #endif // SFML_RECTANGLESHAPE_H diff --git a/include/SFML/Graphics/Shader.h b/include/SFML/Graphics/Shader.h index 8a71060..da61070 100644 --- a/include/SFML/Graphics/Shader.h +++ b/include/SFML/Graphics/Shader.h @@ -259,7 +259,7 @@ CSFML_GRAPHICS_API void sfShader_setVector3Parameter(sfShader* shader, const cha /// uniform vec4 color; // this is the variable in the shader /// \endcode /// \code -/// sfShader_setColorParameter(shader, "color", sfColor_FromRGB(255, 128, 0)); +/// sfShader_setColorParameter(shader, "color", sfColor_fromRGB(255, 128, 0)); /// \endcode /// /// \param shader Shader object diff --git a/include/SFML/Network/Http.h b/include/SFML/Network/Http.h index 2e1b322..e80301e 100644 --- a/include/SFML/Network/Http.h +++ b/include/SFML/Network/Http.h @@ -275,7 +275,7 @@ CSFML_NETWORK_API void sfHttp_setHost(sfHttp* http, const char* host, unsigned s //////////////////////////////////////////////////////////// /// \brief Send a HTTP request and return the server's response. /// -/// You must have a valid host before sending a request (see sfHttp_SetHost). +/// You must have a valid host before sending a request (see sfHttp_setHost). /// Any missing mandatory header field in the request will be added /// with an appropriate value. /// Warning: this function waits for the server's response and may diff --git a/include/SFML/Network/SocketSelector.h b/include/SFML/Network/SocketSelector.h index 40f9639..63eb202 100644 --- a/include/SFML/Network/SocketSelector.h +++ b/include/SFML/Network/SocketSelector.h @@ -121,7 +121,7 @@ CSFML_NETWORK_API sfBool sfSocketSelector_wait(sfSocketSelector* selector, sfTim /// \brief Test a socket to know if it is ready to receive data /// /// This function must be used after a call to -/// sfSocketSelector_Wait, to know which sockets are ready to +/// sfSocketSelector_wait, to know which sockets are ready to /// receive data. If a socket is ready, a call to Receive will /// never block because we know that there is data available to read. /// Note that if this function returns sfTrue for a sfTcpListener, diff --git a/include/SFML/Network/TcpListener.h b/include/SFML/Network/TcpListener.h index df1c4e4..21cbfc4 100644 --- a/include/SFML/Network/TcpListener.h +++ b/include/SFML/Network/TcpListener.h @@ -54,7 +54,7 @@ CSFML_NETWORK_API void sfTcpListener_destroy(sfTcpListener* listener); /// /// In blocking mode, calls will not return until they have /// completed their task. For example, a call to -/// sfTcpListener_Accept in blocking mode won't return until +/// sfTcpListener_accept in blocking mode won't return until /// a new connection was actually received. /// In non-blocking mode, calls will always return immediately, /// using the return code to signal whether there was data diff --git a/include/SFML/Network/UdpSocket.h b/include/SFML/Network/UdpSocket.h index e0f13c9..e941a07 100644 --- a/include/SFML/Network/UdpSocket.h +++ b/include/SFML/Network/UdpSocket.h @@ -119,7 +119,7 @@ CSFML_NETWORK_API sfSocketStatus sfUdpSocket_bind(sfUdpSocket* socket, unsigned /// \param socket UDP socket object /// //////////////////////////////////////////////////////////// -CSFML_NETWORK_API void sfUdpSocket_Unbind(sfUdpSocket* socket); +CSFML_NETWORK_API void sfUdpSocket_unbind(sfUdpSocket* socket); //////////////////////////////////////////////////////////// /// \brief Send raw data to a remote peer with a UDP socket diff --git a/include/SFML/Window/Window.h b/include/SFML/Window/Window.h index bc0f9f3..4ff4883 100644 --- a/include/SFML/Window/Window.h +++ b/include/SFML/Window/Window.h @@ -132,7 +132,7 @@ CSFML_WINDOW_API void sfWindow_close(sfWindow* window); /// \brief Tell whether or not a window is opened /// /// This function returns whether or not the window exists. -/// Note that a hidden window (sfWindow_SetVisible(sfFalse)) will return +/// Note that a hidden window (sfWindow_setVisible(sfFalse)) will return /// sfTrue. /// /// \param window Window object @@ -343,7 +343,7 @@ CSFML_WINDOW_API void sfWindow_display(sfWindow* window); /// \brief Limit the framerate to a maximum fixed frequency /// /// If a limit is set, the window will use a small delay after -/// each call to sfWindow_Display to ensure that the current frame +/// each call to sfWindow_display to ensure that the current frame /// lasted long enough to match the framerate limit. /// /// \param window Window object diff --git a/src/SFML/Graphics/Shader.cpp b/src/SFML/Graphics/Shader.cpp index d93bbd9..c8c998a 100644 --- a/src/SFML/Graphics/Shader.cpp +++ b/src/SFML/Graphics/Shader.cpp @@ -175,14 +175,14 @@ void sfShader_setFloat4Parameter(sfShader* shader, const char* name, float x, fl //////////////////////////////////////////////////////////// -void sfShader_SetVector2Parameter(sfShader* shader, const char* name, sfVector2f vector) +void sfShader_setVector2Parameter(sfShader* shader, const char* name, sfVector2f vector) { CSFML_CALL(shader, setParameter(name, sf::Vector2f(vector.x, vector.y))); } //////////////////////////////////////////////////////////// -void sfShader_SetVector3Parameter(sfShader* shader, const char* name, sfVector3f vector) +void sfShader_setVector3Parameter(sfShader* shader, const char* name, sfVector3f vector) { CSFML_CALL(shader, setParameter(name, sf::Vector3f(vector.x, vector.y, vector.z))); } diff --git a/src/SFML/Window/Window.cpp b/src/SFML/Window/Window.cpp index cf1c4e9..92f98f0 100644 --- a/src/SFML/Window/Window.cpp +++ b/src/SFML/Window/Window.cpp @@ -193,7 +193,7 @@ sfVector2u sfWindow_getSize(const sfWindow* window) //////////////////////////////////////////////////////////// -void sfWindow_SetSize(sfWindow* window, sfVector2u size) +void sfWindow_setSize(sfWindow* window, sfVector2u size) { CSFML_CALL(window, setSize(sf::Vector2u(size.x, size.y))); }