Commit 4191c034e3189120f9e941616d315be4cb46d9cd

Authored by Pavel Govyadinov
1 parent 4b594a40

minor:bug fixes. Stable version

Showing 2 changed files with 7 additions and 7 deletions   Show diff stats
stim/gl/gl_spider.h
@@ -144,7 +144,7 @@ class gl_spider @@ -144,7 +144,7 @@ class gl_spider
144 ///Method for populating the vector arrays with sampled vectors. 144 ///Method for populating the vector arrays with sampled vectors.
145 ///uses the default d vector <0,0,1> 145 ///uses the default d vector <0,0,1>
146 void 146 void
147 - genDirectionVectors(float solidAngle = 5*M_PI/4) 147 + genDirectionVectors(float solidAngle = 3*M_PI/2)
148 { 148 {
149 //ofstream file; 149 //ofstream file;
150 //file.open("dvectors.txt"); 150 //file.open("dvectors.txt");
@@ -196,7 +196,7 @@ class gl_spider @@ -196,7 +196,7 @@ class gl_spider
196 ///Method for populating the buffer with the sampled texture. 196 ///Method for populating the buffer with the sampled texture.
197 ///uses the default vector <0,0,0> 197 ///uses the default vector <0,0,0>
198 void 198 void
199 - genPositionVectors(float delta = 0.2) 199 + genPositionVectors(float delta = 0.4)
200 { 200 {
201 //Set up the vectors necessary for Rectangle creation. 201 //Set up the vectors necessary for Rectangle creation.
202 vec<float> Y(1.0,0.0,0.0); 202 vec<float> Y(1.0,0.0,0.0);
@@ -726,12 +726,12 @@ class gl_spider @@ -726,12 +726,12 @@ class gl_spider
726 int 726 int
727 Step() 727 Step()
728 { 728 {
729 - Bind(); 729 + // Bind();
730 findOptimalDirection(); 730 findOptimalDirection();
731 findOptimalPosition(); 731 findOptimalPosition();
732 findOptimalScale(); 732 findOptimalScale();
733 branchDetection(); 733 branchDetection();
734 - Unbind(); 734 + // Unbind();
735 return current_cost; 735 return current_cost;
736 } 736 }
737 737
stim/parser/filename.h
@@ -20,7 +20,7 @@ @@ -20,7 +20,7 @@
20 20
21 #include "../parser/parser.h" 21 #include "../parser/parser.h"
22 22
23 -//#include <boost/filesystem.hpp> 23 +#include <boost/filesystem.hpp>
24 24
25 namespace stim{ 25 namespace stim{
26 26
@@ -154,7 +154,7 @@ public: @@ -154,7 +154,7 @@ public:
154 154
155 return ss.str(); 155 return ss.str();
156 } 156 }
157 -/* 157 +
158 //get a list of files matching the current template 158 //get a list of files matching the current template
159 std::vector<stim::filename> get_list(){ 159 std::vector<stim::filename> get_list(){
160 160
@@ -193,7 +193,7 @@ public: @@ -193,7 +193,7 @@ public:
193 193
194 return file_list; 194 return file_list;
195 } 195 }
196 -*/ 196 +
197 //gets the current working directory 197 //gets the current working directory
198 static stim::filename cwd(){ 198 static stim::filename cwd(){
199 199