codebase / stimlib

Commit 0df6a853c52d7fe45fed1ccda7ea1c38c7ff6beb

Authored by Pavel Govyadinov
1 parent 91e2e1ec

still need to fix backwards collision detection with propper radius

Showing 1 changed file with 4 additions and 4 deletions   Show diff stats
Inline Side-by-side
stim/gl/gl_spider.h
  Show/Hide comments   View file @0df6a85
@@ -1323,7 +1323,7 @@ class gl_spider // : public virtual gl_texture<T> @@ -1323,7 +1323,7 @@ class gl_spider // : public virtual gl_texture<T>
1323 { 1323 {
1324 std::vector<float> cm = nt.getEdgeCenterLineMag(i); 1324 std::vector<float> cm = nt.getEdgeCenterLineMag(i);
1325 std::vector<stim::vec3< float > > ce = nt.getEdgeCenterLine(i); 1325 std::vector<stim::vec3< float > > ce = nt.getEdgeCenterLine(i);
1326 - sk.Begin(stim::OBJ_LINE); 1326 + sk1.Begin(stim::OBJ_LINE);
1327 for(int j = 0; j < ce.size(); j++) 1327 for(int j = 0; j < ce.size(); j++)
1328 { 1328 {
1329 sk1.TexCoord(cm[j]); 1329 sk1.TexCoord(cm[j]);
@@ -1538,9 +1538,9 @@ class gl_spider // : public virtual gl_texture&lt;T&gt; @@ -1538,9 +1538,9 @@ class gl_spider // : public virtual gl_texture&lt;T&gt;
1538 // findOptimalDirection(); 1538 // findOptimalDirection();
1539 // Unbind(); 1539 // Unbind();
1540 //THIS IS EXPERIMENTAL 1540 //THIS IS EXPERIMENTAL
1541 -// Bind(radius_texID, radius_buffID, numSamplesMag, n_pixels);  
1542 -// findOptimalRadius();  
1543 -// Unbind(); 1541 + Bind(radius_texID, radius_buffID, numSamplesMag, n_pixels);
  1542 + findOptimalRadius();
  1543 + Unbind();
1544 //THIS IS EXPERIMENTAL 1544 //THIS IS EXPERIMENTAL
1545 1545
1546 // cL.push_back(curSeed); 1546 // cL.push_back(curSeed);