| @@ -42,7 +42,7 @@ public: | |||||
| WorldEntity::tick_game(seconds); | WorldEntity::tick_game(seconds); | ||||
| static float f; | static float f; | ||||
| static vec3 clear_color; | |||||
| //static vec3 clear_color; | |||||
| static char buf[512]; | static char buf[512]; | ||||
| ImGuiIO& io = ImGui::GetIO(); | ImGuiIO& io = ImGui::GetIO(); | ||||
| ImGui::SetNextWindowFocus(); | ImGui::SetNextWindowFocus(); | ||||
| @@ -56,7 +56,7 @@ int main(int argc, char **argv) | |||||
| lol::sys::init(argc, argv); | lol::sys::init(argc, argv); | ||||
| lol::Application app("Tutorial 17: HTTP", lol::ivec2(800, 600), 60.0f); | lol::Application app("Tutorial 17: HTTP", lol::ivec2(800, 600), 60.0f); | ||||
| auto p = new demo(); | |||||
| new demo(); | |||||
| app.Run(); | app.Run(); | ||||
| return 0; | return 0; | ||||
| @@ -254,8 +254,8 @@ EglApp::EglApp(char const *title, ivec2 res, float fps) : | |||||
| #else | #else | ||||
| (void)title; | (void)title; | ||||
| (void)res; | (void)res; | ||||
| (void)fps; | |||||
| #endif | #endif | ||||
| (void)fps; | |||||
| } | } | ||||
| void EglApp::ShowPointer(bool show) | void EglApp::ShowPointer(bool show) | ||||
| @@ -96,7 +96,8 @@ sample::sample(void const *samples, size_t len) | |||||
| data->m_name = std::string("<sample>"); | data->m_name = std::string("<sample>"); | ||||
| #if defined LOL_USE_SDL_MIXER | #if defined LOL_USE_SDL_MIXER | ||||
| data->m_chunk = Mix_QuickLoad_RAW((Uint8 *)samples, (Uint32)len); | |||||
| // FIXME: this requires that the data is kept around; should we copy it? | |||||
| data->m_chunk = Mix_QuickLoad_RAW((Uint8 *)const_cast<void *>(samples), (Uint32)len); | |||||
| data->m_channel = -1; | data->m_channel = -1; | ||||
| #endif | #endif | ||||
| } | } | ||||
| @@ -19,6 +19,7 @@ extern "C" { | |||||
| #include "3rdparty/lua/lauxlib.h" | #include "3rdparty/lua/lauxlib.h" | ||||
| } | } | ||||
| #include <lol/msg> // lol::msg | |||||
| #include <cassert> // assert | #include <cassert> // assert | ||||
| #include <vector> // std::vector | #include <vector> // std::vector | ||||
| #include <string> // std::string | #include <string> // std::string | ||||
| @@ -51,10 +51,6 @@ au Syntax cpp | |||||
| \ syn match cOperator | \ syn match cOperator | ||||
| \ "\<lolunit_\(fail\|assert\|refute\)[a-z_]*\>" | \ "\<lolunit_\(fail\|assert\|refute\)[a-z_]*\>" | ||||
| " Global keywords | |||||
| au Syntax cpp | |||||
| \ syn keyword cConstant | |||||
| """ | """ | ||||
| """ LolFx language handler | """ LolFx language handler | ||||