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

whoohohoh

Browse source
This commit is contained in:
/nick haya 2022-02-22 13:32:23 +08:00
parent b42a5e324d
commit 8749aac2fd
7 changed files with 45 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/Main.cpp
View file

@ -67,6 +67,7 @@ ExampleState m;
int main(int argc, char* argv[])
{
if (sdfml::init() > 0) {
sdfml::llog("game died", "", NORMAL, __FILENAME__, __LINE__);
return EXIT_FAILURE;
}

4
src/libflixel.hpp
View file

@ -405,8 +405,6 @@ namespace sdfml {
static GPU_Camera camera;
static LuaHandler lua;
inline int init(float width = DEFAULT_WINDOW_WIDTH, float height = DEFAULT_WINDOW_HEIGHT, string window_name = "Unknown",
int win_flags = SDL_WINDOW_OPENGL|SDL_WINDOW_ALLOW_HIGHDPI|SDL_WINDOW_SHOWN) {
std::ofstream logFile;
@ -439,7 +437,7 @@ namespace sdfml {
mContext.direct_win = wmInfo.info.win.window;
sound.init();
sound.initSF(soundfont);
llog("SoLoud", " is now initialized.", NORMAL, __FILENAME__, __LINE__);
camera = GPU_GetDefaultCamera();

2
src/lua/sol.hpp
View file

@ -27239,7 +27239,7 @@ namespace sol {
using iterator = typename global_table::iterator;
using const_iterator = typename global_table::const_iterator;
state_view(lua_State* Ls = NULL) : L(Ls), reg(Ls, LUA_REGISTRYINDEX), global(Ls, global_tag) {
state_view(lua_State* Ls) : L(Ls), reg(Ls, LUA_REGISTRYINDEX), global(Ls, global_tag) {
}
state_view(this_state Ls) : state_view(Ls.L) {

2
src/sdfml/music.cpp
View file

@ -6,7 +6,5 @@ std::pair<SoLoud::WavStream, SoLoud::Modplug> sdfml::musicBank;
#else
std::pair<SoLoud::WavStream, SoLoud::Openmpt> sdfml::musicBank;
#endif
SoLoud::Midi sdfml::midiBank;
SoLoud::SoundFont sdfml::midiSF;
SoLoud::Soloud sdfml::audio;
sdfml::AudioHandler sdfml::sound;

11
src/sdfml/music.hpp
View file

@ -20,18 +20,11 @@ namespace sdfml {
#else
extern std::pair<SoLoud::WavStream, SoLoud::Openmpt> musicBank;
#endif
extern SoLoud::Midi midiBank;
extern SoLoud::SoundFont midiSF;
extern SoLoud::Soloud audio;
class MusicHandler {
public:
void playMidi(std::string path) {
}
void playMusic(std::string path) {
musicBank.first.stop();
@ -58,10 +51,6 @@ namespace sdfml {
audio.init(audio.CLIP_ROUNDOFF, audio.MINIAUDIO);
}
void initSF(std::string path) {
midiSF.load(path.c_str());
}
void deinit() {
audio.stopAll();
audio.deinit();

12
src/sdfml/sdfml_lua.hpp
View file

@ -12,22 +12,14 @@ namespace sdfml {
class LuaHandler {
protected:
sol::state _lua_state;
sol::state_view _lua_view;
sol::state_view _lua_view = NULL;
sol::load_result _cur_result;
bool _prefer_view = false;
public:
LuaHandler() {
sol::state_view temp(NULL);
_lua_view = temp;
}
int open_state(std::string path, bool immediate = false);
int create_from_lua_state(lua_State* L, std::string path, bool immediate = false);
int open_from_lua_state(lua_State* L, std::string path, bool immediate = false) {
return create_from_lua_state(L, path, immediate);
}
int run_state();
template <typename TName = int>
@ -39,6 +31,8 @@ namespace sdfml {
template <typename... Args>
void add_libraries(Args&&... libraries);
};
//static LuaHandler lua;
}
#endif