mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2025-10-30 21:42:59 +00:00
Code Issues Releases Wiki Activity

fix last commit

Browse Source
This commit is contained in:
Zeno Rogue
2018-03-25 14:03:41 +02:00
parent 5de5acc68c
commit 2fb0469c3e
1 changed files with 34 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
hyper.h
View File

@@ -2498,13 +2498,11 @@ extern int startseed;
extern transmatrix heptmove[MAX_EDGE], hexmove[MAX_EDGE]; extern transmatrix heptmove[MAX_EDGE], hexmove[MAX_EDGE];
extern transmatrix invheptmove[MAX_EDGE], invhexmove[MAX_EDGE]; extern transmatrix invheptmove[MAX_EDGE], invhexmove[MAX_EDGE];
static const struct wstep_t { } wstep; static const struct wstep_t { wstep_t() {} } wstep;
static const struct wmirror_t { } wmirror; static const struct wmirror_t { wmirror_t() {}} wmirror;
// heptspin hsstep(const heptspin &hs, int spin); // heptspin hsstep(const heptspin &hs, int spin);
template<class T>
extern void fixmatrix(transmatrix&); extern void fixmatrix(transmatrix&);
void display(const transmatrix& T); void display(const transmatrix& T);
transmatrix rgpushxto0(const hyperpoint& H); transmatrix rgpushxto0(const hyperpoint& H);
@@ -2551,9 +2549,11 @@ namespace texture {
}; };
struct texture_data { struct texture_data {
GLuint textureid = 0; GLuint textureid;
int twidth = 2048; int twidth;
texture_data() { textureid = 0; twidth = 2048; }
vector<unsigned> texture_pixels; vector<unsigned> texture_pixels;
@@ -2575,23 +2575,23 @@ namespace texture {
}; };
struct texture_config { struct texture_config {
string texturename = "textures/hyperrogue-texture.png"; string texturename;
string configname = "textures/hyperrogue.txc"; string configname;
unsigned paint_color = 0x000000FF; unsigned paint_color;
eTextureState tstate; eTextureState tstate;
eTextureState tstate_max; eTextureState tstate_max;
transmatrix itt = Id; transmatrix itt;
unsigned grid_color = 0; unsigned grid_color;
unsigned mesh_color = 0; unsigned mesh_color;
unsigned master_color = 0xFFFFFF30; unsigned master_color;
unsigned slave_color = 0xFF000008; unsigned slave_color;
int color_alpha = 128; int color_alpha;
int gsplits = 1;
int gsplits;
int recolor(int col); int recolor(int col);
typedef tuple<eGeometry, bool, char, int, eModel, ld, ld> texture_parameters; typedef tuple<eGeometry, bool, char, int, eModel, ld, ld> texture_parameters;
@@ -2600,7 +2600,7 @@ namespace texture {
map<int, textureinfo> texture_map, texture_map_orig; map<int, textureinfo> texture_map, texture_map_orig;
set<cell*> models; set<cell*> models;
bool texture_tuned = false; bool texture_tuned;
string texture_tuner; string texture_tuner;
vector<hyperpoint*> tuned_vertices; vector<hyperpoint*> tuned_vertices;
@@ -2622,6 +2622,22 @@ namespace texture {
bool load(); bool load();
texture_data data; texture_data data;
texture_config() {
// argh, no member initialization in some of my compilers
texturename = "textures/hyperrogue-texture.png";
configname = "textures/hyperrogue.txc";
itt = Id;
paint_color = 0x000000FF;
grid_color = 0;
mesh_color = 0;
master_color = 0xFFFFFF30;
slave_color = 0xFF000008;
color_alpha = 128;
gsplits = 1;
texture_tuned = false;
}
}; };
extern texture_config config; extern texture_config config;