SFMLv3 Migration. Allow rust-sfml to compile

Author: dogunbound

CSFML/src/Audio/CustomSoundRecorder.cpp

@@ -18,16 +18,13 @@ class sfCustomSoundRecorder final : public sf::SoundRecorder {
                                             myStopCb(onStop),
                                             myUserData(userData) {
     }
-    virtual void setProcessingInterval(int64_t interval) final {
-        sf::SoundRecorder::setProcessingInterval(sf::microseconds(interval));
-    }
 
   private:
     virtual bool onStart() final {
         return myStartCb(myUserData);
     }
 
-    virtual bool onProcessSamples(const sf::Int16 *samples, std::size_t sampleCount) final {
+    virtual bool onProcessSamples(const std::int16_t *samples, std::size_t sampleCount) final {
         return myProcessCb(samples, sampleCount, myUserData);
     }
 
@@ -64,10 +61,6 @@ extern "C" unsigned int sfCustomSoundRecorder_getSampleRate(const sfCustomSoundR
     return soundRecorder->getSampleRate();
 }
 
-extern "C" void sfCustomSoundRecorder_setProcessingInterval(sfCustomSoundRecorder *soundRecorder, int64_t interval) {
-    soundRecorder->setProcessingInterval(interval);
-}
-
 extern "C" bool sfCustomSoundRecorder_setDevice(sfCustomSoundRecorder *soundRecorder, const char *name) {
     return soundRecorder->setDevice(name);
 }

CSFML/src/Audio/CustomSoundStream.cpp

@@ -1,3 +1,4 @@
+#include "SFML/Audio/SoundChannel.hpp"
 #include "System/Vector3.hpp"
 #include <SFML/Audio/SoundStream.hpp>
 #include <cstdint>
@@ -11,10 +12,11 @@ class sfCustomSoundStream final : public sf::SoundStream {
                         sfCustomSoundStreamSeekCb onSeek,
                         unsigned int channelCount,
                         unsigned int sampleRate,
+                        const std::vector<sf::SoundChannel> *channel,
                         void *userData) : myGetDataCb(onGetData),
                                           mySeekCallCb(onSeek),
                                           myUserData(userData) {
-        initialize(channelCount, sampleRate);
+        initialize(channelCount, sampleRate, *channel);
     }
 
   private:
@@ -35,8 +37,9 @@ extern "C" sfCustomSoundStream *sfCustomSoundStream_new(sfCustomSoundStreamGetDa
                                                         sfCustomSoundStreamSeekCb onSeek,
                                                         unsigned int channelCount,
                                                         unsigned int sampleRate,
+                                                        const std::vector<sf::SoundChannel> *channel,
                                                         void *userData) {
-    return new sfCustomSoundStream(onGetData, onSeek, channelCount, sampleRate, userData);
+    return new sfCustomSoundStream(onGetData, onSeek, channelCount, sampleRate, channel, userData);
 }
 
 extern "C" void sfCustomSoundStream_del(sfCustomSoundStream *soundStream) {
@@ -68,6 +71,10 @@ extern "C" unsigned int sfCustomSoundStream_getSampleRate(const sfCustomSoundStr
     return soundStream->getSampleRate();
 }
 
+extern "C" const std::vector<sf::SoundChannel> *sfCustomSoundStream_getChannelMap(const sfCustomSoundStream *soundStream) {
+    return new std::vector(soundStream->getChannelMap());
+}
+
 extern "C" void sfCustomSoundStream_setPitch(sfCustomSoundStream *soundStream, float pitch) {
     soundStream->setPitch(pitch);
 }
@@ -76,8 +83,8 @@ extern "C" void sfCustomSoundStream_setVolume(sfCustomSoundStream *soundStream,
     soundStream->setVolume(volume);
 }
 
-extern "C" void sfCustomSoundStream_setPosition(sfCustomSoundStream *soundStream, sfVector3f position) {
-    soundStream->setPosition(position.x, position.y, position.z);
+extern "C" void sfCustomSoundStream_setPosition(sfCustomSoundStream *soundStream, sf::Vector3f position) {
+    soundStream->setPosition(position);
 }
 
 extern "C" void sfCustomSoundStream_setRelativeToListener(sfCustomSoundStream *soundStream, bool relative) {
@@ -96,8 +103,8 @@ extern "C" void sfCustomSoundStream_setPlayingOffset(sfCustomSoundStream *soundS
     soundStream->setPlayingOffset(sf::microseconds(timeOffset));
 }
 
-extern "C" void sfCustomSoundStream_setLoop(sfCustomSoundStream *soundStream, bool loop) {
-    soundStream->setLoop(loop);
+extern "C" void sfCustomSoundStream_setLooping(sfCustomSoundStream *soundStream, bool loop) {
+    soundStream->setLooping(loop);
 }
 
 extern "C" float sfCustomSoundStream_getPitch(const sfCustomSoundStream *soundStream) {
@@ -125,8 +132,8 @@ extern "C" float sfCustomSoundStream_getAttenuation(const sfCustomSoundStream *s
     return soundStream->getAttenuation();
 }
 
-extern "C" bool sfCustomSoundStream_getLoop(const sfCustomSoundStream *soundStream) {
-    return soundStream->getLoop();
+extern "C" bool sfCustomSoundStream_isLooping(const sfCustomSoundStream *soundStream) {
+    return soundStream->isLooping();
 }
 
 extern "C" int64_t sfCustomSoundStream_getPlayingOffset(const sfCustomSoundStream *soundStream) {

CSFML/src/Audio/Listener.cpp

@@ -9,29 +9,29 @@ extern "C" float sfListener_getGlobalVolume(void) {
     return sf::Listener::getGlobalVolume();
 }
 
-extern "C" void sfListener_setPosition(sfVector3f position) {
-    sf::Listener::setPosition(position.x, position.y, position.z);
+extern "C" void sfListener_setPosition(sf::Vector3f position) {
+    sf::Listener::setPosition(position);
 }
 
-extern "C" sfVector3f sfListener_getPosition() {
+extern "C" sf::Vector3f sfListener_getPosition() {
     sf::Vector3f pos = sf::Listener::getPosition();
     return {pos.x, pos.y, pos.z};
 }
 
-extern "C" void sfListener_setDirection(sfVector3f direction) {
-    sf::Listener::setDirection(direction.x, direction.y, direction.z);
+extern "C" void sfListener_setDirection(sf::Vector3f direction) {
+    sf::Listener::setDirection(direction);
 }
 
-extern "C" sfVector3f sfListener_getDirection() {
+extern "C" sf::Vector3f sfListener_getDirection() {
     sf::Vector3f dir = sf::Listener::getDirection();
     return {dir.x, dir.y, dir.z};
 }
 
-extern "C" void sfListener_setUpVector(sfVector3f upVector) {
-    sf::Listener::setUpVector(upVector.x, upVector.y, upVector.z);
+extern "C" void sfListener_setUpVector(sf::Vector3f upVector) {
+    sf::Listener::setUpVector(upVector);
 }
 
-extern "C" sfVector3f sfListener_getUpVector() {
+extern "C" sf::Vector3f sfListener_getUpVector() {
     sf::Vector3f vec = sf::Listener::getUpVector();
     return {vec.x, vec.y, vec.z};
 }

CSFML/src/Audio/Music.cpp

@@ -17,7 +17,7 @@ extern "C" void sfMusic_del(sf::Music *music) {
 }
 
 extern "C" bool sfMusic_openFromFile(sf::Music *music, const char *filename) {
-    return music->openFromFile(filename);
+    return music->openFromFile(std::filesystem::path(filename));
 }
 
 extern "C" bool sfMusic_openFromMemory(sf::Music *music, const uint8_t *data, size_t sizeInBytes) {
@@ -28,12 +28,12 @@ extern "C" bool sfMusic_openFromStream(sf::Music *music, sfInputStreamHelper *st
     return music->openFromStream(*stream);
 }
 
-extern "C" void sfMusic_setLoop(sf::Music *music, bool loop) {
-    music->setLoop(loop != 0);
+extern "C" void sfMusic_setLooping(sf::Music *music, bool loop) {
+    music->setLooping(loop != 0);
 }
 
-extern "C" bool sfMusic_getLoop(const sf::Music *music) {
-    return music->getLoop();
+extern "C" bool sfMusic_isLooping(const sf::Music *music) {
+    return music->isLooping();
 }
 
 extern "C" int64_t sfMusic_getDuration(const sf::Music *music) {
@@ -46,8 +46,8 @@ extern "C" sfTimeSpan sfMusic_getLoopPoints(const sf::Music *music) {
 }
 
 extern "C" void sfMusic_setLoopPoints(sf::Music *music, sfTimeSpan timePoints) {
-    music->setLoopPoints(sf::Music::TimeSpan(sf::microseconds(timePoints.offset),
-                                             sf::microseconds(timePoints.length)));
+    music->setLoopPoints({sf::microseconds(timePoints.offset),
+                          sf::microseconds(timePoints.length)});
 }
 
 extern "C" void sfMusic_play(sf::Music *music) {
@@ -87,8 +87,8 @@ extern "C" void sfMusic_setVolume(sf::Music *music, float volume) {
     music->setVolume(volume);
 }
 
-extern "C" void sfMusic_setPosition(sf::Music *music, sfVector3f position) {
-    music->setPosition(sf::Vector3f(position.x, position.y, position.z));
+extern "C" void sfMusic_setPosition(sf::Music *music, sf::Vector3f position) {
+    music->setPosition(position);
 }
 
 extern "C" void sfMusic_setRelativeToListener(sf::Music *music, bool relative) {

CSFML/src/Audio/Sound.cpp

@@ -1,9 +1,11 @@
 #include "System/Vector3.hpp"
-#include <SFML/Audio.hpp>
+#include <SFML/Audio/Sound.hpp>
+#include <SFML/System/Time.hpp>
+#include <chrono>
 #include <cstdint>
 
-extern "C" sf::Sound *sfSound_new(void) {
-    return new sf::Sound;
+extern "C" sf::Sound *sfSound_new(const sf::SoundBuffer *buffer) {
+    return new sf::Sound(*buffer);
 }
 
 extern "C" sf::Sound *sfSound_cpy(const sf::Sound *sound) {
@@ -31,16 +33,15 @@ extern "C" void sfSound_setBuffer(sf::Sound *sound, const sf::SoundBuffer *buffe
 }
 
 extern "C" const sf::SoundBuffer *sfSound_getBuffer(const sf::Sound *sound) {
-    const sf::Sound *s = sound;
-    return s->getBuffer();
+    return &sound->getBuffer();
 }
 
-extern "C" void sfSound_setLoop(sf::Sound *sound, bool loop) {
-    sound->setLoop(loop);
+extern "C" void sfSound_setLooping(sf::Sound *sound, bool loop) {
+    sound->setLooping(loop);
 }
 
-extern "C" bool sfSound_getLoop(const sf::Sound *sound) {
-    return sound->getLoop();
+extern "C" bool sfSound_isLooping(const sf::Sound *sound) {
+    return sound->isLooping();
 }
 
 extern "C" sf::Sound::Status sfSound_getStatus(const sf::Sound *sound) {
@@ -72,7 +73,7 @@ extern "C" void sfSound_setAttenuation(sf::Sound *sound, float attenuation) {
 }
 
 extern "C" void sfSound_setPlayingOffset(sf::Sound *sound, int64_t timeOffset) {
-    sound->setPlayingOffset(sf::microseconds(timeOffset));
+    sound->setPlayingOffset(std::chrono::microseconds(timeOffset));
 }
 
 extern "C" float sfSound_getPitch(const sf::Sound *sound) {

CSFML/src/Audio/SoundBuffer.cpp

@@ -26,8 +26,8 @@ extern "C" bool sfSoundBuffer_loadFromStream(sf::SoundBuffer *buffer, sfInputStr
     return buffer->loadFromStream(*stream);
 }
 
-extern "C" bool sfSoundBuffer_loadFromSamples(sf::SoundBuffer *buffer, const int16_t *samples, uint64_t sampleCount, unsigned int channelCount, unsigned int sampleRate) {
-    return buffer->loadFromSamples(samples, sampleCount, channelCount, sampleRate);
+extern "C" bool sfSoundBuffer_loadFromSamples(sf::SoundBuffer *buffer, const int16_t *samples, uint64_t sampleCount, unsigned int channelCount, unsigned int sampleRate, const std::vector<sf::SoundChannel> *channelMap) {
+    return buffer->loadFromSamples(samples, sampleCount, channelCount, sampleRate, *channelMap);
 }
 
 extern "C" bool sfSoundBuffer_saveToFile(const sf::SoundBuffer *soundBuffer, const char *filename) {

CSFML/src/Audio/SoundChannel.cpp

@@ -0,0 +1,15 @@
+#include "Audio/SoundChannel.hpp"
+#include <SFML/Audio/SoundChannel.hpp>
+#include <vector>
+
+extern "C" std::size_t sfSoundChannelVector_getLength(const std::vector<sf::SoundChannel> *vec) {
+    return vec->size();
+}
+
+extern "C" const sf::SoundChannel *sfSoundChannelVector_getData(const std::vector<sf::SoundChannel> *vec) {
+    return vec->data();
+}
+
+extern "C" void sfSoundChannelVector_del(const std::vector<sf::SoundChannel> *vec) {
+    delete vec;
+}

CSFML/src/Audio/SoundChannel.hpp

@@ -0,0 +1,24 @@
+#pragma once
+
+enum sfSoundChannel {
+    Unspecified,
+    Mono,
+    FrontLeft,
+    FrontRight,
+    FrontCenter,
+    FrontLeftOfCenter,
+    FrontRightOfCenter,
+    LowFrequencyEffects,
+    BackLeft,
+    BackRight,
+    BackCenter,
+    SideLeft,
+    SideRight,
+    TopCenter,
+    TopFrontLeft,
+    TopFrontRight,
+    TopFrontCenter,
+    TopBackLeft,
+    TopBackRight,
+    TopBackCenter
+};

CSFML/src/Graphics/CircleShape.cpp

@@ -18,19 +18,19 @@ extern "C" void sfCircleShape_del(sf::CircleShape *shape) {
 }
 
 extern "C" void sfCircleShape_setPosition(sf::CircleShape *shape, sfVector2f position) {
-    shape->setPosition(position.x, position.y);
+    shape->setPosition(sf::Vector2f(position.x, position.y));
 }
 
 extern "C" void sfCircleShape_setRotation(sf::CircleShape *shape, float angle) {
-    shape->setRotation(angle);
+    shape->setRotation(sf::degrees(angle));
 }
 
 extern "C" void sfCircleShape_setScale(sf::CircleShape *shape, sfVector2f scale) {
-    shape->setScale(scale.x, scale.y);
+    shape->setScale(sf::Vector2f(scale.x, scale.y));
 }
 
 extern "C" void sfCircleShape_setOrigin(sf::CircleShape *shape, sfVector2f origin) {
-    shape->setOrigin(origin.x, origin.y);
+    shape->setOrigin(sf::Vector2f(origin.x, origin.y));
 }
 
 extern "C" sfVector2f sfCircleShape_getPosition(const sf::CircleShape *shape) {
@@ -39,7 +39,7 @@ extern "C" sfVector2f sfCircleShape_getPosition(const sf::CircleShape *shape) {
 }
 
 extern "C" float sfCircleShape_getRotation(const sf::CircleShape *shape) {
-    return shape->getRotation();
+    return shape->getRotation().asDegrees();
 }
 
 extern "C" sfVector2f sfCircleShape_getScale(const sf::CircleShape *shape) {
@@ -53,15 +53,15 @@ extern "C" sfVector2f sfCircleShape_getOrigin(const sf::CircleShape *shape) {
 }
 
 extern "C" void sfCircleShape_move(sf::CircleShape *shape, sfVector2f offset) {
-    shape->move(offset.x, offset.y);
+    shape->move(sf::Vector2f(offset.x, offset.y));
 }
 
 extern "C" void sfCircleShape_rotate(sf::CircleShape *shape, float angle) {
-    shape->rotate(angle);
+    shape->rotate(sf::degrees(angle));
 }
 
 extern "C" void sfCircleShape_scale(sf::CircleShape *shape, sfVector2f factors) {
-    shape->scale(factors.x, factors.y);
+    shape->scale(sf::Vector2f(factors.x, factors.y));
 }
 
 extern "C" sf::Transform const *sfCircleShape_getTransform(const sf::CircleShape *shape) {
@@ -77,7 +77,7 @@ extern "C" void sfCircleShape_setTexture(sf::CircleShape *shape, const sf::Textu
 }
 
 extern "C" void sfCircleShape_setTextureRect(sf::CircleShape *shape, sfIntRect rect) {
-    shape->setTextureRect(sf::IntRect(rect.left, rect.top, rect.width, rect.height));
+    shape->setTextureRect({sf::Vector2i(rect.position.x, rect.position.y), sf::Vector2i(rect.size.x, rect.size.y)});
 }
 
 extern "C" void sfCircleShape_setFillColor(sf::CircleShape *shape, sfColor color) {
@@ -98,7 +98,7 @@ extern "C" const sf::Texture *sfCircleShape_getTexture(const sf::CircleShape *sh
 
 extern "C" sfIntRect sfCircleShape_getTextureRect(const sf::CircleShape *shape) {
     sf::IntRect rect = shape->getTextureRect();
-    return {rect.left, rect.top, rect.width, rect.height};
+    return {rect.position.x, rect.position.y, rect.size.x, rect.size.y};
 }
 
 extern "C" sfColor sfCircleShape_getFillColor(const sf::CircleShape *shape) {
@@ -138,10 +138,10 @@ extern "C" void sfCircleShape_setPointCount(sf::CircleShape *shape, size_t count
 
 extern "C" sfFloatRect sfCircleShape_getLocalBounds(const sf::CircleShape *shape) {
     sf::FloatRect rect = shape->getLocalBounds();
-    return {rect.left, rect.top, rect.width, rect.height};
+    return {rect.position.x, rect.position.y, rect.size.x, rect.size.y};
 }
 
 extern "C" sfFloatRect sfCircleShape_getGlobalBounds(const sf::CircleShape *shape) {
     sf::FloatRect rect = shape->getGlobalBounds();
-    return {rect.left, rect.top, rect.width, rect.height};
+    return {rect.position.x, rect.position.y, rect.size.x, rect.size.y};
 }