mirror of https://github.com/haya3218/SDfmL.git
parent
89a2dd1f6d
commit
b42a5e324d
|
@ -14,7 +14,6 @@
|
||||||
#include "SDL2/SDL.h"
|
#include "SDL2/SDL.h"
|
||||||
#include "SDL2/SDL_ttf.h"
|
#include "SDL2/SDL_ttf.h"
|
||||||
#include "SDL2/SDL_FontCache.h"
|
#include "SDL2/SDL_FontCache.h"
|
||||||
#include "SDL_video.h"
|
|
||||||
#include "SoLoud/soloud.h"
|
#include "SoLoud/soloud.h"
|
||||||
#include "SoLoud/soloud_wav.h"
|
#include "SoLoud/soloud_wav.h"
|
||||||
#include "SoLoud/soloud_wavstream.h"
|
#include "SoLoud/soloud_wavstream.h"
|
||||||
|
@ -149,6 +148,7 @@ namespace sdfml {
|
||||||
struct context {
|
struct context {
|
||||||
GPU_Target* gpu_render;
|
GPU_Target* gpu_render;
|
||||||
SDL_Window* window;
|
SDL_Window* window;
|
||||||
|
SDL_Renderer* renderer;
|
||||||
SDL_Event events;
|
SDL_Event events;
|
||||||
mWin direct_win;
|
mWin direct_win;
|
||||||
Vector2f size;
|
Vector2f size;
|
||||||
|
@ -429,12 +429,13 @@ namespace sdfml {
|
||||||
llog("", "Initialized libraries. Creating a window context.", NORMAL, __FILENAME__, __LINE__);
|
llog("", "Initialized libraries. Creating a window context.", NORMAL, __FILENAME__, __LINE__);
|
||||||
GPU_SetPreInitFlags(GPU_INIT_DISABLE_VSYNC);
|
GPU_SetPreInitFlags(GPU_INIT_DISABLE_VSYNC);
|
||||||
mContext.gpu_render = GPU_Init(width, height, GPU_DEFAULT_INIT_FLAGS);
|
mContext.gpu_render = GPU_Init(width, height, GPU_DEFAULT_INIT_FLAGS);
|
||||||
mContext.window = SDL_GetWindowFromID(mContext.gpu_render->context->windowID);
|
|
||||||
SDL_SetWindowTitle(mContext.window, window_name.c_str());
|
SDL_SetWindowTitle(SDL_GetWindowFromID(mContext.gpu_render->context->windowID), window_name.c_str());
|
||||||
|
//sound.music.loadSoundfont(soundfont);
|
||||||
|
|
||||||
SDL_SysWMinfo wmInfo;
|
SDL_SysWMinfo wmInfo;
|
||||||
SDL_VERSION(&wmInfo.version);
|
SDL_VERSION(&wmInfo.version);
|
||||||
SDL_GetWindowWMInfo(mContext.window, &wmInfo);
|
SDL_GetWindowWMInfo(SDL_GetWindowFromID(mContext.gpu_render->context->windowID), &wmInfo);
|
||||||
mContext.direct_win = wmInfo.info.win.window;
|
mContext.direct_win = wmInfo.info.win.window;
|
||||||
|
|
||||||
sound.init();
|
sound.init();
|
||||||
|
@ -447,7 +448,7 @@ namespace sdfml {
|
||||||
|
|
||||||
SDL_EventState(SDL_SYSWMEVENT, SDL_ENABLE);
|
SDL_EventState(SDL_SYSWMEVENT, SDL_ENABLE);
|
||||||
|
|
||||||
mContext.size = {static_cast<float>(mContext.gpu_render->context->window_w), static_cast<float>(mContext.gpu_render->context->window_h)};
|
mContext.size = {width, height};
|
||||||
|
|
||||||
return llog("", "Fully finalized initialization. Command over.", NORMAL, __FILENAME__, __LINE__);
|
return llog("", "Fully finalized initialization. Command over.", NORMAL, __FILENAME__, __LINE__);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue