mirror of
				https://github.com/zenorogue/hyperrogue.git
				synced 2025-10-31 05:52:59 +00:00 
			
		
		
		
	removed some obsolete debug printfs
This commit is contained in:
		| @@ -332,7 +332,6 @@ void archimedean_tiling::compute_geometry() { | |||||||
|   for(auto& ts: triangles) { |   for(auto& ts: triangles) { | ||||||
|     ld total = 0; |     ld total = 0; | ||||||
|     for(auto& t: ts) tie(t.first, total) = make_pair(total, total + t.first); |     for(auto& t: ts) tie(t.first, total) = make_pair(total, total + t.first); | ||||||
|     // printf("total = %lf\n", double(total)); |  | ||||||
|     } |     } | ||||||
|  |  | ||||||
|   if(debugflags & DF_GEOM) for(auto& ts: triangles) { |   if(debugflags & DF_GEOM) for(auto& ts: triangles) { | ||||||
|   | |||||||
| @@ -130,10 +130,6 @@ void calcMousedest() { | |||||||
|     } |     } | ||||||
|   // confusingGeometry() ? ggmatrix(cwt.at) * calc_relative_matrix(cwt.at->move(i), cwt.at, i) : shmup::ggmatrix(cwt.at->move(i)))); |   // confusingGeometry() ? ggmatrix(cwt.at) * calc_relative_matrix(cwt.at->move(i), cwt.at, i) : shmup::ggmatrix(cwt.at->move(i)))); | ||||||
|    |    | ||||||
|   /* printf("curcell = %Lf\n", mousedist); |  | ||||||
|   for(int i=0; i<cwt.at->type; i++) |  | ||||||
|     printf("d%d = %Lf\n", i, dists[i]); */ |  | ||||||
|  |  | ||||||
|   for(int i=0; i<cwt.at->type; i++) if(dists[i] < mousedist) { |   for(int i=0; i<cwt.at->type; i++) if(dists[i] < mousedist) { | ||||||
|     mousedist = dists[i]; |     mousedist = dists[i]; | ||||||
|     mousedest.d = fixdir(i - cwt.spin, cwt.at); |     mousedest.d = fixdir(i - cwt.spin, cwt.at); | ||||||
|   | |||||||
| @@ -331,7 +331,6 @@ ld expansion_analyzer::get_growth() { | |||||||
|       total += neweigen[i]; |       total += neweigen[i]; | ||||||
|       } |       } | ||||||
|     for(int i=0; i<N; i++) eigen[i] = .1 * eigen[i] + .9 * neweigen[i] / total; |     for(int i=0; i<N; i++) eigen[i] = .1 * eigen[i] + .9 * neweigen[i] / total; | ||||||
|     // for(int i=0; i<N; i++) printf("%lf ", eigen[i]); printf("total = %lf\n", total); |  | ||||||
|     } |     } | ||||||
|   return growth = total; |   return growth = total; | ||||||
|   } |   } | ||||||
|   | |||||||
| @@ -386,8 +386,6 @@ void generate_floorshapes_for(int id, cell *c, int siid, int sidir) { | |||||||
|     for(int i=0; i<=cor; i++) |     for(int i=0; i<=cor; i++) | ||||||
|       hpcpush(mid_at(hpxy(0,0), cornerlist[i%cor], SHADMUL)); |       hpcpush(mid_at(hpxy(0,0), cornerlist[i%cor], SHADMUL)); | ||||||
|      |      | ||||||
|     // printf("at = %d,%d cor = %d sca = %lf\n", li.relative.first, li.relative.second, cor, sca); |  | ||||||
|  |  | ||||||
|     for(int k=0; k<SIDEPARS; k++)  |     for(int k=0; k<SIDEPARS; k++)  | ||||||
|       for(int cid=0; cid<cor; cid++) { |       for(int cid=0; cid<cor; cid++) { | ||||||
|         sizeto(fsh.gpside[k][cid], id); |         sizeto(fsh.gpside[k][cid], id); | ||||||
|   | |||||||
| @@ -1658,7 +1658,6 @@ void fix_the_band(transmatrix& T) { | |||||||
|       else if(H[DIM] < 0 && x <= 0) x = -M_PI - x; |       else if(H[DIM] < 0 && x <= 0) x = -M_PI - x; | ||||||
|       } |       } | ||||||
|     band_shift += x; |     band_shift += x; | ||||||
|     // printf("fixing with shift = %lf\n", x); |  | ||||||
|     T = xpush(-x) * T; |     T = xpush(-x) * T; | ||||||
|     fixmatrix(T); |     fixmatrix(T); | ||||||
|     // todo orientation |     // todo orientation | ||||||
|   | |||||||
| @@ -273,7 +273,6 @@ bool step(int delta) { | |||||||
|             } |             } | ||||||
|           if(mindist > bestval) bestval = mindist, s.owner = c, s.p = h, s.relmatrices = move(relmatrices); |           if(mindist > bestval) bestval = mindist, s.owner = c, s.p = h, s.relmatrices = move(relmatrices); | ||||||
|           } |           } | ||||||
|         // printf("%lf %p %s\n", bestval, s.owner, display(s.p)); |  | ||||||
|         } |         } | ||||||
|       make_cells_of_heptagon(); |       make_cells_of_heptagon(); | ||||||
|       cell_sorting = true; bitruncations_performed = 0; |       cell_sorting = true; bitruncations_performed = 0; | ||||||
|   | |||||||
| @@ -434,7 +434,6 @@ void addpoint(const hyperpoint& H) { | |||||||
| void coords_to_poly() { | void coords_to_poly() { | ||||||
|   polyi = isize(glcoords); |   polyi = isize(glcoords); | ||||||
|   for(int i=0; i<polyi; i++) { |   for(int i=0; i<polyi; i++) { | ||||||
|     // printf("%lf %lf\n", double(glcoords[i][0]), double(glcoords[i][1])); |  | ||||||
|     if(!current_display->stereo_active()) glcoords[i][2] = 0; |     if(!current_display->stereo_active()) glcoords[i][2] = 0; | ||||||
|  |  | ||||||
|     polyx[i]  = current_display->xcenter + glcoords[i][0] - glcoords[i][2];  |     polyx[i]  = current_display->xcenter + glcoords[i][0] - glcoords[i][2];  | ||||||
|   | |||||||
| @@ -692,7 +692,6 @@ bool set_view() { | |||||||
|     ld x = asin_auto(h[0] / cos_auto(y)); |     ld x = asin_auto(h[0] / cos_auto(y)); | ||||||
|     x += race_advance; |     x += race_advance; | ||||||
|     if(GDIM == 3 && race_advance == 0 && pmodel == mdPerspective) race_advance = -1; |     if(GDIM == 3 && race_advance == 0 && pmodel == mdPerspective) race_advance = -1; | ||||||
|     // printf("%d %lf\n", z, x); |  | ||||||
|     transmatrix Z = T1 * inverse(T) * xpush(x); |     transmatrix Z = T1 * inverse(T) * xpush(x); | ||||||
|     View = inverse(Z) * View; |     View = inverse(Z) * View; | ||||||
|     if(GDIM == 3) View = cspin(2, 0, M_PI/2) * View; |     if(GDIM == 3) View = cspin(2, 0, M_PI/2) * View; | ||||||
|   | |||||||
| @@ -241,7 +241,6 @@ void create_model() { | |||||||
|       testplane[1] = tester * tria[i]; |       testplane[1] = tester * tria[i]; | ||||||
|       testplane[2] = tester * tria[(i+1)%5]; |       testplane[2] = tester * tria[(i+1)%5]; | ||||||
|       hyperpoint f = facingdir(testplane); |       hyperpoint f = facingdir(testplane); | ||||||
|       // printf("%lf ", f[0]); |  | ||||||
|       if(f[0] > -1e-6 || std::isnan(f[0])) good1++; |       if(f[0] > -1e-6 || std::isnan(f[0])) good1++; | ||||||
|       if(f[0] < +1e-6 || std::isnan(f[0])) good2++; |       if(f[0] < +1e-6 || std::isnan(f[0])) good2++; | ||||||
|       } |       } | ||||||
|   | |||||||
| @@ -195,7 +195,6 @@ void addedge(int i, int j, edgeinfo *ei) { | |||||||
|   hyperpoint hj = where(j, base); |   hyperpoint hj = where(j, base); | ||||||
|   double d = hdist(hi, hj); |   double d = hdist(hi, hj); | ||||||
|   if(d >= 4) { |   if(d >= 4) { | ||||||
|     // printf("splitting %lf\n", d); |  | ||||||
|     hyperpoint h = mid(hi, hj); |     hyperpoint h = mid(hi, hj); | ||||||
|     int id = isize(vdata); |     int id = isize(vdata); | ||||||
|     vdata.resize(id+1); |     vdata.resize(id+1); | ||||||
|   | |||||||
							
								
								
									
										9
									
								
								rug.cpp
									
									
									
									
									
								
							
							
						
						
									
										9
									
								
								rug.cpp
									
									
									
									
									
								
							| @@ -689,13 +689,9 @@ void enqueue(rugpoint *m) { | |||||||
| bool force_euclidean(rugpoint& m1, rugpoint& m2, double rd, bool is_anticusp = false, double d1=1, double d2=1) { | bool force_euclidean(rugpoint& m1, rugpoint& m2, double rd, bool is_anticusp = false, double d1=1, double d2=1) { | ||||||
|   if(!m1.valid || !m2.valid) return false; |   if(!m1.valid || !m2.valid) return false; | ||||||
|   // double rd = hdist(m1.h, m2.h) * xd; |   // double rd = hdist(m1.h, m2.h) * xd; | ||||||
|   // if(rd > rdz +1e-6 || rd< rdz-1e-6) printf("%lf %lf\n", rd, rdz); |  | ||||||
|   double t = sqdhypot_d(rugdim, m1.flat, m2.flat); |   double t = sqdhypot_d(rugdim, m1.flat, m2.flat); | ||||||
|   if(is_anticusp && t > rd*rd) return false; |   if(is_anticusp && t > rd*rd) return false; | ||||||
|   t = sqrt(t); |   t = sqrt(t); | ||||||
|   /* printf("%s ", display(m1.flat)); |  | ||||||
|   printf("%s ", display(m2.flat)); |  | ||||||
|   printf("%lf/%lf\n", t, rd); */ |  | ||||||
|   current_total_error += (t-rd) * (t-rd); |   current_total_error += (t-rd) * (t-rd); | ||||||
|   bool nonzero = abs(t-rd) > err_zero_current; |   bool nonzero = abs(t-rd) > err_zero_current; | ||||||
|   double force = (t - rd) / t / 2; // 20.0; |   double force = (t - rd) / t / 2; // 20.0; | ||||||
| @@ -713,8 +709,6 @@ bool force(rugpoint& m1, rugpoint& m2, double rd, bool is_anticusp=false, double | |||||||
|   if(gwhere == gEuclid && fast_euclidean) { |   if(gwhere == gEuclid && fast_euclidean) { | ||||||
|     return force_euclidean(m1, m2, rd, is_anticusp, d1, d2); |     return force_euclidean(m1, m2, rd, is_anticusp, d1, d2); | ||||||
|     } |     } | ||||||
|   // double rd = hdist(m1.h, m2.h) * xd; |  | ||||||
|   // if(rd > rdz +1e-6 || rd< rdz-1e-6) printf("%lf %lf\n", rd, rdz); |  | ||||||
|   using namespace hyperpoint_vec; |   using namespace hyperpoint_vec; | ||||||
|   normalizer n(m1.flat, m2.flat); |   normalizer n(m1.flat, m2.flat); | ||||||
|   hyperpoint f1 = n(m1.flat); |   hyperpoint f1 = n(m1.flat); | ||||||
| @@ -794,8 +788,6 @@ void preset(rugpoint *m) { | |||||||
|        |        | ||||||
|       preset_points.emplace_back(hypot(blen * (ah+ch), blen * (az-cz)), c); |       preset_points.emplace_back(hypot(blen * (ah+ch), blen * (az-cz)), c); | ||||||
|       q++; |       q++; | ||||||
|        |  | ||||||
|       // printf("A %lf %lf %lf %lf C %lf %lf %lf %lf\n", a1, a2, az, ah, c1, c2, cz, ch); |  | ||||||
|       } |       } | ||||||
|     } |     } | ||||||
|      |      | ||||||
| @@ -842,7 +834,6 @@ void optimize(rugpoint *m, bool do_preset) { | |||||||
|         if(now < cur) { cur = now; ex *= 1.2; goto again; } |         if(now < cur) { cur = now; ex *= 1.2; goto again; } | ||||||
|         else m->flat = last; |         else m->flat = last; | ||||||
|         } |         } | ||||||
|       // printf("edges = [%d] %d sse = %lf\n",ed0, isize(preset_points), cur); |  | ||||||
|       } |       } | ||||||
|     } |     } | ||||||
|   for(int it=0; it<50; it++)  |   for(int it=0; it<50; it++)  | ||||||
|   | |||||||
| @@ -1918,7 +1918,6 @@ void movePlayer(monster *m, int delta) { | |||||||
|           if(!c) continue; |           if(!c) continue; | ||||||
|           if(m->isVirtual || !gmatrix.count(c)) continue; |           if(m->isVirtual || !gmatrix.count(c)) continue; | ||||||
|           double d = intval(gmatrix[c] * C0, m->pat * C0); |           double d = intval(gmatrix[c] * C0, m->pat * C0); | ||||||
|           // printf("di=%d d=%lf\n", di, d); |  | ||||||
|           if(d<bestd) bestd=d, subdir = di; |           if(d<bestd) bestd=d, subdir = di; | ||||||
|           } |           } | ||||||
|         visibleFor(300); |         visibleFor(300); | ||||||
|   | |||||||
| @@ -235,8 +235,6 @@ dexp_data dexp(hyperpoint p, hyperpoint t) { | |||||||
|      |      | ||||||
|     transmatrix T = build_matrix(coord_derivative(p, 0), coord_derivative(p, 1), Hypc, C03); |     transmatrix T = build_matrix(coord_derivative(p, 0), coord_derivative(p, 1), Hypc, C03); | ||||||
|      |      | ||||||
|     // printf("Tt = %lf\n", hypot_d(3, T * t)); |  | ||||||
|  |  | ||||||
|     p += t * eps; |     p += t * eps; | ||||||
|  |  | ||||||
|     if(!is_inbound(p) || surface_branch(p) != b) |     if(!is_inbound(p) || surface_branch(p) != b) | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user
	 Zeno Rogue
					Zeno Rogue