Merge pull request #8 from yozlet/18784

Go fullscreen on startup
This commit is contained in:
Philip Rosedale 2012-12-03 16:08:06 -08:00
commit 8d74d5b4e9
3 changed files with 3 additions and 2 deletions

View file

@ -10,7 +10,7 @@
#include "cloud.h" #include "cloud.h"
#include "util.h" #include "util.h"
#define COLOR_MIN 0.3f // minimum R/G/B value at 0,0,0 - also needs setting in field.cpp #define COLOR_MIN 0.2f // minimum R/G/B value at 0,0,0 - also needs setting in field.cpp
Cloud::Cloud(int num, Cloud::Cloud(int num,
glm::vec3 box, glm::vec3 box,

View file

@ -10,7 +10,7 @@
#include "glm/glm.hpp" #include "glm/glm.hpp"
#define FIELD_SCALE 0.00050 #define FIELD_SCALE 0.00050
#define COLOR_DRIFT_RATE 0.001f // per-frame drift of particle color towards field element color #define COLOR_DRIFT_RATE 0.001f // per-frame drift of particle color towards field element color
#define COLOR_MIN 0.3f // minimum R/G/B value at 0,0,0 - also needs setting in cloud.cpp #define COLOR_MIN 0.2f // minimum R/G/B value at 0,0,0 - also needs setting in cloud.cpp
#define USE_SCALAR 0 #define USE_SCALAR 0

View file

@ -243,6 +243,7 @@ void initDisplay(void)
glEnable(GL_DEPTH_TEST); glEnable(GL_DEPTH_TEST);
load_png_as_texture(texture_filename); load_png_as_texture(texture_filename);
glutFullScreen();
} }
void init(void) void init(void)