mirror of
				https://github.com/zenorogue/hyperrogue.git
				synced 2025-11-04 07:43:02 +00:00 
			
		
		
		
	rogueviz:: label placement now takes scalefactor into account correctly
This commit is contained in:
		@@ -578,6 +578,8 @@ void queue_prec(const shiftmatrix& V, edgeinfo*& ei, color_t col) {
 | 
			
		||||
 | 
			
		||||
int brm_limit = 1000;
 | 
			
		||||
 | 
			
		||||
ld labelshift = .2;
 | 
			
		||||
 | 
			
		||||
bool drawVertex(const shiftmatrix &V, cell *c, shmup::monster *m) {
 | 
			
		||||
  if(m->dead) return true;
 | 
			
		||||
  if(m->type != moRogueviz) return false;
 | 
			
		||||
@@ -745,7 +747,7 @@ bool drawVertex(const shiftmatrix &V, cell *c, shmup::monster *m) {
 | 
			
		||||
      }
 | 
			
		||||
    
 | 
			
		||||
    shiftpoint h = tC0(V * m->at);
 | 
			
		||||
    shiftmatrix V2 = GDIM == 3 ? V * m->at : rgpushxto0(h) * ypush(PURE ? .3 : .2); // todo-variation
 | 
			
		||||
    shiftmatrix V2 = GDIM == 3 ? V * m->at : rgpushxto0(h) * ypush(cgi.scalefactor * labelshift); // todo-variation
 | 
			
		||||
    if(doshow && !behindsphere(V2)) {
 | 
			
		||||
      auto info = vd.info;
 | 
			
		||||
      if(info) queueaction(PPR::MONSTER_HEAD, [info] () { SVG_LINK(*info); });
 | 
			
		||||
@@ -994,6 +996,9 @@ int readArgs() {
 | 
			
		||||
  else if(argis("-rvspaces")) {
 | 
			
		||||
    rv_ignore_spaces = false;
 | 
			
		||||
    }
 | 
			
		||||
  else if(argis("-rvlabelshift")) {
 | 
			
		||||
    shift_arg_formula(labelshift);
 | 
			
		||||
    }
 | 
			
		||||
  else if(argis("-rog3")) {
 | 
			
		||||
    rog3 = true;
 | 
			
		||||
    }
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user