Merge pull request #19 from lr8soft/dev-y

v0.26

Author: lr8soft

.gitignore

@@ -1,4 +1,4 @@
-
+x64
 .vs
 Debug
 Release

.idea/workspace.xml

@@ -133,7 +133,7 @@ void Player::hurtPlayer()
 {
 	if (itemTimer.getAccumlateTime() - lastHitTime > HitProtectTime || lastHitTime == 0) {
 		lastHitTime = itemTimer.getAccumlateTime();
-		AudioHelper::playerWavFile(playerHurtAudio);
+		AudioHelper::playFromBuffer(playerHurtAudio.wavBuffer);
 		fxParticleManager.addNewParticle(250, 25.0f, 1.6f, 0.8f, glm::vec4(1.0f, 0.1f, 0.1f, 1.0f), glm::vec3(NowPosition[0], NowPosition[1], NowPosition[2]));
 		isHitTime = true;
 	}
@@ -142,7 +142,7 @@ void Player::hurtPlayer()
 
 void Player::grazePlayer()
 {
-	AudioHelper::playerWavFile(playerGrazeAudio);
+	AudioHelper::playFromBuffer(playerGrazeAudio.wavBuffer);
 	fxParticleManager.addNewParticle(1, 12.0f, 0.6f, 0.6f, glm::vec4(1.0f), glm::vec3(NowPosition[0], NowPosition[1], NowPosition[2]));
 }
 

Python2D/XCCore/Item/Player.cpp

@@ -8,7 +8,7 @@ ALCdevice*  AudioHelper::device = nullptr;
 ALCcontext* AudioHelper::context = nullptr;
 
 std::map<std::string, XCWavFile> AudioHelper::wavSourceGroup;
-std::map<ALuint, std::atomic_bool> AudioHelper::playingGroup;
+std::map<ALuint, ALuint> AudioHelper::effectPlayingList;
 void AudioHelper::EvonInit()
 {
 	if (!isEvonInit) {
@@ -34,6 +34,17 @@ void AudioHelper::EvonInit()
 
 void AudioHelper::UnloadEvon()
 {
+
+	for (auto work = effectPlayingList.begin(); work != effectPlayingList.end(); work++) {
+		ALint state;
+		alGetSourcei(work->second, AL_SOURCE_STATE, &state);
+		if (state == AL_PLAYING) {
+			alSourceStop(work->second);
+		}
+		alDeleteBuffers(1, &work->first);
+		alDeleteSources(1, &work->second);
+	}
+
 	alcMakeContextCurrent(NULL);
 	alcDestroyContext(context);
 	alcCloseDevice(device);
@@ -65,43 +76,56 @@ XCWavFile AudioHelper::loadWavFromFile(const std::string filename)
 	return wavFile;
 }
 
-void AudioHelper::playerWavFile(XCWavFile file)
+void AudioHelper::setVolume(float volume)
+{
+	audioVolume = volume;
+}
+
+void AudioHelper::playFromBuffer(ALuint buffer)
 {
-	auto target = playingGroup.find(file.wavSource);
-	if (target != playingGroup.end()) {
-		bool isPlaying = target->second;
-		if (!isPlaying) {
-			std::thread playThread(threadWork,file);
-			playThread.detach();
+	auto work = effectPlayingList.find(buffer);
+	if (work!=effectPlayingList.end()) {
+		ALint state;
+		alGetSourcei(work->second, AL_SOURCE_STATE, &state);
+		if (state!=AL_PLAYING) {
+			alSourcePlay(work->second);
 		}
 	}
 	else {
-		playingGroup[file.wavSource] = true;
-		std::thread playThread(threadWork, file);
-		playThread.detach();
+		ALuint source;
+		alGenSources(1, &source);
+		alSourcei(source, AL_BUFFER, buffer);
+		alSourcef(source, AL_GAIN, audioVolume);
+		alSourcePlay(source);
+
+		effectPlayingList.insert(std::make_pair(buffer, source));
 	}
 }
 
-void AudioHelper::threadWork(XCWavFile file)
+void AudioHelper::stopByBuffer(ALuint buffer)
 {
-	ALuint source;
-	alGenSources(1, &source);
-	alSourcei(source, AL_BUFFER, file.wavSource);
-	alSourcef(source, AL_GAIN, audioVolume);
-	alSourcePlay(source);
-
-	ALint state;
-	do {
-		alGetSourcei(source, AL_SOURCE_STATE, &state);
-	} while (state == AL_PLAYING);
-	alDeleteSources(1, &source);
-	playingGroup[file.wavSource] = false;
+	auto work = effectPlayingList.find(buffer);
+	if (work != effectPlayingList.end()) {
+		ALint state;
+		alGetSourcei(work->second, AL_SOURCE_STATE, &state);
+		if (state == AL_PLAYING) {
+			alSourceStop(work->second);
+		}
+	}
 }
 
-
-void AudioHelper::setVolume(float volume)
+void AudioHelper::releaseByBuffer(ALuint buffer)
 {
-	audioVolume = volume;
+	auto work = effectPlayingList.find(buffer);
+	if (work != effectPlayingList.end()) {
+		ALint state;
+		alGetSourcei(work->second, AL_SOURCE_STATE, &state);
+		if (state == AL_PLAYING) {
+			alSourceStop(work->second);
+		}
+		alDeleteSources(1, &work->second);
+		effectPlayingList.erase(work);
+	}
 }
 
 bool AudioHelper::loadWavFile(const std::string filename, XCWavFile *wavFile) {
@@ -180,11 +204,11 @@ bool AudioHelper::loadWavFile(const std::string filename, XCWavFile *wavFile) {
 				wavFile->wavFormat = AL_FORMAT_STEREO16;
 		}
 		//create our openAL buffer and check for success
-		alGenBuffers(1, &(wavFile->wavSource));
+		alGenBuffers(1, &(wavFile->wavBuffer));
 		//errorCheck();
 		//now we put our data into the openAL buffer and
 		//check for success
-		alBufferData(wavFile->wavSource, wavFile->wavFormat, (void*)data,
+		alBufferData(wavFile->wavBuffer, wavFile->wavFormat, (void*)data,
 			wavFile->wavSize, wavFile->wavFrequent);
 		//errorCheck();
 		//clean up and return true if successful

Python2D/XCCore/XCAudio/AudioHelper.cpp

@@ -6,7 +6,6 @@
 #include <AL/alc.h>
 #include <map>
 #include <iostream>
-#include <atomic>
 struct WAVE_Data {
 	char subChunkID[4]; //should contain the word data
 	long subChunk2Size; //Stores the size of the data block
@@ -31,7 +30,7 @@ struct RIFF_Header {
 };
 
 struct XCWavFile {
-	ALuint wavSource;
+	ALuint wavBuffer;
 	ALsizei wavSize;
 	ALsizei wavFrequent;
 	ALenum wavFormat;
@@ -45,17 +44,19 @@ class AudioHelper {
 	static float audioVolume;
 
 	static std::map<std::string, XCWavFile> wavSourceGroup;
-	static std::map<ALuint, std::atomic_bool> playingGroup;
+	static std::map<ALuint, ALuint> effectPlayingList;/*buffer, source*/
 
 	static bool loadWavFile(const std::string filename, XCWavFile *wavFile);
-	
-	static void threadWork(XCWavFile);
+
 public:
 	static void EvonInit();
 	static void UnloadEvon();
 
 	static XCWavFile loadWavFromFile(const std::string filename);
-	static void playerWavFile(XCWavFile file);
 	static void setVolume(float volume);
+
+	static void playFromBuffer(ALuint buffer);
+	static void stopByBuffer(ALuint buffer);
+	static void releaseByBuffer(ALuint buffer);
 };
 #endif

Python2D/XCCore/XCAudio/AudioHelper.h

@@ -9,7 +9,7 @@
 winWidth = 1280
 winHeight = 720
 
-winTitle = "Python2D v0.24"
+winTitle = "Python2D v0.25"
 winScaleToMonitor = False
 winResize = False