spacecruft
/
celestia
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[sdl] small cleanup

pull/1340/head
Hleb Valoshka 2022-01-25 22:05:17 +02:00
parent b7dd51fc81
commit 9d60f6e660
1 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/celestia/sdl/sdlmain.cpp
View File

@ -11,6 +11,7 @@
#include <cstring> #include <cstring>
#include <iostream> #include <iostream>
#include <memory> #include <memory>
#include <string_view>
#include <system_error> #include <system_error>
#include <fmt/printf.h> #include <fmt/printf.h>
#include <celcompat/filesystem.h> #include <celcompat/filesystem.h>
@ -46,7 +47,7 @@ class SDL_Application
{ {
public: public:
SDL_Application() = delete; SDL_Application() = delete;
SDL_Application(const std::string name, int w, int h) : SDL_Application(std::string_view name, int w, int h) :
m_appName { name }, m_appName { name },
m_windowWidth { w }, m_windowWidth { w },
m_windowHeight { h } m_windowHeight { h }
@ -54,13 +55,13 @@ class SDL_Application
} }
~SDL_Application(); ~SDL_Application();
static std::shared_ptr<SDL_Application> init(const std::string, int, int); static std::shared_ptr<SDL_Application> init(std::string_view, int, int);
bool createOpenGLWindow(); bool createOpenGLWindow();
bool initCelestiaCore(); bool initCelestiaCore();
void run(); void run();
const char* getError() const; std::string_view getError() const;
private: private:
void display(); void display();
@ -97,7 +98,7 @@ class SDL_Application
}; };
std::shared_ptr<SDL_Application> std::shared_ptr<SDL_Application>
SDL_Application::init(const std::string name, int w, int h) SDL_Application::init(std::string_view name, int w, int h)
{ {
if (SDL_Init(SDL_INIT_VIDEO) < 0) if (SDL_Init(SDL_INIT_VIDEO) < 0)
return nullptr; return nullptr;
@ -109,7 +110,7 @@ SDL_Application::init(const std::string name, int w, int h)
SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, 2); SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, 2);
SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, 0); SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, 0);
#endif #endif
return std::shared_ptr<SDL_Application>(new SDL_Application(std::move(name), w, h)); return std::make_shared<SDL_Application>(name, w, h);
} }
SDL_Application::~SDL_Application() SDL_Application::~SDL_Application()
@ -145,7 +146,7 @@ SDL_Application::createOpenGLWindow()
return true; return true;
} }
const char* std::string_view
SDL_Application::getError() const SDL_Application::getError() const
{ {
return SDL_GetError(); return SDL_GetError();
@ -541,7 +542,8 @@ FatalError(const std::string &message)
std::cerr << message << std::endl; std::cerr << message << std::endl;
} }
void DumpGLInfo() void
DumpGLInfo()
{ {
const char* s; const char* s;
s = reinterpret_cast<const char*>(glGetString(GL_VERSION)); s = reinterpret_cast<const char*>(glGetString(GL_VERSION));
@ -560,11 +562,9 @@ void DumpGLInfo()
if (s != nullptr) if (s != nullptr)
std::cout << s << '\n'; std::cout << s << '\n';
} }
} // namespace
using namespace celestia; int
sdlmain(int /* argc */, char ** /* argv */)
int main(int argc, char **argv)
{ {
setlocale(LC_ALL, ""); setlocale(LC_ALL, "");
setlocale(LC_NUMERIC, "C"); setlocale(LC_NUMERIC, "C");
@ -620,3 +620,10 @@ int main(int argc, char **argv)
return 0; return 0;
} }
} // namespace
int
main(int argc, char **argv)
{
return celestia::sdlmain(argc, argv);
}