mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2025-05-05 00:34:07 +00:00
Code Issues Releases Wiki Activity

removed mdText as it was equivalent to mdUnchanged

Browse Source
This commit is contained in:
Zeno Rogue 2019-04-29 10:52:41 +02:00
parent 85f4c57202
commit 5895540ae9
6 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
basegraph.cpp
View File

@ -215,7 +215,7 @@ void display_data::set_projection(int ed) {
DEBB(DF_GRAPH, (debugfile,"current_display->set_projection\n")); DEBB(DF_GRAPH, (debugfile,"current_display->set_projection\n"));
bool pers3 = false; bool pers3 = false;
bool apply_models = !among(pmodel, mdText, mdRug); bool apply_models = !among(pmodel, mdUnchanged, mdRug);
shaderside_projection = false; shaderside_projection = false;
glhr::new_shader_projection = glhr::shader_projection::standard; glhr::new_shader_projection = glhr::shader_projection::standard;
@ -323,7 +323,7 @@ void display_data::set_projection(int ed) {
} }
} }
if(vid.camera_angle && !among(pmodel, mdText, mdUnchanged, mdRug)) { if(vid.camera_angle && !among(pmodel, mdUnchanged, mdRug)) {
ld cam = vid.camera_angle * degree; ld cam = vid.camera_angle * degree;
GLfloat cc = cos(cam); GLfloat cc = cos(cam);

2
classes.h
View File

@ -261,7 +261,7 @@ enum eModel {
mdFisheye, mdJoukowsky, mdJoukowskyInverted, mdFisheye, mdJoukowsky, mdJoukowskyInverted,
mdRotatedHyperboles, mdSpiral, mdPerspective, mdRotatedHyperboles, mdSpiral, mdPerspective,
mdEquivolume, mdEquivolume,
mdGUARD, mdUnchanged, mdHyperboloidFlat, mdPolynomial, mdText, mdRug mdGUARD, mdUnchanged, mdHyperboloidFlat, mdPolynomial, mdRug
}; };
typedef unsigned long long flagtype; typedef unsigned long long flagtype;

2
graph.cpp
View File

@ -2715,7 +2715,7 @@ void drawaura() {
} }
} }
glflush(); glflush();
dynamicval<eModel> p(pmodel, DIM == 2 && pmodel == mdDisk ? mdDisk : mdText); dynamicval<eModel> p(pmodel, DIM == 2 && pmodel == mdDisk ? mdDisk : mdUnchanged);
current_display->set_all(0); current_display->set_all(0);
glhr::switch_mode(glhr::gmVarColored, glhr::shader_projection::standard); glhr::switch_mode(glhr::gmVarColored, glhr::shader_projection::standard);
glhr::id_modelview(); glhr::id_modelview();

4
hud.cpp
View File

@ -349,13 +349,15 @@ void drawMobileArrow(int i) {
bool nofps = false; bool nofps = false;
void draw_radar(bool cornermode) { void draw_radar(bool cornermode) {
dynamicval<eGeometry> g(geometry, gEuclid); dynamicval<eGeometry> g(geometry, gEuclid);
dynamicval<eModel> pm(pmodel, mdText); dynamicval<eModel> pm(pmodel, mdUnchanged);
initquickqueue(); initquickqueue();
int rad = vid.radarsize; int rad = vid.radarsize;
ld cx = cornermode ? rad+2 : vid.xres-rad-2; ld cx = cornermode ? rad+2 : vid.xres-rad-2;
ld cy = vid.yres-rad-2 - vid.fsize; ld cy = vid.yres-rad-2 - vid.fsize;
for(int i=0; i<360; i++) for(int i=0; i<360; i++)
curvepoint(atscreenpos(cx-cos(i * degree)*rad, cy-sin(i*degree)*rad, 1) * C0); curvepoint(atscreenpos(cx-cos(i * degree)*rad, cy-sin(i*degree)*rad, 1) * C0);
queuecurve(0xFFFFFFFF, 0x000000FF, PPR::ZERO); queuecurve(0xFFFFFFFF, 0x000000FF, PPR::ZERO);

1
hypgraph.cpp
View File

@ -273,7 +273,6 @@ void applymodel(hyperpoint H, hyperpoint& ret) {
} }
case mdUnchanged: case mdUnchanged:
case mdText:
ret = H / current_display->radius; ret = H / current_display->radius;
return; return;

2
polygons.cpp
View File

@ -185,7 +185,7 @@ void glflush() {
if(isize(text_vertices)) { if(isize(text_vertices)) {
// printf("%08X | %d texts, %d vertices\n", text_color, texts_merged, isize(text_vertices)); // printf("%08X | %d texts, %d vertices\n", text_color, texts_merged, isize(text_vertices));
glhr::be_textured(); glhr::be_textured();
dynamicval<eModel> pm(pmodel, mdText); dynamicval<eModel> pm(pmodel, mdUnchanged);
if(!svg::in) current_display->set_all(0); if(!svg::in) current_display->set_all(0);
glBindTexture(GL_TEXTURE_2D, text_texture); glBindTexture(GL_TEXTURE_2D, text_texture);
glhr::color2(text_color); glhr::color2(text_color);