Commit 5193efea485abe6645f91aad57717ffca5966f89
1 parent
42145f38
minor debugging and most stable version prior to clean-up and extension
Showing
1 changed file
with
10 additions
and
9 deletions
Show diff stats
stim/gl/gl_spider.h
... | ... | @@ -281,6 +281,7 @@ class gl_spider : public virtual gl_texture<T> |
281 | 281 | position[2]+next[2]/500); |
282 | 282 | setDirection(next[0], next[1], next[2]); |
283 | 283 | //file.close(); |
284 | + setDirection(next); | |
284 | 285 | } |
285 | 286 | |
286 | 287 | //--------------------------------------------------------------------------// |
... | ... | @@ -381,7 +382,7 @@ class gl_spider : public virtual gl_texture<T> |
381 | 382 | ver = stim::rect<float>(magnitude, position, direction.norm(), |
382 | 383 | hor.n()); |
383 | 384 | //UpdateBuffer(); |
384 | - generateVectorField(direction, 4.0); | |
385 | + //generateVectorField(direction, 4.0); | |
385 | 386 | } |
386 | 387 | |
387 | 388 | |
... | ... | @@ -453,17 +454,17 @@ class gl_spider : public virtual gl_texture<T> |
453 | 454 | void |
454 | 455 | Step() |
455 | 456 | { |
456 | - std::cout << position[0] << "," << position[1] << "," << position[1] | |
457 | - << std::endl; | |
457 | + //std::cout << position[0] << "," << position[1] << "," << position[1] | |
458 | + // << std::endl; | |
458 | 459 | //setPosition(direction*magnitude[1]/2+position); |
459 | 460 | findOptimalDirection(); |
460 | 461 | //Update(); |
461 | - std::cout << position[0] << "," << position[1] << "," << position[1] | |
462 | - << std::endl; | |
462 | + //std::cout << position[0] << "," << position[1] << "," << position[1] | |
463 | + // << std::endl; | |
463 | 464 | |
464 | 465 | } |
465 | 466 | |
466 | - void | |
467 | +/* void | |
467 | 468 | UpdateBuffer() |
468 | 469 | { |
469 | 470 | stim::vec<float>p1; |
... | ... | @@ -555,10 +556,10 @@ class gl_spider : public virtual gl_texture<T> |
555 | 556 | glDisable(GL_TEXTURE_3D); |
556 | 557 | glBindFramebuffer(GL_FRAMEBUFFER,0); |
557 | 558 | glBindTexture(GL_TEXTURE_2D, 0); |
558 | - } | |
559 | + } */ | |
559 | 560 | |
560 | 561 | |
561 | - void | |
562 | + /*void | |
562 | 563 | generateVectorField(stim::vec<float> d, float dim) |
563 | 564 | { |
564 | 565 | vec<float> d_s = d.cart2sph(); |
... | ... | @@ -584,7 +585,7 @@ class gl_spider : public virtual gl_texture<T> |
584 | 585 | } |
585 | 586 | } |
586 | 587 | |
587 | - } | |
588 | + }*/ | |
588 | 589 | |
589 | 590 | |
590 | 591 | ... | ... |