|
@@ -60,6 +60,12 @@ static Vector2 mousePosition;
|
|
|
static int activeController = -1;
|
|
|
static GLFWgamepadstate lastControllerState;
|
|
|
|
|
|
+Window::Options::Options(int majorVersion, int minorVersion,
|
|
|
+ const IntVector2& size, bool es, const char* name)
|
|
|
+ : majorVersion(majorVersion), minorVersion(minorVersion), size(size),
|
|
|
+ fullscreen(false), es(es), vsync(true), name(name) {
|
|
|
+}
|
|
|
+
|
|
|
static void onButton(HashMap<int, Window::Controls::ButtonId>& map, int key,
|
|
|
int action) {
|
|
|
Window::Controls::ButtonId* b = map.search(key);
|
|
@@ -146,7 +152,7 @@ static void onMouseMove(GLFWwindow*, double x, double y) {
|
|
|
mousePosition = Vector2(x, y);
|
|
|
}
|
|
|
|
|
|
-Error Window::open(const WindowOptions& o) {
|
|
|
+Error Window::open(const Options& o) {
|
|
|
if(!glfwInit()) {
|
|
|
Error e{"could not initialize GLFW"};
|
|
|
addError(e);
|