diff --git a/CMakeLists.txt b/CMakeLists.txt index 8425b4b..6912209 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,7 +10,7 @@ endif() set(CMAKE_CXX_STANDARD 11) #set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${PROJECT_SOURCE_DIR}/cmake") #if(CMAKE_COMPILER_IS_GNUCXX) -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -s USE_SDL=2") +set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -s USE_SDL=2 --preload-file ../resources/client") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -s USE_SDL_IMAGE=2 -s SDL2_IMAGE_FORMATS='[\"bmp\"]'") #endif() @@ -31,7 +31,7 @@ file(GLOB_RECURSE client_src add_executable(client ${client_src}) target_include_directories(client - PRIVATE ${PROJECT_SOURCE_DIR}/src/common + #PRIVATE ${PROJECT_SOURCE_DIR}/src/common PRIVATE ${PROJECT_SOURCE_DIR}/src/client PRIVATE ${PROJECT_SOURCE_DIR}/include/client) #PRIVATE ${OPENGL_INCLUDE_DIR} diff --git a/resources/client/fonts/scape.bmp b/resources/client/fonts/scape.bmp index cf8c391..50b8e29 100644 Binary files a/resources/client/fonts/scape.bmp and b/resources/client/fonts/scape.bmp differ diff --git a/resources/client/fonts/scape.dat b/resources/client/fonts/scape.dat index 5d0a857..1fa6e60 100644 Binary files a/resources/client/fonts/scape.dat and b/resources/client/fonts/scape.dat differ diff --git a/src/client/main.cpp b/src/client/main.cpp index 1072b7c..9ad29f5 100644 --- a/src/client/main.cpp +++ b/src/client/main.cpp @@ -3,10 +3,41 @@ #include #include -struct { +static struct { SDL_Window* window; + SDL_GLContext gl_ctx; } _ctx; +void draw(); + int main(int argc, char** argv) { - + if(SDL_Init(SDL_INIT_VIDEO) < 0) { + std::cout << SDL_GetError() << std::endl; + return -1; + } + + SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1); + + _ctx.window = SDL_CreateWindow( + "SockScape Client", + 0, 0, + 640, 480, + SDL_WINDOW_OPENGL + ); + + _ctx.gl_ctx = SDL_GL_CreateContext(_ctx.window); + if(_ctx.gl_ctx == nullptr) + return -1; + + if(glewInit() != GLEW_OK) + return -1; + + emscripten_set_main_loop(draw, 0, 1); +} + +void draw() { + glClear(GL_COLOR_BUFFER_BIT); + glClearColor(.25, .25, .25, 1); + + SDL_GL_SwapWindow(_ctx.window); } \ No newline at end of file