mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2024-11-24 05:17:17 +00:00
Code Issues Releases Wiki Activity

fixed subscreen computations

Browse Source
This commit is contained in:
Zeno Rogue 2018-11-18 00:35:50 +01:00
parent 6213d11d93
commit eec70d7265
3 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
basegraph.cpp
View File

@ -179,23 +179,20 @@ void setcameraangle(bool b) {
bool shaderside_projection; bool shaderside_projection;
int subscreen;
void start_projection(int ed, bool perspective) { void start_projection(int ed, bool perspective) {
glhr::new_projection(); glhr::new_projection();
shaderside_projection = perspective; shaderside_projection = perspective;
auto cd = current_display; auto cd = current_display;
if(subscreen)
glhr::projection_multiply(glhr::scale(1/(cd->xmax-cd->ymin), 1/(cd->ymax-cd->ymin), 1));
if(ed && vid.stereo_mode == sLR) { if(ed && vid.stereo_mode == sLR) {
glhr::projection_multiply(glhr::translate(ed, 0, 0)); glhr::projection_multiply(glhr::translate(ed, 0, 0));
glhr::projection_multiply(glhr::scale(2, 1, 1)); glhr::projection_multiply(glhr::scale(2, 1, 1));
} }
glhr::projection_multiply(glhr::translate((current_display->xcenter*2.)/vid.xres - 1, 1 - (current_display->ycenter*2.)/vid.yres, 0)); ld tx = (cd->xcenter-cd->xtop)*2./cd->xsize - 1;
ld ty = (cd->ycenter-cd->ytop)*2./cd->ysize - 1;
glhr::projection_multiply(glhr::translate(tx, -ty, 0));
} }
void eyewidth_translate(int ed) { void eyewidth_translate(int ed) {
@ -214,8 +211,10 @@ void display_data::set_projection(int ed, bool apply_models) {
start_projection(ed, shaderside_projection); start_projection(ed, shaderside_projection);
auto cd = current_display;
if(!shaderside_projection) { if(!shaderside_projection) {
glhr::projection_multiply(glhr::ortho(vid.xres/2, -vid.yres/2, abs(current_display->scrdist) + 30000)); glhr::projection_multiply(glhr::ortho(cd->xsize/2, -cd->ysize/2, abs(current_display->scrdist) + 30000));
if(ed) { if(ed) {
glhr::glmatrix m = glhr::id; glhr::glmatrix m = glhr::id;
m[2][0] -= ed; m[2][0] -= ed;
@ -236,15 +235,15 @@ void display_data::set_projection(int ed, bool apply_models) {
eyewidth_translate(ed); eyewidth_translate(ed);
glhr::projection_multiply(glhr::frustum(vid.xres * 1. / vid.yres, 1)); glhr::projection_multiply(glhr::frustum(cd->xsize / cd->ysize, 1));
GLfloat sc = current_display->radius / (vid.yres/2.); GLfloat sc = current_display->radius / (cd->ysize/2.);
glhr::projection_multiply(glhr::scale(sc, -sc, -1)); glhr::projection_multiply(glhr::scale(sc, -sc, -1));
if(ed) glhr::projection_multiply(glhr::translate(vid.ipd * ed/2, 0, 0)); if(ed) glhr::projection_multiply(glhr::translate(vid.ipd * ed/2, 0, 0));
current_display->scrdist_text = vid.yres * sc / 2; current_display->scrdist_text = cd->ysize * sc / 2;
if(glhr::new_shader_projection == glhr::shader_projection::band) { if(glhr::new_shader_projection == glhr::shader_projection::band) {
glhr::projection_multiply(glhr::scale(2 / M_PI, 2 / M_PI,1)); glhr::projection_multiply(glhr::scale(2 / M_PI, 2 / M_PI,1));

12
graph.cpp
View File

@ -5484,12 +5484,18 @@ void calcparam() {
auto cd = current_display; auto cd = current_display;
DEBB(DF_GRAPH, (debugfile,"calc param\n")); DEBB(DF_GRAPH, (debugfile,"calc param\n"));
cd->xcenter = vid.xres * (cd->xmax + cd->xmin) / 2; cd->xtop = vid.xres * cd->xmin;
cd->ycenter = vid.yres * (cd->ymax + cd->ymin) / 2; cd->ytop = vid.yres * cd->ymin;
cd->xsize = vid.xres * (cd->xmax - cd->xmin);
cd->ysize = vid.yres * (cd->ymax - cd->ymin);
cd->xcenter = cd->xtop + cd->xsize / 2;
cd->ycenter = cd->ytop + cd->ysize / 2;
if(vid.scale > -1e-2 && vid.scale < 1e-2) vid.scale = 1; if(vid.scale > -1e-2 && vid.scale < 1e-2) vid.scale = 1;
ld realradius = min(vid.xres * (cd->xmax - cd->xmin) / 2, vid.yres * (cd->ymax - cd->ymin) / 2); ld realradius = min(cd->xsize / 2, cd->ysize / 2);
cd->scrsize = realradius - (inHighQual ? 0 : ISANDROID ? 2 : ISIOS ? 40 : 40); cd->scrsize = realradius - (inHighQual ? 0 : ISANDROID ? 2 : ISIOS ? 40 : 40);

3
hyper.h
View File

@ -1076,7 +1076,8 @@ struct display_data {
heptspin view_center; heptspin view_center;
cellwalker precise_center; cellwalker precise_center;
unordered_map<cell*, transmatrix> cellmatrices, old_cellmatrices; unordered_map<cell*, transmatrix> cellmatrices, old_cellmatrices;
ld xmin, ymin, xmax, ymax; ld xmin, ymin, xmax, ymax; // relative
ld xtop, ytop, xsize, ysize; // in pixels
display_data() { xmin = ymin = 0; xmax = ymax = 1; } display_data() { xmin = ymin = 0; xmax = ymax = 1; }
// paramaters calculated from the above // paramaters calculated from the above