LOVE/love
1
0
Fork 0
mirror of https://github.com/love2d/love.git synced 2026-08-20 04:30:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

Effects re-made to operate on literal names instead of numerical indices.

Browse Source 
Added buffer count parameter to queueable source constructor.
Added getEffectsList function.
Internal cleanup.

--HG--
branch : minor
This commit is contained in:
raidho36
2017-06-22 15:07:31 +03:00
parent ad399cab39
commit 157d94fae3
12 changed files with 435 additions and 279 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/audio/openal/Audio.h
+16 -11
View File
@@ -25,6 +25,7 @@
#include <queue>
#include <map>
#include <vector>
#include <stack>
#include <cmath>
// LOVE
@@ -83,7 +84,7 @@ public:
// Implements Audio.
love::audio::Source *newSource(love::sound::Decoder *decoder);
love::audio::Source *newSource(love::sound::SoundData *soundData);
love::audio::Source *newSource(int sampleRate, int bitDepth, int channels);
love::audio::Source *newSource(int sampleRate, int bitDepth, int channels, int buffers);
int getSourceCount() const;
int getMaxSources() const;
bool play(love::audio::Source *source);
@@ -114,15 +115,15 @@ public:
DistanceModel getDistanceModel() const;
void setDistanceModel(DistanceModel distanceModel);
bool setSceneEffect(int slot, std::map<Effect::Parameter, float> &params);
bool setSceneEffect(int slot);
bool getSceneEffect(int slot, std::map<Effect::Parameter, float> &params);
bool setEffect(const char *name, std::map<Effect::Parameter, float> &params);
bool unsetEffect(const char *name);
bool getEffect(const char *name, std::map<Effect::Parameter, float> &params);
bool getEffectsList(std::vector<std::string> &list);
int getMaxSceneEffects() const;
int getMaxSourceEffects() const;
bool isEFXsupported() const;
ALuint getSceneEffectID(int slot);
int getSceneEffectIndex(ALuint effect);
bool getEffectID(const char *name, ALuint &id);
private:
void initializeEFX();
@@ -136,11 +137,15 @@ private:
ALCcontext *context;
// The OpenAL effects
std::vector<Effect*> effects;
std::vector<ALuint> effectSlots;
std::map<ALuint, int> effectIndex;
int MAX_SCENE_EFFECTS = 16;
int MAX_SOURCE_EFFECTS = 16;
struct effectmapStorage
{
Effect *effect;
ALuint slot;
};
std::map<std::string, struct effectmapStorage> effectmap;
std::stack<ALuint> slotlist;
int MAX_SCENE_EFFECTS = 64;
int MAX_SOURCE_EFFECTS = 64;
// The Pool.
Pool *pool;