mirror of
https://github.com/zenorogue/hyperrogue.git
synced 2025-06-28 16:02:53 +00:00
gp:: removed the unused version of be_in_triangle
This commit is contained in:
parent
7dd006bb05
commit
fa86a88ea3
14
goldberg.cpp
14
goldberg.cpp
@ -511,7 +511,7 @@ namespace gp {
|
|||||||
pushScreen([texture_remap] () { gp::show(texture_remap); });
|
pushScreen([texture_remap] () { gp::show(texture_remap); });
|
||||||
}
|
}
|
||||||
|
|
||||||
void be_in_triangle2(local_info& li) { // hyperpoint atz(const transmatrix& T, const transmatrix& corners, loc at, int cornerid = 6, ld cf = 3) {
|
void be_in_triangle(local_info& li) {
|
||||||
int sp = 0;
|
int sp = 0;
|
||||||
auto& at = li.relative;
|
auto& at = li.relative;
|
||||||
again:
|
again:
|
||||||
@ -525,16 +525,6 @@ namespace gp {
|
|||||||
li.last_dir = fix7(li.last_dir - sp);
|
li.last_dir = fix7(li.last_dir - sp);
|
||||||
}
|
}
|
||||||
|
|
||||||
void be_in_triangle(local_info& li) {
|
|
||||||
int& i = li.last_dir;
|
|
||||||
auto& at = li.relative;
|
|
||||||
|
|
||||||
while(at.first < 0 || at.second < 0) {
|
|
||||||
at = at * eudir(1);
|
|
||||||
i = fix7(i-1);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
int length(loc p) {
|
int length(loc p) {
|
||||||
return eudist(p.first, p.second);
|
return eudist(p.first, p.second);
|
||||||
}
|
}
|
||||||
@ -568,7 +558,7 @@ namespace gp {
|
|||||||
|
|
||||||
int compute_dist(cell *c, int master_function(cell*)) {
|
int compute_dist(cell *c, int master_function(cell*)) {
|
||||||
auto li = get_local_info(c);
|
auto li = get_local_info(c);
|
||||||
be_in_triangle2(li);
|
be_in_triangle(li);
|
||||||
|
|
||||||
cell *cm = c->master->c7;
|
cell *cm = c->master->c7;
|
||||||
|
|
||||||
|
2
hyper.h
2
hyper.h
@ -3006,7 +3006,7 @@ namespace gp {
|
|||||||
local_info get_local_info(cell *c);
|
local_info get_local_info(cell *c);
|
||||||
const char *disp(loc at);
|
const char *disp(loc at);
|
||||||
|
|
||||||
void be_in_triangle2(local_info& li);
|
void be_in_triangle(local_info& li);
|
||||||
|
|
||||||
int compute_dist(cell *c, int master_function(cell*));
|
int compute_dist(cell *c, int master_function(cell*));
|
||||||
|
|
||||||
|
@ -439,7 +439,7 @@ int getHemisphere(cell *c, int which) {
|
|||||||
int score = 0;
|
int score = 0;
|
||||||
if(gp::on) {
|
if(gp::on) {
|
||||||
auto li = gp::get_local_info(c);
|
auto li = gp::get_local_info(c);
|
||||||
gp::be_in_triangle2(li);
|
gp::be_in_triangle(li);
|
||||||
auto corner = gp::corners * gp::loctoh_ort(li.relative);
|
auto corner = gp::corners * gp::loctoh_ort(li.relative);
|
||||||
ld scored =
|
ld scored =
|
||||||
corner[0] * getHemisphere(c->master->c7, which)
|
corner[0] * getHemisphere(c->master->c7, which)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user