diff --git a/basegraph.cpp b/basegraph.cpp index ec64c503..7e6b50fe 100644 --- a/basegraph.cpp +++ b/basegraph.cpp @@ -215,7 +215,7 @@ void display_data::set_projection(int ed) { DEBB(DF_GRAPH, (debugfile,"current_display->set_projection\n")); bool pers3 = false; - bool apply_models = !among(pmodel, mdText, mdRug); + bool apply_models = !among(pmodel, mdUnchanged, mdRug); shaderside_projection = false; 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; GLfloat cc = cos(cam); diff --git a/classes.h b/classes.h index 83fe2382..abd2e8bd 100644 --- a/classes.h +++ b/classes.h @@ -261,7 +261,7 @@ enum eModel { mdFisheye, mdJoukowsky, mdJoukowskyInverted, mdRotatedHyperboles, mdSpiral, mdPerspective, mdEquivolume, - mdGUARD, mdUnchanged, mdHyperboloidFlat, mdPolynomial, mdText, mdRug + mdGUARD, mdUnchanged, mdHyperboloidFlat, mdPolynomial, mdRug }; typedef unsigned long long flagtype; diff --git a/graph.cpp b/graph.cpp index 3a6fccc3..03c64162 100644 --- a/graph.cpp +++ b/graph.cpp @@ -2715,7 +2715,7 @@ void drawaura() { } } glflush(); - dynamicval p(pmodel, DIM == 2 && pmodel == mdDisk ? mdDisk : mdText); + dynamicval p(pmodel, DIM == 2 && pmodel == mdDisk ? mdDisk : mdUnchanged); current_display->set_all(0); glhr::switch_mode(glhr::gmVarColored, glhr::shader_projection::standard); glhr::id_modelview(); diff --git a/hud.cpp b/hud.cpp index 4c83469b..c1485e41 100644 --- a/hud.cpp +++ b/hud.cpp @@ -349,13 +349,15 @@ void drawMobileArrow(int i) { bool nofps = false; void draw_radar(bool cornermode) { + dynamicval g(geometry, gEuclid); - dynamicval pm(pmodel, mdText); + dynamicval pm(pmodel, mdUnchanged); initquickqueue(); int rad = vid.radarsize; ld cx = cornermode ? rad+2 : vid.xres-rad-2; ld cy = vid.yres-rad-2 - vid.fsize; + for(int i=0; i<360; i++) curvepoint(atscreenpos(cx-cos(i * degree)*rad, cy-sin(i*degree)*rad, 1) * C0); queuecurve(0xFFFFFFFF, 0x000000FF, PPR::ZERO); diff --git a/hypgraph.cpp b/hypgraph.cpp index 9f8471a7..41763f04 100644 --- a/hypgraph.cpp +++ b/hypgraph.cpp @@ -273,7 +273,6 @@ void applymodel(hyperpoint H, hyperpoint& ret) { } case mdUnchanged: - case mdText: ret = H / current_display->radius; return; diff --git a/polygons.cpp b/polygons.cpp index f2390f20..9fba8e11 100644 --- a/polygons.cpp +++ b/polygons.cpp @@ -185,7 +185,7 @@ void glflush() { if(isize(text_vertices)) { // printf("%08X | %d texts, %d vertices\n", text_color, texts_merged, isize(text_vertices)); glhr::be_textured(); - dynamicval pm(pmodel, mdText); + dynamicval pm(pmodel, mdUnchanged); if(!svg::in) current_display->set_all(0); glBindTexture(GL_TEXTURE_2D, text_texture); glhr::color2(text_color);