diff --git a/stim/gl/gl_spider.h b/stim/gl/gl_spider.h index cbe379e..4efe020 100644 --- a/stim/gl/gl_spider.h +++ b/stim/gl/gl_spider.h @@ -870,7 +870,7 @@ class gl_spider : public virtual gl_texture GenerateFBO(16, numSamplesMag*8, mtexbufferID, mfboID); GenerateFBO(16, 216, btexbufferID, bfboID); setDims(0.6, 0.6, 1.0); - setSize(512.0, 512.0, 426.0); + setSize(1024.0, 1024.0, 1024.0); setMatrix(); dList = glGenLists(3); glListBase(dList); @@ -1058,6 +1058,7 @@ class gl_spider : public virtual gl_texture void setSeedMag(float mag) { + std::cout << "sMag: " << mag << std::endl; seedsmags.push(mag); } @@ -1070,6 +1071,7 @@ class gl_spider : public virtual gl_texture void setSeed(float x, float y, float z) { + std::cout << "sPos: " << x << " " << y << " " << z << std::endl; seeds.push(stim::vec(x, y, z)); } @@ -1080,6 +1082,7 @@ class gl_spider : public virtual gl_texture void setSeedVec(float x, float y, float z) { + std::cout << "sDir: " << x << " " << y << " " << z << std::endl; seedsvecs.push(stim::vec(x, y, z)); } @@ -1239,6 +1242,7 @@ class gl_spider : public virtual gl_texture (std::clock() - start) / (double) CLOCKS_PER_SEC; num_sampling = num_sampling + 1.0; #endif + std::cout << current_cost << std::endl; return current_cost; } @@ -1480,7 +1484,7 @@ class gl_spider : public virtual gl_texture spos[2] = spos[2]-sdir[2]*smag[0]/2.; int h = selectObject(spos, -sdir, smag[0]); //did we start with a fiber? - if(h != -1) + if(h != -1 && h < nt.sizeE()) nt.addEdge(ce, cm, h, -1); else nt.addEdge(ce, cm, -1, -1); @@ -1494,7 +1498,7 @@ class gl_spider : public virtual gl_texture spos[2] = spos[2]-sdir[2]*smag[0]/2.; int h = selectObject(spos, -sdir, smag[0]); //did start with a fiber? - if(h != -1 && h != nt.sizeE()){ + if(h != -1 && h < nt.sizeE()){ // std::cout << "got here double" << smag.str() << std::endl; nt.addEdge(ce,cm, h, in.second); } else { nt.addEdge(ce,cm, -1, -1);} -- libgit2 0.21.4