Added argument parsing.

Now also allows you to change resolution and fullscreen mode.
This commit is contained in:
Nicolás Ortega Froysa 2018-10-25 20:31:53 +02:00
parent 20ad76f86d
commit d420f1aa35
No known key found for this signature in database
GPG Key ID: FEC70E3BAE2E69BF
4 changed files with 97 additions and 8 deletions

71
src/args.h Normal file
View File

@ -0,0 +1,71 @@
/*
* Copyright (C) 2018 Ortega Froysa, Nicolás <nortega@themusicinnoise.net> All rights reserved.
* Author: Ortega Froysa, Nicolás <nortega@themusicinnoise.net>
*
* This software is provided 'as-is', without any express or implied
* warranty. In no event will the authors be held liable for any damages
* arising from the use of this software.
*
* Permission is granted to anyone to use this software for any purpose,
* including commercial applications, and to alter it and redistribute it
* freely, subject to the following restrictions:
*
* 1. The origin of this software must not be misrepresented; you must not
* claim that you wrote the original software. If you use this software
* in a product, an acknowledgment in the product documentation would be
* appreciated but is not required.
*
* 2. Altered source versions must be plainly marked as such, and must not be
* misrepresented as being the original software.
*
* 3. This notice may not be removed or altered from any source
* distribution.
*/
#pragma once
#include "globals.h"
extern "C" {
#include <argp.h>
#include <stdlib.h>
const char *argp_program_version = VERSION;
const char *argp_program_bug_address = "nortega@themusicinnoise.net";
static char desc[] = "A psychedelic cube that changes color in 3D.";
static struct argp_option opts[] = {
{ "fullscreen", 'f', 0, 0, "Set window to fullscreen", 0 },
{ "screen-width", 'w', "width", 0, "Set width of resolution", 0 },
{ "screen-height", 'h', "height", 0, "Set height of resolution", 0 },
{ 0, 0, 0, 0, 0, 0 }
};
struct args {
int fullscreen;
unsigned short width, height;
};
static error_t parse_opt(int key, char *arg, struct argp_state *state) {
struct args *args = (struct args*)state->input;
switch(key)
{
case 'f':
args->fullscreen = 1;
break;
case 'w':
args->width = (unsigned short)atoi(arg);
break;
case 'h':
args->height = (unsigned short) atoi(arg);
break;
default:
return ARGP_ERR_UNKNOWN;
}
return 0;
}
static struct argp argp = { opts, parse_opt, 0, desc, 0, 0, 0 };
}

View File

@ -31,10 +31,9 @@
# define VERSION "version" # define VERSION "version"
#endif #endif
#define SCREEN_WIDTH 800
#define SCREEN_HEIGHT 600
extern "C" { extern "C" {
extern unsigned short screen_width;
extern unsigned short screen_height;
extern SDL_Window *window; extern SDL_Window *window;
extern GLuint program_id; extern GLuint program_id;
extern GLuint matrix_id; extern GLuint matrix_id;

View File

@ -24,32 +24,45 @@
#include <iostream> #include <iostream>
#include <argp.h>
#include <SDL2/SDL.h> #include <SDL2/SDL.h>
#include <GL/glew.h> #include <GL/glew.h>
#include <GL/gl.h> #include <GL/gl.h>
#include "globals.h" #include "args.h"
#include "shaders.hpp" #include "shaders.hpp"
#include "simulation.hpp" #include "simulation.hpp"
unsigned short screen_width;
unsigned short screen_height;
SDL_Window *window; SDL_Window *window;
GLuint program_id; GLuint program_id;
GLuint matrix_id; GLuint matrix_id;
int main() { int main(int argc, char *argv[]) {
// handle arguments
struct args args = { 0, 800, 600 };
argp_parse(&argp, argc, argv, 0, 0, &args);
screen_width = args.width;
screen_height = args.height;
if(SDL_Init(SDL_INIT_VIDEO) < 0) if(SDL_Init(SDL_INIT_VIDEO) < 0)
{ {
std::cerr << "ERROR: " << SDL_GetError() << std::endl; std::cerr << "ERROR: " << SDL_GetError() << std::endl;
exit(1); exit(1);
} }
// setup SDL2 window
SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, 3); SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, 3);
SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, 3); SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, 3);
SDL_GL_SetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, SDL_GL_SetAttribute(SDL_GL_CONTEXT_PROFILE_MASK,
SDL_GL_CONTEXT_PROFILE_CORE); SDL_GL_CONTEXT_PROFILE_CORE);
window = SDL_CreateWindow("Trippy Cube", window = SDL_CreateWindow("Trippy Cube",
SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED,
SCREEN_WIDTH, SCREEN_HEIGHT, args.width, args.height,
SDL_WINDOW_OPENGL | SDL_WINDOW_SHOWN); SDL_WINDOW_OPENGL | SDL_WINDOW_SHOWN);
if(not window) if(not window)
@ -59,7 +72,13 @@ int main() {
exit(1); exit(1);
} }
//SDL_ShowCursor(SDL_DISABLE); if(args.fullscreen)
{
SDL_SetWindowBordered(window, SDL_FALSE);
SDL_SetWindowFullscreen(window,
SDL_WINDOW_FULLSCREEN_DESKTOP);
}
SDL_SetRelativeMouseMode(SDL_TRUE); SDL_SetRelativeMouseMode(SDL_TRUE);
SDL_GLContext glcontext = SDL_GL_CreateContext(window); SDL_GLContext glcontext = SDL_GL_CreateContext(window);

View File

@ -49,7 +49,7 @@ void run() {
glm::mat4 mvp; glm::mat4 mvp;
{ {
glm::mat4 proj = glm::perspective(glm::radians(45.0f), glm::mat4 proj = glm::perspective(glm::radians(45.0f),
static_cast<float>(SCREEN_WIDTH) / static_cast<float>(SCREEN_HEIGHT), static_cast<float>(screen_width) / static_cast<float>(screen_height),
0.1f, 100.0f); 0.1f, 100.0f);
glm::mat4 view = glm::lookAt( glm::mat4 view = glm::lookAt(