haya3218/SDfmL
1
0
Fork 0
mirror of https://github.com/haya3218/SDfmL.git synced 2024-08-14 23:57:09 +00:00
Code Issues Projects Releases Wiki Activity

Update shit

Browse source 
STILL NOT FOR USE!
This commit is contained in:
/nick haya 2022-02-09 08:57:45 +08:00
parent 25b1051e92
commit 18bf427dc3
3 changed files with 77 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

52
src/Render.cpp
View file

@ -10,6 +10,9 @@
#include "SDL2/SDL_ttf.h"
#include "Render.hpp"
#include "SDL2/SDL_syswm.h"
#include "SoLoud/soloud.h"
#include "SoLoud/soloud_wav.h"
#include "SoLoud/soloud_openmpt.h"
using namespace std;
using namespace Render;
@ -18,11 +21,14 @@ SDL_Window* Render::window;
SDL_Renderer* Render::renderer;
SDL_Event Render::event;
State* Render::current_state = nullptr;
array<anshub::AudioOut, MAX_SE> Render::audioArray;
anshub::AudioOut Render::music;
SoLoud::Soloud Render::music;
SoLoud::Soloud Render::se;
SoLoud::Wav Render::waveLoader;
SoLoud::Openmpt Render::modLoader;
string Render::currentMusic = "";
HWND Render::hwnd;
HWND Render::consoleD;
int Render::seIndex;
Render::Object::Object() {
@ -184,11 +190,15 @@ void Render::Object::centerSelf(AXIS axis) {
bool Render::Init(string window_name) {
consoleD = GetConsoleWindow();
SetWindowTextA(consoleD, "Logging window");
if (!BASS_Init(1, 44100, BASS_DEVICE_8BITS|BASS_DEVICE_REINIT, 0, NULL)) {
cout << "BASS has failed to initialize. Is your dll broken? <NO ERROR>" << endl;
if (se.init() > 0) {
cout << "SoLoud has failed to load. Is your dll broken?" << endl;
return false;
}
cout << "Successfully initialized the BASS audio system. Command next." << endl;
if (music.init() > 0) {
cout << "SoLoud has failed to load. Is your dll broken?" << endl;
return false;
}
cout << "Successfully initialized the SoLoud audio system. Command next." << endl;
if (SDL_Init(SDL_INIT_EVERYTHING) < 0) {
cout << "SDL has failed to initialize. Is your dll broken? " << SDL_GetError() << endl;
return false;
@ -323,34 +333,24 @@ void Render::SwitchState(State* state) {
current_state->Create();
}
bool Render::playSound(string path, int id) {
if (id == NULL) {
for (int i = 0; i < MAX_SE; i++) {
if (audioArray[i].NowPlaying(false).size() == 0) {
audioArray[i].Play(path);
cout << "Played " << path << ". audio id no: " << i << endl;
break;
}
}
} else {
audioArray[id].Play(path);
bool Render::playSound(string path, bool override) {
waveLoader.setLooping(false);
if (override) {
se.stop(seIndex);
}
waveLoader.load(path.c_str());
seIndex = se.play(waveLoader);
return true;
}
bool Render::playMusic(string path) {
if (path == "") {
music.Stop(currentMusic);
cout << "Stopped music from " << path << "." << endl;
return true;
if (currentMusic == path) {
music.stopAll();
}
if (currentMusic != "") {
music.Stop(currentMusic);
cout << "Stopped music from " << path << "." << endl;
}
cout << "Played " << path << " as music." << endl;
music.Play(path, true);
waveLoader.load(path.c_str());
waveLoader.setLooping(true);
music.play(waveLoader);
currentMusic = path;
return true;

15
src/Render.hpp
View file

@ -12,6 +12,9 @@
#include "SDL2/SDL_ttf.h"
#include "BASS/audio_out.h"
#include "SDL2/SDL_FontCache.h"
#include "SoLoud/soloud.h"
#include "SoLoud/soloud_wav.h"
#include "SoLoud/soloud_openmpt.h"
using namespace std;
@ -222,14 +225,16 @@ namespace Render {
extern State* current_state;
extern array<anshub::AudioOut, MAX_SE> audioArray;
extern anshub::AudioOut music;
extern SoLoud::Soloud se;
extern SoLoud::Soloud music;
extern SoLoud::Wav waveLoader;
extern SoLoud::Openmpt modLoader;
extern string currentMusic;
extern int seIndex;
/*
* Play a sound. If a sound is currently playing then it will proceed to a different sound id.
* You can also specify the specific id, if you intentionally want the sound to override another.
* Play a sound. Will not override unless said so.
*/
bool playSound(string path, int id = NULL);
bool playSound(string path, bool override = false);
/*
* Play music. Always loops.
* Passing a blank string (e.g. "") will stop the current playing music.