mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2024-12-23 16:50:27 +00:00
Code Issues Releases Wiki Activity

warning when honeycomb too complex

Browse Source
This commit is contained in:
Zeno Rogue 2020-05-16 10:55:38 +02:00
parent f69b6f0795
commit 823fb3a0e6
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
raycaster.cpp
View File

@ -25,6 +25,8 @@ EX int want_use = 1;
EX ld exp_start = 1, exp_decay_exp = 4, exp_decay_poly = 10; EX ld exp_start = 1, exp_decay_exp = 4, exp_decay_poly = 10;
const int gms_limit = 84;
EX ld maxstep_sol = .05; EX ld maxstep_sol = .05;
EX ld maxstep_nil = .1; EX ld maxstep_nil = .1;
EX ld minstep = .001; EX ld minstep = .001;
@ -223,7 +225,7 @@ void enable_raycaster() {
"uniform mediump int uLength;\n" "uniform mediump int uLength;\n"
"uniform mediump float uIPD;\n" "uniform mediump float uIPD;\n"
"uniform mediump mat4 uStart;\n" "uniform mediump mat4 uStart;\n"
"uniform mediump mat4 uM[84];\n" "uniform mediump mat4 uM[" + its(gms_limit) + "];\n"
"uniform mediump vec2 uStartid;\n" "uniform mediump vec2 uStartid;\n"
"uniform mediump sampler2D tConnections;\n" "uniform mediump sampler2D tConnections;\n"
"uniform mediump sampler2D tWallcolor;\n" "uniform mediump sampler2D tWallcolor;\n"
@ -239,7 +241,7 @@ void enable_raycaster() {
fsh += build_getter("mediump vec4", "uWallX", irays); fsh += build_getter("mediump vec4", "uWallX", irays);
fsh += build_getter("mediump vec4", "uWallY", irays); fsh += build_getter("mediump vec4", "uWallY", irays);
fsh += build_getter("mediump int", "uWallstart", deg+1); fsh += build_getter("mediump int", "uWallstart", deg+1);
fsh += build_getter("mediump mat4", "uM", 84); fsh += build_getter("mediump mat4", "uM", gms_limit);
#endif #endif
if(prod) fsh += if(prod) fsh +=
@ -1029,6 +1031,8 @@ array<float, 2> enc(int i, int a) {
color_t color_out_of_range = 0x0F0800FF; color_t color_out_of_range = 0x0F0800FF;
int gms_size;
EX void cast() { EX void cast() {
enable_raycaster(); enable_raycaster();
@ -1249,6 +1253,7 @@ EX void cast() {
vector<glhr::glmatrix> gms; vector<glhr::glmatrix> gms;
for(auto& m: ms) gms.push_back(glhr::tmtogl_transpose3(m)); for(auto& m: ms) gms.push_back(glhr::tmtogl_transpose3(m));
glUniformMatrix4fv(o->uM, isize(gms), 0, gms[0].as_array()); glUniformMatrix4fv(o->uM, isize(gms), 0, gms[0].as_array());
gms_size = isize(gms);
bind_array(wallcolor, o->tWallcolor, txWallcolor, 4); bind_array(wallcolor, o->tWallcolor, txWallcolor, 4);
bind_array(connections, o->tConnections, txConnections, 3); bind_array(connections, o->tConnections, txConnections, 3);
@ -1365,6 +1370,11 @@ EX void configure() {
}; };
}); });
if(gms_size > gms_limit && ray::in_use) {
dialog::addBreak(100);
dialog::addHelp(XLAT("unfortunately this honeycomb is too complex for the current implementation (%1>%2)", its(gms_size), its(gms_limit)));
}
edit_levellines('L'); edit_levellines('L');
dialog::addBack(); dialog::addBack();