fb0bc2f1
Pavel Govyadinov
added the gl_spid...
|
1
2
3
|
#ifndef STIM_GL_SPIDER_H
#define STIM_GL_SPIDER_H
|
98eecaa9
David Mayerich
VS and win32 updates
|
4
|
//#include <GL/glew.h>
|
fb0bc2f1
Pavel Govyadinov
added the gl_spid...
|
5
|
#include <GL/glut.h>
|
a9b45efe
Pavel Govyadinov
changes to spider
|
6
7
8
|
#include <cuda.h>
#include <cuda_gl_interop.h>
#include <cudaGL.h>
|
1a456186
Pavel Govyadinov
Added directional...
|
9
|
#include <math.h>
|
7d3162a2
Pavel Govyadinov
fixed majority of...
|
10
11
12
13
14
15
16
|
#include <stim/gl/gl_texture.h>
#include <stim/visualization/camera.h>
#include <stim/gl/error.h>
#include <stim/math/vector.h>
#include <stim/math/vec3.h>
#include <stim/math/rect.h>
#include <stim/math/matrix.h>
|
6ada8448
Pavel Govyadinov
Reverted to 40db1...
|
17
|
#include <stim/math/constants.h>
|
7d3162a2
Pavel Govyadinov
fixed majority of...
|
18
|
#include <stim/cuda/spider_cost.cuh>
|
7d1d153a
Pavel Govyadinov
fixed the include...
|
19
|
#include <stim/cuda/cudatools/glbind.h>
|
84eff8b1
Pavel Govyadinov
Merged only the n...
|
20
|
#include <stim/cuda/arraymath.cuh>
|
c37611a6
Pavel Govyadinov
removed the time ...
|
21
|
#include <stim/cuda/cuda_texture.cuh>
|
84eff8b1
Pavel Govyadinov
Merged only the n...
|
22
23
24
|
#include <stim/cuda/cudatools.h>
#include <stim/cuda/ivote.cuh>
#include <stim/visualization/glObj.h>
|
385d2447
Pavel Govyadinov
Checkpoint: Conve...
|
25
|
#include <vector>
|
b50c840e
David Mayerich
eliminated ANN fr...
|
26
|
#include <stack>
|
84eff8b1
Pavel Govyadinov
Merged only the n...
|
27
|
#include <stim/cuda/branch_detection.cuh>
|
23af8e36
Pavel Govyadinov
modified spider t...
|
28
|
#include "../../../volume-spider/glnetwork.h"
|
e45b97ce
Pavel Govyadinov
safety commit, I ...
|
29
|
#include <stim/visualization/cylinder.h>
|
c0e09133
Pavel Govyadinov
STABLE: made temp...
|
30
|
#include <stim/cuda/testKernel.cuh>
|
42145f38
Pavel Govyadinov
Fixed the issues ...
|
31
32
|
#include <iostream>
#include <fstream>
|
efe7b7cc
Pavel Govyadinov
Added a detailed ...
|
33
34
35
36
37
|
#ifdef TIMING
#include <ctime>
#include <cstdio>
#endif
|
84eff8b1
Pavel Govyadinov
Merged only the n...
|
38
|
#ifdef TESTING
|
84eff8b1
Pavel Govyadinov
Merged only the n...
|
39
40
41
|
#include <cstdio>
#include <ctime>
#endif
|
42145f38
Pavel Govyadinov
Fixed the issues ...
|
42
|
|
266aa74a
Pavel Govyadinov
CHECKPOINT: Minor...
|
43
|
|
fb0bc2f1
Pavel Govyadinov
added the gl_spid...
|
44
45
46
47
|
namespace stim
{
template<typename T>
|
34ec8a82
David Mayerich
added comments
|
48
|
class gl_spider // : public virtual gl_texture<T>
|
fb0bc2f1
Pavel Govyadinov
added the gl_spid...
|
49
50
|
{
//doen't use gl_texture really, just needs the GLuint id.
|
4cefeb6d
Pavel Govyadinov
Changes to the re...
|
51
|
//doesn't even need the texture iD really.
|
fb0bc2f1
Pavel Govyadinov
added the gl_spid...
|
52
|
private:
|
84eff8b1
Pavel Govyadinov
Merged only the n...
|
53
|
|
efe7b7cc
Pavel Govyadinov
Added a detailed ...
|
54
|
#ifdef TIMING
|
98eecaa9
David Mayerich
VS and win32 updates
|
55
56
57
58
59
60
61
|
double branch_time;// = 0;
double direction_time;// = 0;
double position_time;// = 0;
double size_time;// = 0;
double cost_time;// = 0;
double network_time;// = 0;
double hit_time;// = 0;
|
efe7b7cc
Pavel Govyadinov
Added a detailed ...
|
62
63
|
#endif
|
7d3162a2
Pavel Govyadinov
fixed majority of...
|
64
|
stim::vec3<float> p; //vector designating the position of the spider.
|
34ec8a82
David Mayerich
added comments
|
65
|
stim::vec3<float> d; //normalized direction of travel
|
7f297fc6
Pavel Govyadinov
added more detail...
|
66
|
float m; //size of the spider in tissue space.
|
34ec8a82
David Mayerich
added comments
|
67
|
|
7d3162a2
Pavel Govyadinov
fixed majority of...
|
68
|
std::vector<stim::vec3<float> > dV; //A list of all the direction vectors.
|
34ec8a82
David Mayerich
added comments
|
69
|
std::vector<stim::vec3<float> > pV; //A list of all test positions (relative to p)
|
7f297fc6
Pavel Govyadinov
added more detail...
|
70
|
std::vector<float> mV; //A list of all the size vectors.
|
97508a2e
Pavel Govyadinov
Added mehtods for...
|
71
|
std::vector<float> lV; //A list of all the size vectors.
|
84eff8b1
Pavel Govyadinov
Merged only the n...
|
72
|
|
34ec8a82
David Mayerich
added comments
|
73
74
|
stim::matrix<float, 4> cT; //current Transformation matrix (tissue)->(texture)
GLuint texID; //OpenGL ID for the texture to be traced
|
7f297fc6
Pavel Govyadinov
added more detail...
|
75
76
|
stim::vec3<float> S; //Size of a voxel in the volume.
stim::vec3<float> R; //Dimensions of the volume.
|
84eff8b1
Pavel Govyadinov
Merged only the n...
|
77
78
79
|
//GL and Cuda variables
|
34ec8a82
David Mayerich
added comments
|
80
81
82
83
84
85
86
87
|
GLuint dList; //ID of the starting display lists (series of 4)
//dList + 0 = direction template rectangles
//dList + 1 = position template rectangles
//dList + 2 = size template rectangles
//dList + 3 = branch detection cylinder around the fiber
GLuint fboID; //framebuffer ID for direction templates
GLuint texbufferID; //texture ID for direction templates
|
7f297fc6
Pavel Govyadinov
added more detail...
|
88
89
|
GLuint direction_buffID; //framebuffer ID, position templates
GLuint direction_texID; //texture ID, position templates
|
34ec8a82
David Mayerich
added comments
|
90
|
|
7f297fc6
Pavel Govyadinov
added more detail...
|
91
92
|
GLuint position_buffID; //framebuffer ID, position templates
GLuint position_texID; //texture ID, position templates
|
34ec8a82
David Mayerich
added comments
|
93
|
|
7f297fc6
Pavel Govyadinov
added more detail...
|
94
95
|
GLuint radius_buffID; //framebuffer ID, radius templates
GLuint radius_texID; //texture ID, radius templates
|
34ec8a82
David Mayerich
added comments
|
96
|
|
97508a2e
Pavel Govyadinov
Added mehtods for...
|
97
98
99
|
GLuint length_buffID; //framebuffer ID, radius templates
GLuint length_texID; //texture ID, radius templates
|
7f297fc6
Pavel Govyadinov
added more detail...
|
100
101
|
GLuint cylinder_buffID; //framebuffer ID, cylinder (surrounding fiber)
GLuint cylinder_texID; //texture ID, cylinder
|
1306fd96
Pavel Govyadinov
minor bug fixes i...
|
102
|
|
84eff8b1
Pavel Govyadinov
Merged only the n...
|
103
|
int numSamples; //The number of templates in the buffer.
|
035d798f
Pavel Govyadinov
modified the spid...
|
104
105
106
|
int numSamplesPos;
int numSamplesMag;
|
34ec8a82
David Mayerich
added comments
|
107
108
109
110
|
float length; //this will be a function of the radius
float stepsize; //this will be a function of the length
int current_cost; //variable to store the cost of the current step
|
84eff8b1
Pavel Govyadinov
Merged only the n...
|
111
112
|
//Tracing variables.
|
34ec8a82
David Mayerich
added comments
|
113
114
115
|
std::stack< stim::vec3<float> > seeds; //seed positions
std::stack< stim::vec3<float> > seedsvecs; //seed directions
std::stack< float > seedsmags; //seed magnitudes
|
6b8621f8
Pavel Govyadinov
stable version
|
116
|
|
34ec8a82
David Mayerich
added comments
|
117
118
|
std::vector< stim::vec3<float> > cL; //centerline up to the current point
std::vector< stim::vec3<float> > cD; //directions up to the current point (debugging)
|
7f297fc6
Pavel Govyadinov
added more detail...
|
119
|
std::vector< float > cM; //radius up to the current point
|
8303b04d
Pavel Govyadinov
fixed the bug and...
|
120
|
std::vector< float > cLen; //radius up to the current point
|
23af8e36
Pavel Govyadinov
modified spider t...
|
121
|
|
34ec8a82
David Mayerich
added comments
|
122
123
|
stim::glnetwork<float> nt; //network object holding the currently traced centerlines
stim::glObj<float> sk; //OBJ file storing the network (identical to above)
|
23af8e36
Pavel Govyadinov
modified spider t...
|
124
|
|
34ec8a82
David Mayerich
added comments
|
125
126
|
//consider replacing with two seed points facing opposite directions
stim::vec<float> rev; //reverse vector
|
c0e09133
Pavel Govyadinov
STABLE: made temp...
|
127
|
|
34ec8a82
David Mayerich
added comments
|
128
129
130
131
132
133
|
//selection mode - detecting fiber intersections
stim::camera camSel; //camera for selection mode (detecting collisions)
stim::vec3<float> ps; //position for the selection camera
stim::vec3<float> ups; //up direction for the selection camera
stim::vec3<float> ds; //direction for the selection camera
|
7f297fc6
Pavel Govyadinov
added more detail...
|
134
|
float n_pixels; //length of the template (in pixels)
|
c37611a6
Pavel Govyadinov
removed the time ...
|
135
136
|
//cuda texture variables that keep track of the binding.
|
7f297fc6
Pavel Govyadinov
added more detail...
|
137
138
139
|
stim::cuda::cuda_texture t_dir; //cuda_texture object used as an interface between OpenGL and cuda for direction vectors.
stim::cuda::cuda_texture t_pos; //cuda_texture object used as an interface between OpenGL and cuda for position vectors.
stim::cuda::cuda_texture t_mag; //cuda_texture object used as an interface between OpenGL and cuda for size vectors.
|
97508a2e
Pavel Govyadinov
Added mehtods for...
|
140
|
stim::cuda::cuda_texture t_len; //cuda_texture object used as an interface between OpenGL and cuda for size vectors.
|
84eff8b1
Pavel Govyadinov
Merged only the n...
|
141
142
|
|
4166e973
Pavel Govyadinov
Added debug tags ...
|
143
144
145
146
147
148
149
|
#ifdef DEBUG
stringstream name;
int iter;
int iter_pos;
int iter_dir;
int iter_siz;
#endif
|
47fe6300
Pavel Govyadinov
fixed an accident...
|
150
|
|
6b8621f8
Pavel Govyadinov
stable version
|
151
152
153
154
|
//--------------------------------------------------------------------------//
//-------------------------------PRIVATE METHODS----------------------------//
//--------------------------------------------------------------------------//
|
266aa74a
Pavel Govyadinov
CHECKPOINT: Minor...
|
155
156
157
158
159
160
|
/// Method for finding the best scale for the spider.
/// changes the x, y, z size of the spider to minimize the cost
/// function.
void
findOptimalDirection()
{
|
efe7b7cc
Pavel Govyadinov
Added a detailed ...
|
161
|
#ifdef TIMING
|
7f297fc6
Pavel Govyadinov
added more detail...
|
162
|
gpuStartTimer(); //Timer for profiling
|
efe7b7cc
Pavel Govyadinov
Added a detailed ...
|
163
|
#endif
|
ac430567
Pavel Govyadinov
comments comments...
|
164
165
|
setMatrix(); //create the transformation matrix.
glCallList(dList); //move the templates to p, d, m.
|
7f297fc6
Pavel Govyadinov
added more detail...
|
166
|
glFinish(); //flush the pipeline
|
efe7b7cc
Pavel Govyadinov
Added a detailed ...
|
167
|
#ifdef TIMING
|
7f297fc6
Pavel Govyadinov
added more detail...
|
168
|
direction_time += gpuStopTimer(); //profiling
|
efe7b7cc
Pavel Govyadinov
Added a detailed ...
|
169
|
#endif
|
efe7b7cc
Pavel Govyadinov
Added a detailed ...
|
170
|
|
c37611a6
Pavel Govyadinov
removed the time ...
|
171
|
int best = getCost(t_dir.getTexture(), t_dir.getAuxArray() ,numSamples); //find min cost.
|
4166e973
Pavel Govyadinov
Added debug tags ...
|
172
173
174
175
176
177
|
#ifdef DEBUG
name.str("");
name << "Final_Cost_Direction_fiber_"<< iter << "_" << iter_dir << ".bmp";
test(t_dir.getTexture(), n_pixels*2.0, numSamples*n_pixels, name.str());
iter_dir++;
#endif
|
7f297fc6
Pavel Govyadinov
added more detail...
|
178
|
stim::vec<float> next( ///calculate the next vector.
|
c0e09133
Pavel Govyadinov
STABLE: made temp...
|
179
|
dV[best][0]*S[0]*R[0],
|
5eeaf941
Pavel Govyadinov
changer to the ba...
|
180
181
|
dV[best][1]*S[1]*R[1],
dV[best][2]*S[2]*R[2],
|
d4721000
Pavel Govyadinov
changes with debu...
|
182
|
0);
|
7f297fc6
Pavel Govyadinov
added more detail...
|
183
184
185
186
187
|
next = (cT*next).norm(); ///transform the next vector into Tissue space.
setPosition( p[0]+next[0]*m/stepsize,
p[1]+next[1]*m/stepsize,
p[2]+next[2]*m/stepsize);
setDirection(next[0], next[1], next[2]); //move forward and change direction.
|
266aa74a
Pavel Govyadinov
CHECKPOINT: Minor...
|
188
189
|
}
|
6b8621f8
Pavel Govyadinov
stable version
|
190
191
|
/// Method for finding the best d (direction) for the spider.
/// Not sure if necessary since the next p (position) for the spider
|
8e56a0a7
Pavel Govyadinov
Added the propose...
|
192
|
/// will be at d * m.
|
fb0bc2f1
Pavel Govyadinov
added the gl_spid...
|
193
194
195
|
void
findOptimalPosition()
{
|
efe7b7cc
Pavel Govyadinov
Added a detailed ...
|
196
|
#ifdef TIMING
|
7f297fc6
Pavel Govyadinov
added more detail...
|
197
|
gpuStartTimer(); //timer for profiling
|
efe7b7cc
Pavel Govyadinov
Added a detailed ...
|
198
|
#endif
|
ac430567
Pavel Govyadinov
comments comments...
|
199
200
|
setMatrix(); //create the transformation matrix.
glCallList(dList+1); //move the templates to p, d, m.
|
7f297fc6
Pavel Govyadinov
added more detail...
|
201
|
glFinish(); //flush the pipeline
|
c37611a6
Pavel Govyadinov
removed the time ...
|
202
|
// glFlush();
|
efe7b7cc
Pavel Govyadinov
Added a detailed ...
|
203
|
#ifdef TIMING
|
7f297fc6
Pavel Govyadinov
added more detail...
|
204
|
position_time += gpuStopTimer(); ///timer for profiling
|
efe7b7cc
Pavel Govyadinov
Added a detailed ...
|
205
206
|
#endif
|
c37611a6
Pavel Govyadinov
removed the time ...
|
207
|
int best = getCost(t_pos.getTexture(), t_pos.getAuxArray(), numSamplesPos); //find min cost.
|
4166e973
Pavel Govyadinov
Added debug tags ...
|
208
209
210
211
212
213
|
#ifdef DEBUG
name.str("");
name << "Final_Cost_Position_" << iter << "_" << iter_pos << ".bmp";
test(t_pos.getTexture(), n_pixels*2.0, numSamplesPos*n_pixels, name.str());
iter_pos++;
#endif
|
ac430567
Pavel Govyadinov
comments comments...
|
214
|
stim::vec<float> next( //find next position.
|
3f15dade
Pavel Govyadinov
changed the plane...
|
215
216
217
218
|
pV[best][0],
pV[best][1],
pV[best][2],
1);
|
7f297fc6
Pavel Govyadinov
added more detail...
|
219
|
next = cT*next; //transform the next position vector into tissue space.
|
d4721000
Pavel Govyadinov
changes with debu...
|
220
221
|
setPosition(
next[0]*S[0]*R[0],
|
8e56a0a7
Pavel Govyadinov
Added the propose...
|
222
|
next[1]*S[1]*R[1],
|
d4721000
Pavel Govyadinov
changes with debu...
|
223
|
next[2]*S[2]*R[2]
|
ac430567
Pavel Govyadinov
comments comments...
|
224
|
); //adjust position.
|
fb0bc2f1
Pavel Govyadinov
added the gl_spid...
|
225
226
|
}
|
266aa74a
Pavel Govyadinov
CHECKPOINT: Minor...
|
227
228
|
/// Method for finding the best scale for the spider.
/// changes the x, y, z size of the spider to minimize the cost
|
b50c840e
David Mayerich
eliminated ANN fr...
|
229
|
/// function.
|
fb0bc2f1
Pavel Govyadinov
added the gl_spid...
|
230
|
void
|
97508a2e
Pavel Govyadinov
Added mehtods for...
|
231
|
findOptimalRadius()
|
fb0bc2f1
Pavel Govyadinov
added the gl_spid...
|
232
|
{
|
efe7b7cc
Pavel Govyadinov
Added a detailed ...
|
233
234
235
|
#ifdef TIMING
gpuStartTimer();
#endif
|
ac430567
Pavel Govyadinov
comments comments...
|
236
237
|
setMatrix(); //create the transformation.
glCallList(dList+2); //move the templates to p, d, m.
|
7f297fc6
Pavel Govyadinov
added more detail...
|
238
|
glFinish(); //flush the drawing pipeline.
|
efe7b7cc
Pavel Govyadinov
Added a detailed ...
|
239
240
241
|
#ifdef TIMING
size_time += gpuStopTimer();
#endif
|
c37611a6
Pavel Govyadinov
removed the time ...
|
242
|
int best = getCost(t_mag.getTexture(), t_mag.getAuxArray(), numSamplesMag); //get best cost.
|
4166e973
Pavel Govyadinov
Added debug tags ...
|
243
244
245
246
247
248
|
#ifdef DEBUG
name.str("");
name << "Final_Cost_Size_" << iter << "_" << iter_siz << ".bmp";
test(t_mag.getTexture(), n_pixels*2.0, numSamplesMag*n_pixels, name.str());
iter_siz++;
#endif
|
7f297fc6
Pavel Govyadinov
added more detail...
|
249
|
setMagnitude(m*mV[best]); //adjust the magnitude.
|
fb0bc2f1
Pavel Govyadinov
added the gl_spid...
|
250
251
|
}
|
97508a2e
Pavel Govyadinov
Added mehtods for...
|
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
|
/// Method for finding the best length for the spider.
/// changes the x, y, z size of the spider to minimize the cost
/// function.
void
findOptimalLength()
{
#ifdef TIMING
gpuStartTimer();
#endif
setMatrix(); //create the transformation.
glCallList(dList+3); //move the templates to p, d, m.
glFinish(); //flush the drawing pipeline.
#ifdef TIMING
size_time += gpuStopTimer();
#endif
int best = getCost(t_len.getTexture(), t_len.getAuxArray(), numSamplesMag); //get best cost.
#ifdef DEBUG
// name.str("");
// name << "Final_Cost_Size_" << iter << "_" << iter_siz << ".bmp";
// test(t_mag.getTexture(), n_pixels*2.0, numSamplesMag*n_pixels, name.str());
// iter_siz++;
#endif
setLength(mV[best]); //adjust the magnitude.
}
|
6b8621f8
Pavel Govyadinov
stable version
|
277
|
|
f31bf86d
Pavel Govyadinov
Added skeleton fu...
|
278
|
|
e45b97ce
Pavel Govyadinov
safety commit, I ...
|
279
|
|
27194b56
Pavel Govyadinov
major bug fixes, ...
|
280
281
|
///finds all the branches in the a given fiber.
///using LoG method.
|
e45b97ce
Pavel Govyadinov
safety commit, I ...
|
282
283
284
|
void
branchDetection2(int n = 8, int l_template = 8, int l_square = 8)
{
|
efe7b7cc
Pavel Govyadinov
Added a detailed ...
|
285
|
#ifdef TIMING
|
7f297fc6
Pavel Govyadinov
added more detail...
|
286
|
gpuStartTimer(); ///timer for performance analysis
|
efe7b7cc
Pavel Govyadinov
Added a detailed ...
|
287
288
|
#endif
|
7f297fc6
Pavel Govyadinov
added more detail...
|
289
|
if(cL.size() < 4){} ///if the size of the fiber is less then 4 we do nothing.
|
e45b97ce
Pavel Govyadinov
safety commit, I ...
|
290
|
else{
|
7f297fc6
Pavel Govyadinov
added more detail...
|
291
|
setMatrix(1); ///finds the current transformation matrix
|
7f297fc6
Pavel Govyadinov
added more detail...
|
292
|
DrawLongCylinder(n, l_template, l_square); ///Draw the cylinder.
|
e45b97ce
Pavel Govyadinov
safety commit, I ...
|
293
|
stim::cylinder<float> cyl(cL, cM);
|
7f297fc6
Pavel Govyadinov
added more detail...
|
294
295
296
297
|
std::vector< stim::vec<float> > result = find_branch(cylinder_texID, GL_TEXTURE_2D, n*l_square, (cL.size()-1)*l_template); ///find all the centers in cuda
stim::vec3<float> size(S[0]*R[0], S[1]*R[1], S[2]*R[2]); ///the borders of the texture.
float pval; //pvalue associated with the points on the cylinder.
if(!result.empty()) ///if we have any points
|
e45b97ce
Pavel Govyadinov
safety commit, I ...
|
298
|
{
|
7f297fc6
Pavel Govyadinov
added more detail...
|
299
|
for(int i = 0; i < result.size(); i++) ///for each point
|
e45b97ce
Pavel Govyadinov
safety commit, I ...
|
300
|
{
|
8c4f5d84
Pavel Govyadinov
fixed the issue w...
|
301
|
int id = result[i][2];
|
7f297fc6
Pavel Govyadinov
added more detail...
|
302
|
if(fmod(result[i][2], id) != 0 && id != 0) ///if the remainer is odd
|
8c4f5d84
Pavel Govyadinov
fixed the issue w...
|
303
304
305
|
{
pval = ((cyl.getl(id+1)-cyl.getl(id))*
|
7f297fc6
Pavel Govyadinov
added more detail...
|
306
|
(fmod(result[i][2], id))+cyl.getl(id))/cyl.getl(cL.size()-1); ///calculate pvalue
|
8c4f5d84
Pavel Govyadinov
fixed the issue w...
|
307
|
}
|
7f297fc6
Pavel Govyadinov
added more detail...
|
308
|
else if(id == 0) ///if the point is on the edge
|
8c4f5d84
Pavel Govyadinov
fixed the issue w...
|
309
|
{
|
7f297fc6
Pavel Govyadinov
added more detail...
|
310
|
pval = (cyl.getl(id+1)*result[i][2])/cyl.getl(cL.size()-1);
|
8c4f5d84
Pavel Govyadinov
fixed the issue w...
|
311
312
313
|
}
else
{
|
7f297fc6
Pavel Govyadinov
added more detail...
|
314
|
pval = (cyl.getl(id)/cyl.getl(cL.size()-1)); ///if the point is somewhere on the surface of the cylinder other than the edge
|
8c4f5d84
Pavel Govyadinov
fixed the issue w...
|
315
|
}
|
7f297fc6
Pavel Govyadinov
added more detail...
|
316
317
|
stim::vec3<float> v = cyl.surf(pval, result[i][0]); ///find the coordinates of the point at pval on the surface in tissue space.
stim::vec3<float> di = cyl.p(pval); ///find the coord of v in tissue space projected on the centerline.
|
4166e973
Pavel Govyadinov
Added debug tags ...
|
318
|
float rad = cyl.r(pval)/2; ///find the radius at the pvalue's location
|
8c4f5d84
Pavel Govyadinov
fixed the issue w...
|
319
320
321
|
if(
!(v[0] > size[0] || v[1] > size[1]
|| v[2] > size[2] || v[0] < 0
|
7f297fc6
Pavel Govyadinov
added more detail...
|
322
|
|| v[1] < 0 || v[2] < 0)) ///if the v point is INSIDE the volume
|
8c4f5d84
Pavel Govyadinov
fixed the issue w...
|
323
|
{
|
7f297fc6
Pavel Govyadinov
added more detail...
|
324
325
326
|
setSeed(v); ///add a seedpoint's position.
setSeedVec((v-di).norm()); ///add a seedpoints direction
setSeedMag(rad); ///add the starting radius.
|
8c4f5d84
Pavel Govyadinov
fixed the issue w...
|
327
|
}
|
e45b97ce
Pavel Govyadinov
safety commit, I ...
|
328
329
|
}
}
|
e45b97ce
Pavel Govyadinov
safety commit, I ...
|
330
|
}
|
efe7b7cc
Pavel Govyadinov
Added a detailed ...
|
331
|
#ifdef TIMING
|
7f297fc6
Pavel Govyadinov
added more detail...
|
332
|
branch_time += gpuStopTimer(); ///timer for performance.
|
efe7b7cc
Pavel Govyadinov
Added a detailed ...
|
333
|
#endif
|
e45b97ce
Pavel Govyadinov
safety commit, I ...
|
334
335
|
}
|
c0e09133
Pavel Govyadinov
STABLE: made temp...
|
336
337
338
|
float uniformRandom()
{
|
7f297fc6
Pavel Govyadinov
added more detail...
|
339
|
return ( (float)(rand()))/( (float)(RAND_MAX)); ///generates a random number between 0 and 1 using the uniform distribution.
|
c0e09133
Pavel Govyadinov
STABLE: made temp...
|
340
341
342
343
344
345
|
}
float normalRandom()
{
float u1 = uniformRandom();
float u2 = uniformRandom();
|
7f297fc6
Pavel Govyadinov
added more detail...
|
346
|
return cos(2.0*atan(1.0)*u2)*sqrt(-1.0*log(u1)); ///generate a random number using the normal distribution between 0 and 1.
|
c0e09133
Pavel Govyadinov
STABLE: made temp...
|
347
348
|
}
|
7d3162a2
Pavel Govyadinov
fixed majority of...
|
349
|
stim::vec3<float> uniformRandVector()
|
c0e09133
Pavel Govyadinov
STABLE: made temp...
|
350
|
{
|
7f297fc6
Pavel Govyadinov
added more detail...
|
351
|
stim::vec3<float> r(uniformRandom(), uniformRandom(), 1.0); ///generate a random vector using the uniform distribution between 0 and 1.
|
c0e09133
Pavel Govyadinov
STABLE: made temp...
|
352
353
354
|
return r;
}
|
7d3162a2
Pavel Govyadinov
fixed majority of...
|
355
|
stim::vec3<float> normalRandVector()
|
c0e09133
Pavel Govyadinov
STABLE: made temp...
|
356
|
{
|
7f297fc6
Pavel Govyadinov
added more detail...
|
357
|
stim::vec3<float> r(normalRandom(), normalRandom(), 1.0); ///generate a random vector using the normal distribution between 0 and 1.
|
c0e09133
Pavel Govyadinov
STABLE: made temp...
|
358
359
360
|
return r;
}
|
266aa74a
Pavel Govyadinov
CHECKPOINT: Minor...
|
361
362
363
364
365
|
//--------------------------------------------------------------------------//
//---------------------TEMPLATE CREATION METHODS----------------------------//
//--------------------------------------------------------------------------//
|
c0e09133
Pavel Govyadinov
STABLE: made temp...
|
366
367
|
|
266aa74a
Pavel Govyadinov
CHECKPOINT: Minor...
|
368
369
|
///@param solidAngle, the size of the arc to sample.
///Method for populating the vector arrays with sampled vectors.
|
6b8621f8
Pavel Govyadinov
stable version
|
370
371
372
|
///Objects created are rectangles the with the created directions.
///All points are sampled from a texture.
///Stored in a display list.
|
8e56a0a7
Pavel Govyadinov
Added the propose...
|
373
|
///uses the default d vector <0,0,1>
|
fb0bc2f1
Pavel Govyadinov
added the gl_spid...
|
374
|
void
|
34ec8a82
David Mayerich
added comments
|
375
|
genDirectionVectors(float solidAngle = stim::PI/2)
|
fb0bc2f1
Pavel Govyadinov
added the gl_spid...
|
376
|
{
|
c0e09133
Pavel Govyadinov
STABLE: made temp...
|
377
|
|
8e56a0a7
Pavel Govyadinov
Added the propose...
|
378
|
//Set up the vectors necessary for Rectangle creation.
|
7d3162a2
Pavel Govyadinov
fixed majority of...
|
379
|
stim::vec3<float> Y(1.0,0.0,0.0); //orthogonal vec.
|
7f297fc6
Pavel Govyadinov
added more detail...
|
380
381
382
|
stim::vec3<float> pos(0.0,0.0,0.0); //center point of a rectangle
float mag = 1.0; //size of the generated rectangle.
stim::vec3<float> dir(0.0, 0.0, 1.0); //normal of the rectangle
|
22e7d0c5
Pavel Govyadinov
Minor changes in ...
|
383
|
|
7f297fc6
Pavel Govyadinov
added more detail...
|
384
385
|
float PHI[2], Z[2], range;
PHI[0] = solidAngle/2; ///Project the solid angle into spherical coordinates
|
c0e09133
Pavel Govyadinov
STABLE: made temp...
|
386
|
PHI[1] = asin(0);
|
8e56a0a7
Pavel Govyadinov
Added the propose...
|
387
|
|
7f297fc6
Pavel Govyadinov
added more detail...
|
388
|
Z[0] = cos(PHI[0]); ///Project the z into spherical coordinates
|
c0e09133
Pavel Govyadinov
STABLE: made temp...
|
389
390
|
Z[1] = cos(PHI[1]);
|
7f297fc6
Pavel Govyadinov
added more detail...
|
391
|
range = Z[0] - Z[1]; ///The range the possible values can be.
|
c0e09133
Pavel Govyadinov
STABLE: made temp...
|
392
393
|
float z, theta, phi;
|
7f297fc6
Pavel Govyadinov
added more detail...
|
394
395
|
glNewList(dList, GL_COMPILE); ///create a display list of all the direction templates.
for(int i = 0; i < numSamples; i++) ///for each sample
|
c0e09133
Pavel Govyadinov
STABLE: made temp...
|
396
|
{
|
7f297fc6
Pavel Govyadinov
added more detail...
|
397
398
399
400
401
402
|
z = uniformRandom()*range + Z[1]; ///generate a z coordinate
theta = uniformRandom()*stim::TAU; ///generate a theta coordinate
phi = acos(z); ///generate a phi from the z.
stim::vec3<float> sph(1, theta, phi); ///combine into a vector in spherical coordinates.
stim::vec3<float> cart = sph.sph2cart();///convert to cartesian.
dV.push_back(cart); ///save the generated vector for further use.
|
4166e973
Pavel Govyadinov
Added debug tags ...
|
403
404
405
|
#ifdef DEBUG
// std::cout << cart << std::endl;
#endif
|
7f297fc6
Pavel Govyadinov
added more detail...
|
406
|
if(cos(Y.dot(cart)) < 0.087) ///make sure that the Y is not parallel to the new vector.
|
c0e09133
Pavel Govyadinov
STABLE: made temp...
|
407
408
409
410
|
{
Y[0] = 0.0; Y[1] = 1.0;
}else{
Y[0] = 1.0; Y[1] = 0.0;
|
266aa74a
Pavel Govyadinov
CHECKPOINT: Minor...
|
411
|
}
|
4166e973
Pavel Govyadinov
Added debug tags ...
|
412
|
|
7f297fc6
Pavel Govyadinov
added more detail...
|
413
|
hor = stim::rect<float>(mag, ///generate a rectangle with the new vectro as a normal.
|
c0e09133
Pavel Govyadinov
STABLE: made temp...
|
414
415
|
pos, cart,
((Y.cross(cart)).cross(cart)).norm());
|
4166e973
Pavel Govyadinov
Added debug tags ...
|
416
417
418
419
|
#ifdef DEBUG
// std::cout << hor.n() << std::endl;
#endif
|
7f297fc6
Pavel Govyadinov
added more detail...
|
420
|
ver = stim::rect<float>(mag, ///generate another rectangle that's perpendicular the first but parallel to the cart vector.
|
c0e09133
Pavel Govyadinov
STABLE: made temp...
|
421
422
|
pos, cart,
hor.n());
|
7f297fc6
Pavel Govyadinov
added more detail...
|
423
|
UpdateBuffer(0.0, 0.0+i*n_pixels); ///Put the necessary points into the diplaylist.
|
266aa74a
Pavel Govyadinov
CHECKPOINT: Minor...
|
424
|
}
|
7f297fc6
Pavel Govyadinov
added more detail...
|
425
|
glEndList(); ///finilize the display list.
|
fb0bc2f1
Pavel Govyadinov
added the gl_spid...
|
426
|
}
|
2a18be6d
Pavel Govyadinov
New comments and ...
|
427
|
|
ac430567
Pavel Govyadinov
comments comments...
|
428
|
///@param float delta, How much the rectangles vary in position.
|
266aa74a
Pavel Govyadinov
CHECKPOINT: Minor...
|
429
|
///Method for populating the buffer with the sampled texture.
|
ac430567
Pavel Govyadinov
comments comments...
|
430
431
432
|
///Objects created are rectangles the with the created positions.
///All points are sampled from a texture.
///Stored in a display list.
|
266aa74a
Pavel Govyadinov
CHECKPOINT: Minor...
|
433
|
///uses the default vector <0,0,0>
|
a9f956be
Pavel Govyadinov
Fixed the cost fu...
|
434
|
void
|
4191c034
Pavel Govyadinov
minor:bug fixes. ...
|
435
|
genPositionVectors(float delta = 0.4)
|
a9f956be
Pavel Govyadinov
Fixed the cost fu...
|
436
|
{
|
8e56a0a7
Pavel Govyadinov
Added the propose...
|
437
|
//Set up the vectors necessary for Rectangle creation.
|
7d3162a2
Pavel Govyadinov
fixed majority of...
|
438
|
stim::vec3<float> Y(1.0,0.0,0.0); //orthogonal vec.
|
7f297fc6
Pavel Govyadinov
added more detail...
|
439
440
441
|
stim::vec3<float> pos(0.0,0.0,0.0); //center point of a rectangle
float mag = 1.0; ///size of each rectangle
stim::vec3<float> dir(0.0, 0.0, 1.0); ///normal of the rectangle plane.
|
8e56a0a7
Pavel Govyadinov
Added the propose...
|
442
443
|
//Set up the variable necessary for vector creation.
|
7f297fc6
Pavel Govyadinov
added more detail...
|
444
|
glNewList(dList+1, GL_COMPILE); ///generate a new display list.
|
4166e973
Pavel Govyadinov
Added debug tags ...
|
445
446
447
448
449
450
451
452
|
pV.push_back(pos);
hor = stim::rect<float>(mag, ///generate a rec tangle with the new vector as a normal.
pos, dir,
((Y.cross(d)).cross(d))
.norm());
ver = stim::rect<float>(mag, ///generate anoth er rectangle that's perpendicular the first but parallel to the cart vector.
pos, dir,
hor.n());
|
fac43319
Pavel Govyadinov
Changed the posit...
|
453
|
///The first vector is always in the center.
|
4166e973
Pavel Govyadinov
Added debug tags ...
|
454
455
|
UpdateBuffer(0.0, 0.0+0*n_pixels);
for(int i = 1; i < numSamplesPos; i++) ///for the number of position samples
|
c0e09133
Pavel Govyadinov
STABLE: made temp...
|
456
|
{
|
7f297fc6
Pavel Govyadinov
added more detail...
|
457
|
stim::vec3<float> temp = uniformRandVector(); ///generate a random point on a plane.
|
fac43319
Pavel Govyadinov
Changed the posit...
|
458
459
460
|
temp[0] = temp[0]*delta;
temp[1] = temp[1]*2*stim::PI;
|
c0e09133
Pavel Govyadinov
STABLE: made temp...
|
461
|
temp[2] = 0.0;
|
fac43319
Pavel Govyadinov
Changed the posit...
|
462
|
temp = temp.cyl2cart();
|
7f297fc6
Pavel Govyadinov
added more detail...
|
463
464
|
pV.push_back(temp); ///save the point for further use.
hor = stim::rect<float>(mag, ///generate a rectangle with the new vector as a normal.
|
c0e09133
Pavel Govyadinov
STABLE: made temp...
|
465
466
467
|
temp, dir,
((Y.cross(d)).cross(d))
.norm());
|
7f297fc6
Pavel Govyadinov
added more detail...
|
468
|
ver = stim::rect<float>(mag, ///generate another rectangle that's perpendicular the first but parallel to the cart vector.
|
c0e09133
Pavel Govyadinov
STABLE: made temp...
|
469
470
|
temp, dir,
hor.n());
|
7f297fc6
Pavel Govyadinov
added more detail...
|
471
|
UpdateBuffer(0.0, 0.0+i*n_pixels); ///sample the necessary points and put them into a display list.
|
266aa74a
Pavel Govyadinov
CHECKPOINT: Minor...
|
472
|
}
|
7f297fc6
Pavel Govyadinov
added more detail...
|
473
|
glEndList(); ///finilize the display list.
|
4166e973
Pavel Govyadinov
Added debug tags ...
|
474
475
476
477
|
#ifdef DEBUG
for(int i = 0; i < numSamplesPos; i++)
std::cout << pV[i] << std::endl;
#endif
|
266aa74a
Pavel Govyadinov
CHECKPOINT: Minor...
|
478
479
|
}
|
ac430567
Pavel Govyadinov
comments comments...
|
480
|
///@param float delta, How much the rectangles are allowed to expand.
|
266aa74a
Pavel Govyadinov
CHECKPOINT: Minor...
|
481
|
///Method for populating the buffer with the sampled texture.
|
ac430567
Pavel Govyadinov
comments comments...
|
482
483
484
|
///Objects created are rectangles the with the created sizes.
///All points are sampled from a texture.
///Stored in a display list.
|
8e56a0a7
Pavel Govyadinov
Added the propose...
|
485
|
///uses the default m <1,1,0>
|
266aa74a
Pavel Govyadinov
CHECKPOINT: Minor...
|
486
|
void
|
79a9bf3f
Pavel Govyadinov
new implementatio...
|
487
|
genMagnitudeVectors(float delta = 0.70)
|
266aa74a
Pavel Govyadinov
CHECKPOINT: Minor...
|
488
489
|
{
|
8e56a0a7
Pavel Govyadinov
Added the propose...
|
490
|
//Set up the vectors necessary for Rectangle creation.
|
7d3162a2
Pavel Govyadinov
fixed majority of...
|
491
|
stim::vec3<float> Y(1.0, 0.0, 0.0); //orthogonal vec.
|
7f297fc6
Pavel Govyadinov
added more detail...
|
492
493
494
|
stim::vec3<float> pos(0.0, 0.0, 0.0); //center of the future rect.
float mag = 1.0; ///size of the rectangle
stim::vec3<float> dir(0.0, 0.0, 1.0); ///normal of the rectangle plane.
|
8e56a0a7
Pavel Govyadinov
Added the propose...
|
495
496
|
//Set up the variable necessary for vector creation.
|
7f297fc6
Pavel Govyadinov
added more detail...
|
497
498
499
|
float min = 1.0-delta; ///smallest size
float max = 1.0+delta; ///largers size.
float step = (max-min)/(numSamplesMag-1); ///the size variation from one rect to the next.
|
266aa74a
Pavel Govyadinov
CHECKPOINT: Minor...
|
500
|
float factor;
|
8e56a0a7
Pavel Govyadinov
Added the propose...
|
501
|
glNewList(dList+2, GL_COMPILE);
|
7f297fc6
Pavel Govyadinov
added more detail...
|
502
|
for(int i = 0; i < numSamplesMag; i++){ ///for the number of position samples
|
266aa74a
Pavel Govyadinov
CHECKPOINT: Minor...
|
503
|
//Create linear index
|
7f297fc6
Pavel Govyadinov
added more detail...
|
504
505
506
|
factor = (min+step*i)*mag; ///scaling factor
mV.push_back(factor); ///save the size factor for further use.
hor = stim::rect<float>(factor, ///generate a rectangle with the new vector as a normal.
|
8e56a0a7
Pavel Govyadinov
Added the propose...
|
507
508
509
|
pos, dir,
((Y.cross(d)).cross(d))
.norm());
|
7f297fc6
Pavel Govyadinov
added more detail...
|
510
|
ver = stim::rect<float>(factor, ///generate another rectangle that's perpendicular the first but parallel to the cart vector.
|
8e56a0a7
Pavel Govyadinov
Added the propose...
|
511
512
|
pos, dir,
hor.n());
|
7f297fc6
Pavel Govyadinov
added more detail...
|
513
|
UpdateBuffer(0.0, 0.0+i*n_pixels); ///sample the necessary points and put them into a display list.
|
8e56a0a7
Pavel Govyadinov
Added the propose...
|
514
|
CHECK_OPENGL_ERROR
|
266aa74a
Pavel Govyadinov
CHECKPOINT: Minor...
|
515
|
}
|
7f297fc6
Pavel Govyadinov
added more detail...
|
516
|
glEndList(); ///finilize the displaylist.
|
a9f956be
Pavel Govyadinov
Fixed the cost fu...
|
517
|
}
|
ac430567
Pavel Govyadinov
comments comments...
|
518
|
|
97508a2e
Pavel Govyadinov
Added mehtods for...
|
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
|
///@param float delta, How much the rectangles are allowed to expand.
///Method for populating the buffer with the sampled texture.
///Objects created are rectangles the with the created sizes.
///All points are sampled from a texture.
///Stored in a display list.
///uses the default m <1,1,0>
void
genLengthVectors(float delta = 0.70)
{
//Set up the vectors necessary for Rectangle creation.
stim::vec3<float> Y(1.0, 0.0, 0.0); //orthogonal vec.
stim::vec3<float> pos(0.0, 0.0, 0.0); //center of the future rect.
float mag = 1.0; ///size of the rectangle
stim::vec3<float> dir(0.0, 0.0, 1.0); ///normal of the rectangle plane.
stim::vec<float> temp(0.0,0.0,0.0);
//Set up the variable necessary for vector creation.
float min = 1.0-delta; ///smallest size
float max = 1.0+delta; ///largers size.
float step = (max-min)/(numSamplesMag-1); ///the size variation from one rect to the next.
float factor;
glNewList(dList+3, GL_COMPILE);
for(int i = 0; i < numSamplesMag; i++){ ///for the number of position samples
//Create linear index
factor = (min+step*i)*mag; ///scaling factor
lV.push_back(factor); ///save the size factor for further use.
temp[0] = factor;
temp[1] = mag;
hor = stim::rect<float>(temp, ///generate a rectangle with the new vector as a normal.
pos, dir,
((Y.cross(d)).cross(d))
.norm());
ver = stim::rect<float>(temp, ///generate another rectangle that's perpendicular the first but parallel to the cart vector.
pos, dir,
hor.n());
UpdateBuffer(0.0, 0.0+i*n_pixels); ///sample the necessary points and put them into a display list.
CHECK_OPENGL_ERROR
}
glEndList(); ///finilize the displaylist.
}
|
ac430567
Pavel Govyadinov
comments comments...
|
561
562
563
564
|
///@param float v_x x-coordinate in buffer-space,
///@param float v_y y-coordinate in buffer-space.
///Samples the texture space.
///places a sample in the provided coordinates of bufferspace.
|
a9f956be
Pavel Govyadinov
Fixed the cost fu...
|
565
566
567
|
void
UpdateBuffer(float v_x, float v_y)
{
|
7f297fc6
Pavel Govyadinov
added more detail...
|
568
569
570
571
572
573
574
575
576
|
stim::vec3<float>p1; ///first point.
stim::vec3<float>p2; ///second point.
stim::vec3<float>p3; ///third point.
stim::vec3<float>p4; ///fourth point.
p1 = hor.p(1,1); ///generate the top right point from the horizontal template.
p2 = hor.p(1,0); ///generate the bottom right point from the horizonatal template.
p3 = hor.p(0,0); ///generate the bottom left point from the horizontal template.
p4 = hor.p(0,1); ///generate the top left point from the horizonatal template.
glBegin(GL_QUADS); ///generate the Quad from the 4 points.
|
a9f956be
Pavel Govyadinov
Fixed the cost fu...
|
577
|
glTexCoord3f(
|
a9f956be
Pavel Govyadinov
Fixed the cost fu...
|
578
579
580
581
|
p1[0],
p1[1],
p1[2]
);
|
a9f956be
Pavel Govyadinov
Fixed the cost fu...
|
582
583
|
glVertex2f(v_x,v_y);
glTexCoord3f(
|
a9f956be
Pavel Govyadinov
Fixed the cost fu...
|
584
585
586
587
|
p2[0],
p2[1],
p2[2]
);
|
7f297fc6
Pavel Govyadinov
added more detail...
|
588
|
glVertex2f(v_x+n_pixels, v_y);
|
a9f956be
Pavel Govyadinov
Fixed the cost fu...
|
589
|
glTexCoord3f(
|
a9f956be
Pavel Govyadinov
Fixed the cost fu...
|
590
591
592
593
|
p3[0],
p3[1],
p3[2]
);
|
7f297fc6
Pavel Govyadinov
added more detail...
|
594
|
glVertex2f(v_x+n_pixels, v_y+n_pixels);
|
a9f956be
Pavel Govyadinov
Fixed the cost fu...
|
595
|
glTexCoord3f(
|
a9f956be
Pavel Govyadinov
Fixed the cost fu...
|
596
597
598
|
p4[0],
p4[1],
p4[2]
|
a9f956be
Pavel Govyadinov
Fixed the cost fu...
|
599
|
);
|
7f297fc6
Pavel Govyadinov
added more detail...
|
600
601
602
603
604
605
606
607
|
glVertex2f(v_x, v_y+n_pixels);
glEnd(); ///finish the quad.
p1 = ver.p(1,1); ///generate the top right point from the vertical template.
p2 = ver.p(1,0); ///generate the bottom right point from the vertical template.
p3 = ver.p(0,0); ///generate the bottom left point from the vertical template.
p4 = ver.p(0,1); ///generate the top left point from the vertical template.
glBegin(GL_QUADS); ///generate the Quad from the 4 points.
|
a9f956be
Pavel Govyadinov
Fixed the cost fu...
|
608
|
glTexCoord3f(
|
a9f956be
Pavel Govyadinov
Fixed the cost fu...
|
609
610
611
612
|
p1[0],
p1[1],
p1[2]
);
|
7f297fc6
Pavel Govyadinov
added more detail...
|
613
|
glVertex2f(v_x+n_pixels, v_y);
|
a9f956be
Pavel Govyadinov
Fixed the cost fu...
|
614
|
glTexCoord3f(
|
a9f956be
Pavel Govyadinov
Fixed the cost fu...
|
615
616
617
618
|
p2[0],
p2[1],
p2[2]
);
|
7f297fc6
Pavel Govyadinov
added more detail...
|
619
|
glVertex2f(v_x+2.0*n_pixels, v_y);
|
a9f956be
Pavel Govyadinov
Fixed the cost fu...
|
620
|
glTexCoord3f(
|
a9f956be
Pavel Govyadinov
Fixed the cost fu...
|
621
622
623
624
|
p3[0],
p3[1],
p3[2]
);
|
7f297fc6
Pavel Govyadinov
added more detail...
|
625
|
glVertex2f(v_x+2.0*n_pixels, v_y+n_pixels);
|
a9f956be
Pavel Govyadinov
Fixed the cost fu...
|
626
|
glTexCoord3f(
|
a9f956be
Pavel Govyadinov
Fixed the cost fu...
|
627
628
629
630
|
p4[0],
p4[1],
p4[2]
);
|
7f297fc6
Pavel Govyadinov
added more detail...
|
631
632
|
glVertex2f(v_x+n_pixels, v_y+n_pixels);
glEnd(); ///finish the quad.
|
a9f956be
Pavel Govyadinov
Fixed the cost fu...
|
633
|
}
|
2a18be6d
Pavel Govyadinov
New comments and ...
|
634
|
|
385d2447
Pavel Govyadinov
Checkpoint: Conve...
|
635
|
|
385d2447
Pavel Govyadinov
Checkpoint: Conve...
|
636
|
|
266aa74a
Pavel Govyadinov
CHECKPOINT: Minor...
|
637
638
639
|
//--------------------------------------------------------------------------//
//--------------------------------GL METHODS--------------------------------//
//--------------------------------------------------------------------------//
|
385d2447
Pavel Govyadinov
Checkpoint: Conve...
|
640
|
|
ac430567
Pavel Govyadinov
comments comments...
|
641
642
643
644
|
///@param uint width sets the width of the buffer.
///@param uint height sets the height of the buffer.
///@param GLuint &textureID gives the texture ID of the texture to be initialized.
///@param GLuint &framebufferID gives the buffer ID of the texture to be initialized.
|
266aa74a
Pavel Govyadinov
CHECKPOINT: Minor...
|
645
|
///Function for setting up the 2D buffer that stores the samples.
|
ac430567
Pavel Govyadinov
comments comments...
|
646
|
///Initiates and sets parameters.
|
266aa74a
Pavel Govyadinov
CHECKPOINT: Minor...
|
647
|
void
|
84eff8b1
Pavel Govyadinov
Merged only the n...
|
648
649
|
GenerateFBO(unsigned int width, unsigned int height, GLuint &textureID, GLuint &framebufferID)
{
|
7f297fc6
Pavel Govyadinov
added more detail...
|
650
651
652
|
glDeleteFramebuffers(1, &framebufferID); ///clear the framebuffer.
glGenFramebuffers(1, &framebufferID); ///generate a clean buffer.
glBindFramebuffer(GL_FRAMEBUFFER, framebufferID); ///bind the new buffer.
|
6ada8448
Pavel Govyadinov
Reverted to 40db1...
|
653
|
// int numChannels = 1;
|
c37611a6
Pavel Govyadinov
removed the time ...
|
654
|
// unsigned char* texels = new unsigned char[width * height * numChannels];
|
7f297fc6
Pavel Govyadinov
added more detail...
|
655
|
glGenTextures(1, &textureID); ///generate a texture that will attach to the buffer.
|
84eff8b1
Pavel Govyadinov
Merged only the n...
|
656
|
glBindTexture(GL_TEXTURE_2D, textureID);
|
ac430567
Pavel Govyadinov
comments comments...
|
657
658
|
//Textures repeat and use linear interpolation, luminance format.
|
4166e973
Pavel Govyadinov
Added debug tags ...
|
659
660
|
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_BORDER); ///Set up the texture to repeat at edges.
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_BORDER);
|
7f297fc6
Pavel Govyadinov
added more detail...
|
661
|
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); ///Set up the texture to use Linear interpolation
|
84eff8b1
Pavel Govyadinov
Merged only the n...
|
662
|
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
|
7f297fc6
Pavel Govyadinov
added more detail...
|
663
|
glTexImage2D(GL_TEXTURE_2D, 0, GL_LUMINANCE, ///Create the texture with no data.
|
c37611a6
Pavel Govyadinov
removed the time ...
|
664
665
|
width, height, 0, GL_LUMINANCE, GL_UNSIGNED_BYTE, NULL);
// delete[] texels;
|
7f297fc6
Pavel Govyadinov
added more detail...
|
666
667
|
glBindFramebuffer(GL_FRAMEBUFFER, 0); ///Bind the frontbuffer
glBindTexture(GL_TEXTURE_2D, 0); ///Unbind the texture.
|
a9f956be
Pavel Govyadinov
Fixed the cost fu...
|
668
|
}
|
266aa74a
Pavel Govyadinov
CHECKPOINT: Minor...
|
669
|
|
385d2447
Pavel Govyadinov
Checkpoint: Conve...
|
670
|
|
e45b97ce
Pavel Govyadinov
safety commit, I ...
|
671
|
///IF type == 0
|
ac430567
Pavel Govyadinov
comments comments...
|
672
|
///Method for using the gl manipulation to align templates from
|
266aa74a
Pavel Govyadinov
CHECKPOINT: Minor...
|
673
|
///Template space (-0.5 0.5) to Texture space (0.0, 1.0),
|
8e56a0a7
Pavel Govyadinov
Added the propose...
|
674
|
///Based on the p of the spider in real space (arbitrary).
|
e45b97ce
Pavel Govyadinov
safety commit, I ...
|
675
676
677
678
|
///IF type == 1
///Method for using the gl manipulation to set up a matrix
///To transform from tissue space into texture space.
|
ac430567
Pavel Govyadinov
comments comments...
|
679
|
///All transformation happen in glMatrixMode(GL_TEXTURE).
|
ac430567
Pavel Govyadinov
comments comments...
|
680
|
///All transformation happen in glMatrixMode(GL_TEXTURE).
|
e45b97ce
Pavel Govyadinov
safety commit, I ...
|
681
|
void setMatrix(int type = 0)
|
5f81932b
David Mayerich
restored Pavel's ...
|
682
|
{
|
e45b97ce
Pavel Govyadinov
safety commit, I ...
|
683
684
685
686
687
688
|
if(type == 0)
{
float curTrans[16]; //array to store the matrix values.
stim::vec<float> rot = getRotation(d); //get the rotation parameters for the current direction vector.
glMatrixMode(GL_TEXTURE);
glLoadIdentity();
|
d4721000
Pavel Govyadinov
changes with debu...
|
689
|
|
e45b97ce
Pavel Govyadinov
safety commit, I ...
|
690
691
692
693
694
695
696
697
698
|
//Scale by the voxel size and number of slices.
glScalef(1.0/S[0]/R[0], 1.0/S[1]/R[1], 1.0/S[2]/R[2]);
//translate to the current position of the spider in the texture.
glTranslatef(p[0],
p[1],
p[2]);
//rotate to the current direction of the spider.
glRotatef(rot[0], rot[1], rot[2], rot[3]);
//scale to the magnitude of the spider.
|
7f297fc6
Pavel Govyadinov
added more detail...
|
699
700
701
|
glScalef(m,
m,
m);
|
e45b97ce
Pavel Govyadinov
safety commit, I ...
|
702
703
704
|
//get and store the current transformation matrix for later use.
glGetFloatv(GL_TEXTURE_MATRIX, curTrans);
cT.set(curTrans);
|
e45b97ce
Pavel Govyadinov
safety commit, I ...
|
705
706
707
708
709
710
711
712
713
714
715
716
|
CHECK_OPENGL_ERROR
//revert back to default gl mode.
glMatrixMode(GL_MODELVIEW);
}
else if(type == 1)
{
glMatrixMode(GL_TEXTURE);
glLoadIdentity();
glScalef(1.0/S[0]/R[0], 1.0/S[1]/R[1], 1.0/S[2]/R[2]);
glMatrixMode(GL_MODELVIEW);
}
|
5f81932b
David Mayerich
restored Pavel's ...
|
717
|
}
|
84eff8b1
Pavel Govyadinov
Merged only the n...
|
718
|
|
ac430567
Pavel Govyadinov
comments comments...
|
719
720
|
///Method for controling the buffer and texture binding.
///Clears the buffer upon binding.
|
09049866
Pavel Govyadinov
fixed a drawing b...
|
721
722
723
724
725
726
727
728
729
|
void
Bind()
{
glBindFramebuffer(GL_FRAMEBUFFER, direction_buffID);//set up GL buffer
glFramebufferTexture2D(
GL_FRAMEBUFFER,
GL_COLOR_ATTACHMENT0,
GL_TEXTURE_2D,
direction_texID,
|
8303b04d
Pavel Govyadinov
fixed the bug and...
|
730
731
732
733
734
735
736
737
|
0); ///Bind the texture to the 0th color attachement of the framebuffer
glBindFramebuffer(GL_FRAMEBUFFER, direction_buffID); ///Bind the buffer again (safety operation).
GLenum DrawBuffers[1] = {GL_COLOR_ATTACHMENT0}; ///Designate the texture to be the drawbuffer of the framebuffer
glDrawBuffers(1, DrawBuffers); ///Set the current drawbuffer to the texture.
glBindTexture(GL_TEXTURE_2D, direction_texID); ///Bind the Texture
glClearColor(1,1,1,1); ///Set clear color to white
glClear(GL_COLOR_BUFFER_BIT); ///Clear the texture
glMatrixMode(GL_PROJECTION);
|
09049866
Pavel Govyadinov
fixed a drawing b...
|
738
739
|
glLoadIdentity();
glMatrixMode(GL_MODELVIEW);
|
8303b04d
Pavel Govyadinov
fixed the bug and...
|
740
741
|
glLoadIdentity(); ///Load identity matrix into the projection and modelview
glViewport(0,0,2.0*n_pixels, numSamples*n_pixels); ///Designate the viewport and orth
|
09049866
Pavel Govyadinov
fixed a drawing b...
|
742
743
|
gluOrtho2D(0.0,2.0*n_pixels,0.0,numSamples*n_pixels);
glEnable(GL_TEXTURE_3D);
|
8303b04d
Pavel Govyadinov
fixed the bug and...
|
744
|
glBindTexture(GL_TEXTURE_3D, texID); ///Bind the larger 3D texture.
|
09049866
Pavel Govyadinov
fixed a drawing b...
|
745
746
747
748
749
750
|
CHECK_OPENGL_ERROR
}
///Method for controling the buffer and texture binding.
///Clears the buffer upon binding.
|
ac430567
Pavel Govyadinov
comments comments...
|
751
752
753
|
///@param GLuint &textureID, texture to be bound.
///@param GLuint &framebufferID, framebuffer used for storage.
///@param int nSamples, number of rectanges to create.
|
84eff8b1
Pavel Govyadinov
Merged only the n...
|
754
|
void
|
e45b97ce
Pavel Govyadinov
safety commit, I ...
|
755
|
Bind(GLuint &textureID, GLuint &framebufferID, int nSamples, float len = 8.0)
|
84eff8b1
Pavel Govyadinov
Merged only the n...
|
756
|
{
|
c0e09133
Pavel Govyadinov
STABLE: made temp...
|
757
|
|
7f297fc6
Pavel Govyadinov
added more detail...
|
758
759
|
glBindFramebuffer(GL_FRAMEBUFFER, framebufferID); ///Bind the framebuffer.
glFramebufferTexture2D( ///associate it with the texture
|
84eff8b1
Pavel Govyadinov
Merged only the n...
|
760
761
762
763
764
|
GL_FRAMEBUFFER,
GL_COLOR_ATTACHMENT0,
GL_TEXTURE_2D,
textureID,
0);
|
7f297fc6
Pavel Govyadinov
added more detail...
|
765
766
767
768
769
|
glBindFramebuffer(GL_FRAMEBUFFER, framebufferID); ///Bind the framebuffer.
GLenum DrawBuffers[1] = {GL_COLOR_ATTACHMENT0}; ///generate the drawbuffer.
glDrawBuffers(1, DrawBuffers); ///set the drawbuffer.
glBindTexture(GL_TEXTURE_2D, textureID); ///Bind the texture passed.
glMatrixMode(GL_PROJECTION); ///clear out the draw matrices
|
84eff8b1
Pavel Govyadinov
Merged only the n...
|
770
771
772
|
glLoadIdentity();
glMatrixMode(GL_MODELVIEW);
glLoadIdentity();
|
7f297fc6
Pavel Govyadinov
added more detail...
|
773
774
775
776
|
glViewport(0,0,2.0*len, nSamples*len); ///set up viewport
gluOrtho2D(0.0,2.0*len,0.0,nSamples*len); ///Set up ortho
glEnable(GL_TEXTURE_3D);
glBindTexture(GL_TEXTURE_3D, texID); ///bind the main texture (return to original state).
|
84eff8b1
Pavel Govyadinov
Merged only the n...
|
777
778
779
|
CHECK_OPENGL_ERROR
}
|
266aa74a
Pavel Govyadinov
CHECKPOINT: Minor...
|
780
|
|
ac430567
Pavel Govyadinov
comments comments...
|
781
|
///Unbinds all texture resources.
|
84eff8b1
Pavel Govyadinov
Merged only the n...
|
782
783
784
785
|
void
Unbind()
{
//Finalize GL_buffer
|
7f297fc6
Pavel Govyadinov
added more detail...
|
786
|
glBindTexture(GL_TEXTURE_3D, 0); ///Bind the front buffer.
|
84eff8b1
Pavel Govyadinov
Merged only the n...
|
787
|
CHECK_OPENGL_ERROR
|
7f297fc6
Pavel Govyadinov
added more detail...
|
788
|
glBindTexture(GL_TEXTURE_2D, 0); ///Bind the default GL texture.
|
84eff8b1
Pavel Govyadinov
Merged only the n...
|
789
|
CHECK_OPENGL_ERROR
|
7f297fc6
Pavel Govyadinov
added more detail...
|
790
|
glBindFramebuffer(GL_FRAMEBUFFER, 0); ///Bind the defautl framebuffer.
|
84eff8b1
Pavel Govyadinov
Merged only the n...
|
791
|
CHECK_OPENGL_ERROR
|
7f297fc6
Pavel Govyadinov
added more detail...
|
792
|
glDisable(GL_TEXTURE_3D); ///Turn off texturing.
|
ac430567
Pavel Govyadinov
comments comments...
|
793
|
CHECK_OPENGL_ERROR
|
ac430567
Pavel Govyadinov
comments comments...
|
794
795
|
}
|
266aa74a
Pavel Govyadinov
CHECKPOINT: Minor...
|
796
|
|
5f81932b
David Mayerich
restored Pavel's ...
|
797
|
|
42145f38
Pavel Govyadinov
Fixed the issues ...
|
798
799
800
801
802
|
//--------------------------------------------------------------------------//
//--------------------------------CUDA METHODS------------------------------//
//--------------------------------------------------------------------------//
|
42145f38
Pavel Govyadinov
Fixed the issues ...
|
803
|
|
ac430567
Pavel Govyadinov
comments comments...
|
804
805
806
|
///Entry-point into the cuda code for calculating the cost of a given samples array (in texture form)
///finds the minimum cost and sets the current_cost to that value.
/// and returns the index of the template with the minimal cost.
|
42145f38
Pavel Govyadinov
Fixed the issues ...
|
807
|
int
|
c37611a6
Pavel Govyadinov
removed the time ...
|
808
|
getCost(cudaTextureObject_t tObj, float* result, int n)
|
035d798f
Pavel Govyadinov
modified the spid...
|
809
|
{
|
efe7b7cc
Pavel Govyadinov
Added a detailed ...
|
810
|
#ifdef TIMING
|
8303b04d
Pavel Govyadinov
fixed the bug and...
|
811
|
gpuStartTimer(); ///Add timing variables
|
035d798f
Pavel Govyadinov
modified the spid...
|
812
813
|
#endif
stim::vec<int> cost =
|
7f297fc6
Pavel Govyadinov
added more detail...
|
814
|
stim::cuda::get_cost(tObj, result, n, 2*n_pixels, n_pixels); ///call the cuda function with the appropriate texture buffer.
|
efe7b7cc
Pavel Govyadinov
Added a detailed ...
|
815
|
#ifdef TIMING
|
8303b04d
Pavel Govyadinov
fixed the bug and...
|
816
|
cost_time += gpuStopTimer();
|
035d798f
Pavel Govyadinov
modified the spid...
|
817
|
#endif
|
7f297fc6
Pavel Govyadinov
added more detail...
|
818
|
current_cost = cost[1]; ///current cost.
|
035d798f
Pavel Govyadinov
modified the spid...
|
819
820
|
return cost[0];
}
|
ac430567
Pavel Govyadinov
comments comments...
|
821
|
|
fb0bc2f1
Pavel Govyadinov
added the gl_spid...
|
822
|
public:
|
ac430567
Pavel Govyadinov
comments comments...
|
823
824
825
826
827
828
|
///ininializes the cuda device and environment.
void
initCuda()
{
stim::cudaSetDevice();
|
ac430567
Pavel Govyadinov
comments comments...
|
829
830
831
|
}
//horizonal rectangle forming the spider.
|
13c2a7d4
Pavel Govyadinov
some changes to t...
|
832
|
stim::rect<float> hor;
|
ac430567
Pavel Govyadinov
comments comments...
|
833
|
//vectical rectangle forming the spider.
|
13c2a7d4
Pavel Govyadinov
some changes to t...
|
834
835
|
stim::rect<float> ver;
|
efe7b7cc
Pavel Govyadinov
Added a detailed ...
|
836
|
//Timing variables.
|
84eff8b1
Pavel Govyadinov
Merged only the n...
|
837
|
|
266aa74a
Pavel Govyadinov
CHECKPOINT: Minor...
|
838
839
840
841
842
|
//--------------------------------------------------------------------------//
//-----------------------------CONSTRUCTORS---------------------------------//
//--------------------------------------------------------------------------//
|
ac430567
Pavel Govyadinov
comments comments...
|
843
844
|
///@param int samples, the number of samples this spider is going to use.
///Best results if samples is can create a perfect root.
|
266aa74a
Pavel Govyadinov
CHECKPOINT: Minor...
|
845
|
///Default Constructor
|
2a18be6d
Pavel Govyadinov
New comments and ...
|
846
|
gl_spider
|
3f15dade
Pavel Govyadinov
changed the plane...
|
847
|
(int samples = 1089, int samplespos = 441,int samplesmag = 144)
|
2a18be6d
Pavel Govyadinov
New comments and ...
|
848
|
{
|
7d3162a2
Pavel Govyadinov
fixed majority of...
|
849
850
|
p = stim::vec3<float>(0.0, 0.0, 0.0);
d = stim::vec3<float>(0.0, 0.0, 1.0);
|
7f297fc6
Pavel Govyadinov
added more detail...
|
851
|
m = 1.0;
|
7d3162a2
Pavel Govyadinov
fixed majority of...
|
852
853
|
S = stim::vec3<float>(1.0, 1.0, 1.0);
R = stim::vec3<float>(1.0, 1.0, 1.0);
|
2a18be6d
Pavel Govyadinov
New comments and ...
|
854
|
numSamples = samples;
|
035d798f
Pavel Govyadinov
modified the spid...
|
855
856
|
numSamplesPos = samplespos;
numSamplesMag = samplesmag;
|
4166e973
Pavel Govyadinov
Added debug tags ...
|
857
|
#ifdef DEBUG
|
47fe6300
Pavel Govyadinov
fixed an accident...
|
858
|
iter = 0;
|
4166e973
Pavel Govyadinov
Added debug tags ...
|
859
860
861
862
|
iter_pos = 0;
iter_dir = 0;
iter_siz = 0;
#endif
|
4cefeb6d
Pavel Govyadinov
Changes to the re...
|
863
864
|
}
|
ac430567
Pavel Govyadinov
comments comments...
|
865
866
867
868
869
870
871
872
873
|
///Position constructor: floats.
///@param float pos_x, position x.
///@param float pos_y, position y.
///@param float pos_z, position z.
///@param float dir_x, direction x.
///@param float dir_y, direction y.
///@param float dir_z, direction z.
///@param float mag_x, size of the vector.
///@param int samples, number of templates this spider is going to use.
|
13c2a7d4
Pavel Govyadinov
some changes to t...
|
874
875
|
gl_spider
(float pos_x, float pos_y, float pos_z, float dir_x, float dir_y, float dir_z,
|
3f15dade
Pavel Govyadinov
changed the plane...
|
876
|
float mag_x, int numsamples = 1089, int numsamplespos = 441, int numsamplesmag =144)
|
13c2a7d4
Pavel Govyadinov
some changes to t...
|
877
|
{
|
7d3162a2
Pavel Govyadinov
fixed majority of...
|
878
879
|
p = stim::vec3<float>(pos_x, pos_y, pos_z);
d = stim::vec3<float>(dir_x, dir_y, dir_z);
|
7f297fc6
Pavel Govyadinov
added more detail...
|
880
|
m = mag_x;
|
7d3162a2
Pavel Govyadinov
fixed majority of...
|
881
882
|
S = stim::vec3<float>(1.0,1.0,1.0);
R = stim::vec3<float>(1.0,1.0,1.0);
|
035d798f
Pavel Govyadinov
modified the spid...
|
883
884
885
|
numSamples = numsamples;
numSamplesPos = numsamplespos;
numSamplesMag = numsamplesmag;
|
4166e973
Pavel Govyadinov
Added debug tags ...
|
886
|
#ifdef DEBUG
|
47fe6300
Pavel Govyadinov
fixed an accident...
|
887
|
iter = 0;
|
4166e973
Pavel Govyadinov
Added debug tags ...
|
888
889
890
891
|
iter_pos = 0;
iter_dir = 0;
iter_siz = 0;
#endif
|
385d2447
Pavel Govyadinov
Checkpoint: Conve...
|
892
|
}
|
ac430567
Pavel Govyadinov
comments comments...
|
893
894
895
896
897
898
899
|
///Position constructor: vecs of floats.
///@param stim::vec<float> pos, position.
///@param stim::vec<float> dir, direction.
///@param float mag, size of the vector.
///@param int samples, number of templates this spider is going to use.
gl_spider
|
7d3162a2
Pavel Govyadinov
fixed majority of...
|
900
|
(stim::vec3<float> pos, stim::vec3<float> dir, float mag, int samples = 1089, int samplesPos = 441, int samplesMag = 144)
|
ac430567
Pavel Govyadinov
comments comments...
|
901
902
903
|
{
p = pos;
d = dir;
|
7f297fc6
Pavel Govyadinov
added more detail...
|
904
|
m = mag;
|
7d3162a2
Pavel Govyadinov
fixed majority of...
|
905
906
|
S = vec3<float>(1.0,1.0,1.0);
R = vec3<float>(1.0,1.0,1.0);
|
ac430567
Pavel Govyadinov
comments comments...
|
907
|
numSamples = samples;
|
035d798f
Pavel Govyadinov
modified the spid...
|
908
909
|
numSamplesPos = samplesPos;
numSamplesMag = samplesMag;
|
4166e973
Pavel Govyadinov
Added debug tags ...
|
910
|
#ifdef DEBUG
|
47fe6300
Pavel Govyadinov
fixed an accident...
|
911
|
iter = 0;
|
4166e973
Pavel Govyadinov
Added debug tags ...
|
912
913
914
915
|
iter_pos = 0;
iter_dir = 0;
iter_siz = 0;
#endif
|
ac430567
Pavel Govyadinov
comments comments...
|
916
917
|
}
|
8303b04d
Pavel Govyadinov
fixed the bug and...
|
918
|
///destructor deletes all the texture and buffer objects.
|
8e56a0a7
Pavel Govyadinov
Added the propose...
|
919
920
921
922
|
~gl_spider
(void)
{
Unbind();
|
7f297fc6
Pavel Govyadinov
added more detail...
|
923
924
925
926
927
928
|
glDeleteTextures(1, &direction_texID);
glDeleteBuffers(1, &direction_buffID);
glDeleteTextures(1, &position_texID);
glDeleteBuffers(1, &position_buffID);
glDeleteTextures(1, &radius_texID);
glDeleteBuffers(1, &radius_buffID);
|
97508a2e
Pavel Govyadinov
Added mehtods for...
|
929
930
|
glDeleteTextures(1, &length_texID);
glDeleteBuffers(1, &length_buffID);
|
7f297fc6
Pavel Govyadinov
added more detail...
|
931
932
|
glDeleteTextures(1, &cylinder_texID);
glDeleteBuffers(1, &cylinder_buffID);
|
8e56a0a7
Pavel Govyadinov
Added the propose...
|
933
934
|
}
|
ac430567
Pavel Govyadinov
comments comments...
|
935
|
///@param GLuint id, texture that is going to be sampled.
|
385d2447
Pavel Govyadinov
Checkpoint: Conve...
|
936
|
///Attached the spider to the texture with the given GLuint ID.
|
8e56a0a7
Pavel Govyadinov
Added the propose...
|
937
|
///Samples in the default d acting as the init method.
|
266aa74a
Pavel Govyadinov
CHECKPOINT: Minor...
|
938
|
///Also acts an init.
|
a9b45efe
Pavel Govyadinov
changes to spider
|
939
|
void
|
2a18be6d
Pavel Govyadinov
New comments and ...
|
940
|
attachSpider(GLuint id)
|
a9b45efe
Pavel Govyadinov
changes to spider
|
941
|
{
|
98eecaa9
David Mayerich
VS and win32 updates
|
942
943
944
945
946
947
948
949
950
|
#ifdef TIMING
branch_time = 0;
direction_time = 0;
position_time = 0;
size_time = 0;
cost_time = 0;
network_time = 0;
hit_time = 0;
#endif
|
47fe6300
Pavel Govyadinov
fixed an accident...
|
951
952
|
#ifdef DEBUG
iter = 0;
|
4166e973
Pavel Govyadinov
Added debug tags ...
|
953
954
955
|
iter_pos = 0;
iter_dir = 0;
iter_siz = 0;
|
47fe6300
Pavel Govyadinov
fixed an accident...
|
956
|
#endif
|
97508a2e
Pavel Govyadinov
Added mehtods for...
|
957
|
stepsize = 3.0;
|
7f297fc6
Pavel Govyadinov
added more detail...
|
958
|
n_pixels = 16.0;
|
98eecaa9
David Mayerich
VS and win32 updates
|
959
|
|
c0e09133
Pavel Govyadinov
STABLE: made temp...
|
960
|
srand(100);
|
a9b45efe
Pavel Govyadinov
changes to spider
|
961
|
texID = id;
|
7f297fc6
Pavel Govyadinov
added more detail...
|
962
|
GenerateFBO(n_pixels*2, numSamples*n_pixels, direction_texID, direction_buffID);
|
c0e09133
Pavel Govyadinov
STABLE: made temp...
|
963
|
CHECK_OPENGL_ERROR
|
7f297fc6
Pavel Govyadinov
added more detail...
|
964
|
GenerateFBO(n_pixels*2, numSamplesPos*n_pixels, position_texID, position_buffID);
|
c0e09133
Pavel Govyadinov
STABLE: made temp...
|
965
|
CHECK_OPENGL_ERROR
|
7f297fc6
Pavel Govyadinov
added more detail...
|
966
|
GenerateFBO(n_pixels*2, numSamplesMag*n_pixels, radius_texID, radius_buffID);
|
97508a2e
Pavel Govyadinov
Added mehtods for...
|
967
968
|
CHECK_OPENGL_ERROR
GenerateFBO(n_pixels*2, numSamplesMag*n_pixels, length_texID, length_buffID);
|
c0e09133
Pavel Govyadinov
STABLE: made temp...
|
969
|
CHECK_OPENGL_ERROR
|
7f297fc6
Pavel Govyadinov
added more detail...
|
970
|
GenerateFBO(16, 216, cylinder_texID, cylinder_buffID);
|
c0e09133
Pavel Govyadinov
STABLE: made temp...
|
971
|
CHECK_OPENGL_ERROR
|
09049866
Pavel Govyadinov
fixed a drawing b...
|
972
|
t_dir.MapCudaTexture(direction_texID, GL_TEXTURE_2D);
|
c37611a6
Pavel Govyadinov
removed the time ...
|
973
|
t_dir.Alloc(numSamples);
|
7f297fc6
Pavel Govyadinov
added more detail...
|
974
|
t_pos.MapCudaTexture(position_texID, GL_TEXTURE_2D);
|
c37611a6
Pavel Govyadinov
removed the time ...
|
975
|
t_pos.Alloc(numSamplesPos);
|
7f297fc6
Pavel Govyadinov
added more detail...
|
976
|
t_mag.MapCudaTexture(radius_texID, GL_TEXTURE_2D);
|
c37611a6
Pavel Govyadinov
removed the time ...
|
977
|
t_mag.Alloc(numSamplesMag);
|
8303b04d
Pavel Govyadinov
fixed the bug and...
|
978
979
|
t_len.MapCudaTexture(length_texID, GL_TEXTURE_2D);
t_len.Alloc(numSamplesMag);
|
5eeaf941
Pavel Govyadinov
changer to the ba...
|
980
|
setMatrix();
|
8303b04d
Pavel Govyadinov
fixed the bug and...
|
981
|
dList = glGenLists(4);
|
db3c28c9
Pavel Govyadinov
Implemented glDis...
|
982
|
glListBase(dList);
|
7f297fc6
Pavel Govyadinov
added more detail...
|
983
|
Bind(direction_texID, direction_buffID, numSamples, n_pixels);
|
b50c840e
David Mayerich
eliminated ANN fr...
|
984
|
genDirectionVectors(5*stim::PI/4);
|
3f15dade
Pavel Govyadinov
changed the plane...
|
985
|
Unbind();
|
7f297fc6
Pavel Govyadinov
added more detail...
|
986
|
Bind(position_texID, position_buffID, numSamplesPos, n_pixels);
|
4166e973
Pavel Govyadinov
Added debug tags ...
|
987
|
genPositionVectors(0.2);
|
3f15dade
Pavel Govyadinov
changed the plane...
|
988
|
Unbind();
|
7f297fc6
Pavel Govyadinov
added more detail...
|
989
|
Bind(radius_texID, radius_buffID, numSamplesMag, n_pixels);
|
035d798f
Pavel Govyadinov
modified the spid...
|
990
|
genMagnitudeVectors();
|
3f15dade
Pavel Govyadinov
changed the plane...
|
991
|
Unbind();
|
97508a2e
Pavel Govyadinov
Added mehtods for...
|
992
993
994
|
Bind(length_texID, length_buffID, numSamplesMag, n_pixels);
genLengthVectors();
Unbind();
|
a39577bf
Pavel Govyadinov
Changes to the sp...
|
995
|
}
|
5f81932b
David Mayerich
restored Pavel's ...
|
996
|
|
266aa74a
Pavel Govyadinov
CHECKPOINT: Minor...
|
997
998
999
|
//--------------------------------------------------------------------------//
//-----------------------------ACCESS METHODS-------------------------------//
//--------------------------------------------------------------------------//
|
8e56a0a7
Pavel Govyadinov
Added the propose...
|
1000
|
///Returns the p vector.
|
7d3162a2
Pavel Govyadinov
fixed majority of...
|
1001
|
vec3<float>
|
a39577bf
Pavel Govyadinov
Changes to the sp...
|
1002
|
getPosition()
|
fb0bc2f1
Pavel Govyadinov
added the gl_spid...
|
1003
|
{
|
8e56a0a7
Pavel Govyadinov
Added the propose...
|
1004
|
return p;
|
fb0bc2f1
Pavel Govyadinov
added the gl_spid...
|
1005
1006
|
}
|
8e56a0a7
Pavel Govyadinov
Added the propose...
|
1007
|
///Returns the d vector.
|
7d3162a2
Pavel Govyadinov
fixed majority of...
|
1008
|
vec3<float>
|
a39577bf
Pavel Govyadinov
Changes to the sp...
|
1009
|
getDirection()
|
fb0bc2f1
Pavel Govyadinov
added the gl_spid...
|
1010
|
{
|
8e56a0a7
Pavel Govyadinov
Added the propose...
|
1011
|
return d;
|
fb0bc2f1
Pavel Govyadinov
added the gl_spid...
|
1012
1013
|
}
|
8e56a0a7
Pavel Govyadinov
Added the propose...
|
1014
|
///Returns the m vector.
|
09049866
Pavel Govyadinov
fixed a drawing b...
|
1015
|
float
|
a39577bf
Pavel Govyadinov
Changes to the sp...
|
1016
|
getMagnitude()
|
fb0bc2f1
Pavel Govyadinov
added the gl_spid...
|
1017
|
{
|
8e56a0a7
Pavel Govyadinov
Added the propose...
|
1018
|
return m;
|
fb0bc2f1
Pavel Govyadinov
added the gl_spid...
|
1019
1020
|
}
|
ac430567
Pavel Govyadinov
comments comments...
|
1021
|
///@param stim::vec<float> pos, the new p.
|
8e56a0a7
Pavel Govyadinov
Added the propose...
|
1022
|
///Sets the p vector to input vector pos.
|
fb0bc2f1
Pavel Govyadinov
added the gl_spid...
|
1023
|
void
|
7d3162a2
Pavel Govyadinov
fixed majority of...
|
1024
|
setPosition(stim::vec3<float> pos)
|
fb0bc2f1
Pavel Govyadinov
added the gl_spid...
|
1025
|
{
|
8e56a0a7
Pavel Govyadinov
Added the propose...
|
1026
|
p = pos;
|
fb0bc2f1
Pavel Govyadinov
added the gl_spid...
|
1027
|
}
|
385d2447
Pavel Govyadinov
Checkpoint: Conve...
|
1028
|
|
ac430567
Pavel Govyadinov
comments comments...
|
1029
1030
1031
|
///@param float x x-coordinate.
///@param float y y-coordinate.
///@param float z z-coordinate.
|
8e56a0a7
Pavel Govyadinov
Added the propose...
|
1032
|
///Sets the p vector to the input float coordinates x,y,z.
|
fb0bc2f1
Pavel Govyadinov
added the gl_spid...
|
1033
1034
1035
|
void
setPosition(float x, float y, float z)
{
|
8e56a0a7
Pavel Govyadinov
Added the propose...
|
1036
1037
1038
|
p[0] = x;
p[1] = y;
p[2] = z;
|
fb0bc2f1
Pavel Govyadinov
added the gl_spid...
|
1039
|
}
|
887a3e49
Pavel Govyadinov
fixed some order ...
|
1040
|
|
ac430567
Pavel Govyadinov
comments comments...
|
1041
|
///@param stim::vec<float> dir, the new d.
|
8e56a0a7
Pavel Govyadinov
Added the propose...
|
1042
|
///Sets the d vector to input vector dir.
|
fb0bc2f1
Pavel Govyadinov
added the gl_spid...
|
1043
|
void
|
7d3162a2
Pavel Govyadinov
fixed majority of...
|
1044
|
setDirection(stim::vec3<float> dir)
|
fb0bc2f1
Pavel Govyadinov
added the gl_spid...
|
1045
|
{
|
8e56a0a7
Pavel Govyadinov
Added the propose...
|
1046
|
d = dir;
|
fb0bc2f1
Pavel Govyadinov
added the gl_spid...
|
1047
1048
|
}
|
ac430567
Pavel Govyadinov
comments comments...
|
1049
1050
1051
|
///@param stim::vec<float> x x-coordinate.
///@param stim::vec<float> y y-coordinate.
///@param stim::vec<float> z z-coordinate.
|
8e56a0a7
Pavel Govyadinov
Added the propose...
|
1052
|
///Sets the d vector to the input float coordinates x,y,z.
|
fb0bc2f1
Pavel Govyadinov
added the gl_spid...
|
1053
1054
1055
|
void
setDirection(float x, float y, float z)
{
|
8e56a0a7
Pavel Govyadinov
Added the propose...
|
1056
1057
1058
|
d[0] = x;
d[1] = y;
d[2] = z;
|
fb0bc2f1
Pavel Govyadinov
added the gl_spid...
|
1059
|
}
|
385d2447
Pavel Govyadinov
Checkpoint: Conve...
|
1060
|
|
fb0bc2f1
Pavel Govyadinov
added the gl_spid...
|
1061
|
|
ac430567
Pavel Govyadinov
comments comments...
|
1062
|
///@param float mag, size of the sampled region.
|
97508a2e
Pavel Govyadinov
Added mehtods for...
|
1063
|
///Sets the m value to the input mag for both templates.
|
fb0bc2f1
Pavel Govyadinov
added the gl_spid...
|
1064
|
void
|
5f81932b
David Mayerich
restored Pavel's ...
|
1065
|
setMagnitude(float mag)
|
fb0bc2f1
Pavel Govyadinov
added the gl_spid...
|
1066
|
{
|
7f297fc6
Pavel Govyadinov
added more detail...
|
1067
|
m = mag;
|
fb0bc2f1
Pavel Govyadinov
added the gl_spid...
|
1068
|
}
|
97508a2e
Pavel Govyadinov
Added mehtods for...
|
1069
1070
1071
1072
1073
1074
1075
1076
|
///@param float len, length of the sampled region.
///Sets the length value to the input len for both templates.
void
setLength(float len)
{
length = len;
}
|
5f81932b
David Mayerich
restored Pavel's ...
|
1077
|
|
ac430567
Pavel Govyadinov
comments comments...
|
1078
1079
1080
1081
|
///@param float x, voxel size in the x direction.
///@param float y, voxel size in the y direction.
///@param float z, voxel size in the z direction.
///Sets the voxel sizes in each direction. necessary for non-standard data.
|
8e56a0a7
Pavel Govyadinov
Added the propose...
|
1082
1083
1084
1085
1086
1087
1088
1089
|
void
setDims(float x, float y, float z)
{
S[0] = x;
S[1] = y;
S[2] = z;
}
|
ac430567
Pavel Govyadinov
comments comments...
|
1090
1091
1092
|
///@param stim::vec<float> Dims, voxel size.
///Sets the voxel sizes in each direction. necessary for non-standard data.
void
|
7d3162a2
Pavel Govyadinov
fixed majority of...
|
1093
|
setDims(stim::vec3<float> Dims)
|
ac430567
Pavel Govyadinov
comments comments...
|
1094
1095
1096
1097
1098
1099
1100
1101
|
{
S = Dims;
}
///@param float x, size of the data in the x direction.
///@param float y, size of the data in the y direction.
///@param float z, size of the data in the z direction.
///Sets the data volume sizes in each direction.
|
b710b044
Pavel Govyadinov
Added more tempor...
|
1102
|
void
|
8e56a0a7
Pavel Govyadinov
Added the propose...
|
1103
|
setSize(float x, float y, float z)
|
b710b044
Pavel Govyadinov
Added more tempor...
|
1104
|
{
|
8e56a0a7
Pavel Govyadinov
Added the propose...
|
1105
1106
1107
|
R[0] = x;
R[1] = y;
R[2] = z;
|
b710b044
Pavel Govyadinov
Added more tempor...
|
1108
|
}
|
ac430567
Pavel Govyadinov
comments comments...
|
1109
1110
1111
1112
|
///@param stim::vec<float> Dims, size of the volume.
///Sets the data volume sizes in each direction.
void
|
7d3162a2
Pavel Govyadinov
fixed majority of...
|
1113
|
setSize(stim::vec3<float> Siz)
|
ac430567
Pavel Govyadinov
comments comments...
|
1114
1115
1116
|
{
S = Siz;
}
|
b710b044
Pavel Govyadinov
Added more tempor...
|
1117
|
|
ac430567
Pavel Govyadinov
comments comments...
|
1118
1119
1120
1121
|
///@param stim::vec<float> dir, the vector to which we are rotating.
///given a vector to align to, finds the required axis and angle for glRotatef.
///rotates from 0.0, 0.0, 1.0 to dir.
///return is in degrees for use with glRotatef.
|
5eeaf941
Pavel Govyadinov
changer to the ba...
|
1122
|
stim::vec<float>
|
4fa3f483
Pavel Govyadinov
Fixed the memory ...
|
1123
|
getRotation(stim::vec3<float> dir)
|
f304d6de
Pavel Govyadinov
added rotation to...
|
1124
|
{
|
8303b04d
Pavel Govyadinov
fixed the bug and...
|
1125
1126
1127
1128
|
stim::vec<float> out(0.0,0.0,0.0,0.0); ///The 4D rotation matrix for GL rotation
stim::vec3<float> from(0.0,0.0,1.0); ///Converting from template always involves 0,0,1 as a starting vector
out[0] = acos(dir.dot(from))*180/stim::PI; ///angle of rotation
if(out[0] < 1.0){
|
f304d6de
Pavel Govyadinov
added rotation to...
|
1129
1130
1131
1132
|
out[0] = 0.0;
out[1] = 0.0;
out[2] = 0.0;
out[3] = 1.0;
|
8303b04d
Pavel Govyadinov
fixed the bug and...
|
1133
1134
|
} ///if we rotate less what one degree don't rotate
else if(out[0] < -179.0) ///if we rotate more than -179 degrees rotate 180.
|
f7b84fb2
Pavel Govyadinov
more debug statem...
|
1135
1136
1137
1138
1139
|
{
out[0] = 180.0;
out[1] = 1.0;
out[2] = 0.0;
out[3] = 0.0;
|
8303b04d
Pavel Govyadinov
fixed the bug and...
|
1140
|
} else { ///the rotational axis is the cross fromxdir.
|
4166e973
Pavel Govyadinov
Added debug tags ...
|
1141
1142
|
stim::vec3<float> temp(0.0, 0.0, 0.0);;
temp = (from.cross(dir)).norm();
|
f304d6de
Pavel Govyadinov
added rotation to...
|
1143
1144
1145
1146
|
out[1] = temp[0];
out[2] = temp[1];
out[3] = temp[2];
}
|
97508a2e
Pavel Govyadinov
Added mehtods for...
|
1147
1148
1149
1150
|
#ifdef DEBUG
std::cout << "out is " << out << std::endl;
std::cout << "when rotating from " << from << " to " << dir << std::endl;
#endif
|
f304d6de
Pavel Govyadinov
added rotation to...
|
1151
1152
|
return out;
}
|
84eff8b1
Pavel Govyadinov
Merged only the n...
|
1153
|
|
ac430567
Pavel Govyadinov
comments comments...
|
1154
|
///@param stim::vec<float> pos, the position of the seed to be added.
|
84eff8b1
Pavel Govyadinov
Merged only the n...
|
1155
1156
1157
|
///Adds a seed to the seed list.
///Assumes that the coordinates passes are in tissue space.
void
|
7d3162a2
Pavel Govyadinov
fixed majority of...
|
1158
|
setSeed(stim::vec3<float> pos)
|
a9b45efe
Pavel Govyadinov
changes to spider
|
1159
|
{
|
84eff8b1
Pavel Govyadinov
Merged only the n...
|
1160
|
seeds.push(pos);
|
a9b45efe
Pavel Govyadinov
changes to spider
|
1161
|
}
|
fb0bc2f1
Pavel Govyadinov
added the gl_spid...
|
1162
|
|
ac430567
Pavel Govyadinov
comments comments...
|
1163
1164
|
///@param stim::vec<float> dir, the direction of the seed to be added.
///Adds a seed to the seed directions list.
|
79a9bf3f
Pavel Govyadinov
new implementatio...
|
1165
|
void
|
7d3162a2
Pavel Govyadinov
fixed majority of...
|
1166
|
setSeedVec(stim::vec3<float> dir)
|
59781ee3
Pavel Govyadinov
fixed a stask bug...
|
1167
1168
1169
1170
|
{
seedsvecs.push(dir);
}
|
ac430567
Pavel Govyadinov
comments comments...
|
1171
1172
1173
|
///@param float mag, the size of the seed to be added.
///Adds a seed to the seed list.
///Assumes that the coordinates passes are in tissue space.
|
59781ee3
Pavel Govyadinov
fixed a stask bug...
|
1174
1175
|
void
setSeedMag(float mag)
|
79a9bf3f
Pavel Govyadinov
new implementatio...
|
1176
|
{
|
59781ee3
Pavel Govyadinov
fixed a stask bug...
|
1177
|
seedsmags.push(mag);
|
84eff8b1
Pavel Govyadinov
Merged only the n...
|
1178
|
}
|
79a9bf3f
Pavel Govyadinov
new implementatio...
|
1179
|
|
59781ee3
Pavel Govyadinov
fixed a stask bug...
|
1180
|
|
ac430567
Pavel Govyadinov
comments comments...
|
1181
1182
1183
|
///@param float x, x-position of the seed to be added.
///@param float y, y-position of the seed to be added.
///@param float z, z-position of the seed to be added.
|
84eff8b1
Pavel Govyadinov
Merged only the n...
|
1184
1185
1186
1187
1188
|
///Adds a seed to the seed list.
///Assumes that the coordinates passes are in tissue space.
void
setSeed(float x, float y, float z)
{
|
84eff8b1
Pavel Govyadinov
Merged only the n...
|
1189
1190
1191
|
seeds.push(stim::vec<float>(x, y, z));
}
|
ac430567
Pavel Govyadinov
comments comments...
|
1192
1193
1194
1195
|
///@param float x, x-direction of the seed to be added.
///@param float y, y-direction of the seed to be added.
///@param float z, z-direction of the seed to be added.
///Adds a seed to the seed directions list.
|
84eff8b1
Pavel Govyadinov
Merged only the n...
|
1196
1197
1198
|
void
setSeedVec(float x, float y, float z)
{
|
84eff8b1
Pavel Govyadinov
Merged only the n...
|
1199
1200
|
seedsvecs.push(stim::vec<float>(x, y, z));
}
|
ac430567
Pavel Govyadinov
comments comments...
|
1201
1202
|
///Method to get the top of the seed positions stack.
|
7d3162a2
Pavel Govyadinov
fixed majority of...
|
1203
|
stim::vec3<float>
|
84eff8b1
Pavel Govyadinov
Merged only the n...
|
1204
1205
|
getLastSeed()
{
|
7d3162a2
Pavel Govyadinov
fixed majority of...
|
1206
|
stim::vec3<float> tp = seeds.top();
|
84eff8b1
Pavel Govyadinov
Merged only the n...
|
1207
1208
1209
|
return tp;
}
|
ac430567
Pavel Govyadinov
comments comments...
|
1210
|
///Method to get the top of the seed direction stack.
|
7d3162a2
Pavel Govyadinov
fixed majority of...
|
1211
|
stim::vec3<float>
|
59781ee3
Pavel Govyadinov
fixed a stask bug...
|
1212
1213
|
getLastSeedVec()
{
|
7d3162a2
Pavel Govyadinov
fixed majority of...
|
1214
|
stim::vec3<float> tp = seedsvecs.top();
|
59781ee3
Pavel Govyadinov
fixed a stask bug...
|
1215
1216
1217
|
return tp;
}
|
ac430567
Pavel Govyadinov
comments comments...
|
1218
|
///Method to get the top of the seed magnitude stack.
|
59781ee3
Pavel Govyadinov
fixed a stask bug...
|
1219
1220
1221
1222
1223
1224
1225
|
float
getLastSeedMag()
{
float tp = seedsmags.top();
return tp;
}
|
ac430567
Pavel Govyadinov
comments comments...
|
1226
|
///deletes all data associated with the last seed.
|
59781ee3
Pavel Govyadinov
fixed a stask bug...
|
1227
1228
1229
1230
1231
|
void
popSeed()
{
seeds.pop();
seedsvecs.pop();
|
6707e8f5
Pavel Govyadinov
handled the case ...
|
1232
|
seedsmags.pop();
|
59781ee3
Pavel Govyadinov
fixed a stask bug...
|
1233
|
}
|
ac430567
Pavel Govyadinov
comments comments...
|
1234
1235
|
///returns the seeds position stack.
|
7d3162a2
Pavel Govyadinov
fixed majority of...
|
1236
|
std::stack<stim::vec3<float> >
|
84eff8b1
Pavel Govyadinov
Merged only the n...
|
1237
1238
1239
1240
1241
|
getSeeds()
{
return seeds;
}
|
efe7b7cc
Pavel Govyadinov
Added a detailed ...
|
1242
1243
1244
1245
1246
1247
1248
1249
1250
1251
1252
1253
1254
1255
1256
1257
1258
1259
1260
1261
1262
1263
1264
1265
1266
1267
1268
1269
1270
1271
1272
1273
1274
1275
1276
1277
1278
1279
1280
1281
1282
|
///sets the number of direction templates.
void
setNumberDirectionTemplates(int n)
{
numSamples = n;
}
///sets the number of position templates.
void
setNumberPositionTemplates(int n)
{
numSamplesPos = n;
}
///sets the number of position templates.
void
setNumberSizeTemplates(int n)
{
numSamplesMag = n;
}
#ifdef TIMING
///Returns the timings at the moment the method is called.
///In the following order: Branch, Direction, Position, Size, Cost, Network, Hit_detetion.
std::vector<double>
getTimings()
{
std::vector <double> ret;
ret.resize(7);
ret[0] = branch_time;
ret[1] = direction_time;
ret[2] = position_time;
ret[3] = size_time;
ret[4] = cost_time;
ret[5] = network_time;
ret[6] = hit_time;
return ret;
}
#endif
|
ac430567
Pavel Govyadinov
comments comments...
|
1283
|
///returns true if all seed stacks are empty, else false.
|
84eff8b1
Pavel Govyadinov
Merged only the n...
|
1284
1285
1286
|
bool
Empty()
{
|
ac430567
Pavel Govyadinov
comments comments...
|
1287
|
//return (seeds.empty() && seedsvecs.empty() && seedsmags.empty());
|
1306fd96
Pavel Govyadinov
minor bug fixes i...
|
1288
|
return (seeds.empty() && seedsvecs.empty());
|
84eff8b1
Pavel Govyadinov
Merged only the n...
|
1289
|
}
|
ac430567
Pavel Govyadinov
comments comments...
|
1290
1291
1292
|
///@param std::string file:file with variables to populate the seed stacks.
///Adds a seed to the seed list, including the position, direction and magnitude.
|
84eff8b1
Pavel Govyadinov
Merged only the n...
|
1293
1294
1295
1296
|
///Assumes that the coordinates passes are in tissue space.
void
setSeeds(std::string file)
{
|
8303b04d
Pavel Govyadinov
fixed the bug and...
|
1297
|
std::ifstream myfile(file.c_str()); ///open a stream
|
84eff8b1
Pavel Govyadinov
Merged only the n...
|
1298
1299
1300
1301
1302
|
string line;
if(myfile.is_open())
{
while (getline(myfile, line))
{
|
8303b04d
Pavel Govyadinov
fixed the bug and...
|
1303
|
float x, y, z, u, v, w, m; ///read the xyz uvw and m coordinates.
|
ac430567
Pavel Govyadinov
comments comments...
|
1304
|
myfile >> x >> y >> z >> u >> v >> w >> m;
|
8761b649
Pavel Govyadinov
moved a lot of th...
|
1305
|
setSeed(x, y, z);
|
ac430567
Pavel Govyadinov
comments comments...
|
1306
1307
|
setSeedVec(u, v, w);
setSeedMag(m);
|
84eff8b1
Pavel Govyadinov
Merged only the n...
|
1308
1309
1310
1311
1312
|
}
myfile.close();
} else {
std::cerr<<"failed" << std::endl;
}
|
79a9bf3f
Pavel Govyadinov
new implementatio...
|
1313
1314
|
}
|
ac430567
Pavel Govyadinov
comments comments...
|
1315
|
///Saves the network to a file.
|
79a9bf3f
Pavel Govyadinov
new implementatio...
|
1316
|
void
|
84eff8b1
Pavel Govyadinov
Merged only the n...
|
1317
|
saveNetwork(std::string name)
|
79a9bf3f
Pavel Govyadinov
new implementatio...
|
1318
|
{
|
0311ab81
Pavel Govyadinov
fixed some issues...
|
1319
|
/* stim::glObj<float> sk;
|
8761b649
Pavel Govyadinov
moved a lot of th...
|
1320
1321
1322
|
for(int i = 0; i < nt.sizeE(); i++)
{
std::vector<stim::vec< float > > cm = nt.getEdgeCenterLineMag(i);
|
7d3162a2
Pavel Govyadinov
fixed majority of...
|
1323
|
std::vector<stim::vec3< float > > ce = nt.getEdgeCenterLine(i);
|
8761b649
Pavel Govyadinov
moved a lot of th...
|
1324
1325
1326
1327
1328
1329
1330
1331
|
sk.Begin(stim::OBJ_LINE);
for(int j = 0; j < ce.size(); j++)
{
sk.TexCoord(cm[j][0]);
sk.Vertex(ce[j][0], ce[j][1], ce[j][2]);
}
sk.End();
}
|
0311ab81
Pavel Govyadinov
fixed some issues...
|
1332
|
*/ sk.save(name);
|
79a9bf3f
Pavel Govyadinov
new implementatio...
|
1333
|
}
|
84eff8b1
Pavel Govyadinov
Merged only the n...
|
1334
|
|
8761b649
Pavel Govyadinov
moved a lot of th...
|
1335
|
///Depreciated, but might be reused later()
|
ac430567
Pavel Govyadinov
comments comments...
|
1336
|
///returns a COPY of the entire stim::glObj object.
|
84eff8b1
Pavel Govyadinov
Merged only the n...
|
1337
1338
1339
|
stim::glObj<float>
getNetwork()
{
|
0311ab81
Pavel Govyadinov
fixed some issues...
|
1340
|
return sk;
|
84eff8b1
Pavel Govyadinov
Merged only the n...
|
1341
|
}
|
ac430567
Pavel Govyadinov
comments comments...
|
1342
1343
1344
1345
1346
1347
1348
|
///returns a COPY of the entire stim::glnetwork object.
stim::glnetwork<T>
getGLNetwork()
{
return nt;
}
|
84eff8b1
Pavel Govyadinov
Merged only the n...
|
1349
1350
1351
1352
1353
1354
|
///Function to get back the framebuffer Object attached to the spider.
///For external access.
GLuint
getFB()
{
|
7f297fc6
Pavel Govyadinov
added more detail...
|
1355
|
return cylinder_buffID;
|
84eff8b1
Pavel Govyadinov
Merged only the n...
|
1356
1357
|
}
|
266aa74a
Pavel Govyadinov
CHECKPOINT: Minor...
|
1358
1359
1360
1361
1362
1363
1364
1365
|
//--------------------------------------------------------------------------//
//-----------------------------TEMPORARY METHODS----------------------------//
//--------------------------------------------------------------------------//
///temporary Method necessary for visualization and testing.
void
Update()
{
|
7d3162a2
Pavel Govyadinov
fixed majority of...
|
1366
|
vec3<float> Y(1.0,0.0,0.0);
|
8e56a0a7
Pavel Govyadinov
Added the propose...
|
1367
|
if(cos(Y.dot(d))< 0.087){
|
266aa74a
Pavel Govyadinov
CHECKPOINT: Minor...
|
1368
|
Y[0] = 0.0; Y[1] = 1.0;}
|
8e56a0a7
Pavel Govyadinov
Added the propose...
|
1369
1370
1371
|
hor = stim::rect<float>(m, p, d.norm(),
((Y.cross(d)).cross(d)).norm());
ver = stim::rect<float>(m, p, d.norm(),
|
266aa74a
Pavel Govyadinov
CHECKPOINT: Minor...
|
1372
1373
1374
1375
|
hor.n());
}
|
c4887649
Pavel Govyadinov
fixed a significa...
|
1376
|
int
|
13c2a7d4
Pavel Govyadinov
some changes to t...
|
1377
1378
|
Step()
{
|
4166e973
Pavel Govyadinov
Added debug tags ...
|
1379
|
#ifdef DEBUG
|
09049866
Pavel Govyadinov
fixed a drawing b...
|
1380
|
std::cerr << "Took a step" << std::endl;
|
4166e973
Pavel Govyadinov
Added debug tags ...
|
1381
|
#endif
|
7f297fc6
Pavel Govyadinov
added more detail...
|
1382
|
Bind(direction_texID, direction_buffID, numSamples, n_pixels);
|
84eff8b1
Pavel Govyadinov
Merged only the n...
|
1383
|
CHECK_OPENGL_ERROR
|
035d798f
Pavel Govyadinov
modified the spid...
|
1384
|
findOptimalDirection();
|
3f15dade
Pavel Govyadinov
changed the plane...
|
1385
|
Unbind();
|
7f297fc6
Pavel Govyadinov
added more detail...
|
1386
|
Bind(position_texID, position_buffID, numSamplesPos, n_pixels);
|
035d798f
Pavel Govyadinov
modified the spid...
|
1387
|
findOptimalPosition();
|
3f15dade
Pavel Govyadinov
changed the plane...
|
1388
|
Unbind();
|
7f297fc6
Pavel Govyadinov
added more detail...
|
1389
|
Bind(radius_texID, radius_buffID, numSamplesMag, n_pixels);
|
97508a2e
Pavel Govyadinov
Added mehtods for...
|
1390
|
findOptimalRadius();
|
3f15dade
Pavel Govyadinov
changed the plane...
|
1391
|
Unbind();
|
84eff8b1
Pavel Govyadinov
Merged only the n...
|
1392
1393
|
CHECK_OPENGL_ERROR
|
59781ee3
Pavel Govyadinov
fixed a stask bug...
|
1394
1395
1396
|
return current_cost;
}
|
556c4e15
Pavel Govyadinov
Changed the handl...
|
1397
1398
1399
1400
|
void
printTransform()
{
|
8e56a0a7
Pavel Govyadinov
Added the propose...
|
1401
|
std::cout << cT << std::endl;
|
b710b044
Pavel Govyadinov
Added more tempor...
|
1402
|
}
|
a9b45efe
Pavel Govyadinov
changes to spider
|
1403
|
|
f31bf86d
Pavel Govyadinov
Added skeleton fu...
|
1404
1405
1406
1407
1408
1409
|
//--------------------------------------------------------------------------//
//-----------------------------EXPERIMENTAL METHODS-------------------------//
//--------------------------------------------------------------------------//
void
|
34ec8a82
David Mayerich
added comments
|
1410
|
MonteCarloDirectionVectors(int nSamples, float solidAngle = stim::TAU)
|
efe7b7cc
Pavel Govyadinov
Added a detailed ...
|
1411
|
{
|
0311ab81
Pavel Govyadinov
fixed some issues...
|
1412
1413
1414
|
// float PHI[2];//, Z[2];//, range;
// PHI[0] = asin(solidAngle/2);
// PHI[1] = asin(0);
|
efe7b7cc
Pavel Govyadinov
Added a detailed ...
|
1415
|
|
0311ab81
Pavel Govyadinov
fixed some issues...
|
1416
1417
|
// Z[0] = cos(PHI[0]);
// Z[1] = cos(PHI[1]);
|
efe7b7cc
Pavel Govyadinov
Added a detailed ...
|
1418
|
|
0311ab81
Pavel Govyadinov
fixed some issues...
|
1419
|
// range = Z[0] - Z[1];
|
efe7b7cc
Pavel Govyadinov
Added a detailed ...
|
1420
|
|
efe7b7cc
Pavel Govyadinov
Added a detailed ...
|
1421
1422
1423
1424
1425
1426
1427
1428
1429
1430
1431
1432
1433
1434
1435
1436
1437
|
std::vector<stim::vec3<float> > vecsUni;
for(int i = 0; i < numSamplesPos; i++)
{
stim::vec3<float> a(uniformRandom()*0.8, uniformRandom()*0.8, 0.0);
a[0] = a[0]-0.4;
a[1] = a[1]-0.4;
vecsUni.push_back(a);
}
stringstream name;
for(int i = 0; i < numSamplesPos; i++)
name << vecsUni[i].str() << std::endl;
std::ofstream outFile;
outFile.open("New_Pos_Vectors.txt");
outFile << name.str().c_str();
}
|
97508a2e
Pavel Govyadinov
Added mehtods for...
|
1438
|
/*
|
efe7b7cc
Pavel Govyadinov
Added a detailed ...
|
1439
|
void
|
f31bf86d
Pavel Govyadinov
Added skeleton fu...
|
1440
1441
|
DrawCylinder()
{
|
f31bf86d
Pavel Govyadinov
Added skeleton fu...
|
1442
1443
|
glNewList(dList+3, GL_COMPILE);
float z0 = -0.5; float z1 = 0.5; float r0 = 0.5;
|
97508a2e
Pavel Govyadinov
Added mehtods for...
|
1444
|
float x,y;
|
84eff8b1
Pavel Govyadinov
Merged only the n...
|
1445
|
float xold = 0.5; float yold = 0.0;
|
ac430567
Pavel Govyadinov
comments comments...
|
1446
1447
|
float step = 360.0/numSamples*32;
//float step = 360.0/8.0;
|
f31bf86d
Pavel Govyadinov
Added skeleton fu...
|
1448
1449
|
glEnable(GL_TEXTURE_3D);
glBindTexture(GL_TEXTURE_3D, texID);
|
ac430567
Pavel Govyadinov
comments comments...
|
1450
|
glBegin(GL_QUAD_STRIP);
|
84eff8b1
Pavel Govyadinov
Merged only the n...
|
1451
|
int j = 0;
|
f31bf86d
Pavel Govyadinov
Added skeleton fu...
|
1452
1453
|
for(float i = step; i <= 360.0; i += step)
{
|
b50c840e
David Mayerich
eliminated ANN fr...
|
1454
1455
|
x=r0*cos(i*stim::TAU/360.0);
y=r0*sin(i*stim::TAU/360.0);
|
f31bf86d
Pavel Govyadinov
Added skeleton fu...
|
1456
|
glTexCoord3f(x,y,z0);
|
ac430567
Pavel Govyadinov
comments comments...
|
1457
1458
|
glVertex2f(0.0, j*6.4+6.4);
// glVertex2f(0.0, j*27.0+27.0);
|
f31bf86d
Pavel Govyadinov
Added skeleton fu...
|
1459
|
glTexCoord3f(x,y,z1);
|
ac430567
Pavel Govyadinov
comments comments...
|
1460
1461
|
glVertex2f(16.0, j*6.4+6.4);
// glVertex2f(16.0, j*27.0+27.0);
|
f31bf86d
Pavel Govyadinov
Added skeleton fu...
|
1462
|
glTexCoord3f(xold,yold,z1);
|
ac430567
Pavel Govyadinov
comments comments...
|
1463
1464
|
glVertex2f(16.0, j*6.4);
// glVertex2f(16.0, j*27.0);
|
f31bf86d
Pavel Govyadinov
Added skeleton fu...
|
1465
|
glTexCoord3f(xold,yold,z0);
|
ac430567
Pavel Govyadinov
comments comments...
|
1466
1467
|
glVertex2f(0.0, j*6.4);
// glVertex2f(0.0, j*27.0);
|
f31bf86d
Pavel Govyadinov
Added skeleton fu...
|
1468
1469
1470
1471
1472
1473
|
xold=x;
yold=y;
j++;
}
glEnd();
glEndList();
|
f31bf86d
Pavel Govyadinov
Added skeleton fu...
|
1474
|
}
|
97508a2e
Pavel Govyadinov
Added mehtods for...
|
1475
|
*/
|
8c4f5d84
Pavel Govyadinov
fixed the issue w...
|
1476
|
///need to return the cylinder.
|
7f297fc6
Pavel Govyadinov
added more detail...
|
1477
|
///SOMETHING MIGHT BE GOING ON HERE IN GENERATE BUFFER.
|
e45b97ce
Pavel Govyadinov
safety commit, I ...
|
1478
1479
1480
1481
|
void
DrawLongCylinder(int n = 8, int l_template = 8,int l_square = 8)
{
int cylLen = cL.size()-1;
|
7f297fc6
Pavel Govyadinov
added more detail...
|
1482
1483
|
GenerateFBO(n*l_square, cylLen*l_template, cylinder_texID, cylinder_buffID);
Bind(cylinder_texID, cylinder_buffID, cylLen, l_template*l_square/2.0);
|
e45b97ce
Pavel Govyadinov
safety commit, I ...
|
1484
|
stim::cylinder<float> cyl(cL, cM);
|
7d3162a2
Pavel Govyadinov
fixed majority of...
|
1485
|
std::vector<std::vector<stim::vec3<float> > > p = cyl.getPoints(n);
|
e45b97ce
Pavel Govyadinov
safety commit, I ...
|
1486
1487
1488
1489
1490
1491
1492
1493
1494
1495
1496
1497
1498
1499
1500
1501
1502
1503
1504
1505
1506
|
for(int i = 0; i < p.size()-1; i++) ///number of circles
{
for(int j = 0; j < p[0].size()-1; j++) ///points in the circle
{
glBegin(GL_QUADS);
glTexCoord3f(p[i][j][0], p[i][j][1], p[i][j][2]);
glVertex2f(j*l_square, i*(float)l_template);
glTexCoord3f(p[i][j+1][0], p[i][j+1][1], p[i][j+1][2]);
glVertex2f(j*l_square+l_square, i*(float)l_template);
glTexCoord3f(p[i+1][j+1][0], p[i+1][j+1][1], p[i+1][j+1][2]);
glVertex2f(j*l_square+l_square, i*(float)l_template+(float)l_template);
glTexCoord3f(p[i+1][j][0], p[i+1][j][1], p[i+1][j][2]);
glVertex2f(j*l_square,i*(float)l_template+(float)l_template);
glEnd();
}
}
Unbind();
}
|
84eff8b1
Pavel Govyadinov
Merged only the n...
|
1507
1508
1509
1510
1511
1512
1513
|
///@param min_cost the cost value used for tracing
///traces out each seedpoint in the seeds queue to completion in both directions.
void
trace(int min_cost)
{
|
7d3162a2
Pavel Govyadinov
fixed majority of...
|
1514
1515
|
stim::vec3<float> curSeed;
stim::vec3<float> curSeedVec;
|
8761b649
Pavel Govyadinov
moved a lot of th...
|
1516
1517
|
float curSeedMag;
while(!Empty())
|
84eff8b1
Pavel Govyadinov
Merged only the n...
|
1518
1519
1520
|
{
//clear the currently traced line and start a new one.
cL.clear();
|
ac430567
Pavel Govyadinov
comments comments...
|
1521
|
cM.clear();
|
8761b649
Pavel Govyadinov
moved a lot of th...
|
1522
1523
1524
1525
|
cD.clear();
curSeed = seeds.top();
curSeedVec = seedsvecs.top();
curSeedMag = seedsmags.top();
|
59781ee3
Pavel Govyadinov
fixed a stask bug...
|
1526
1527
|
seeds.pop();
seedsvecs.pop();
|
ac430567
Pavel Govyadinov
comments comments...
|
1528
|
seedsmags.pop();
|
84eff8b1
Pavel Govyadinov
Merged only the n...
|
1529
1530
|
setPosition(curSeed);
setDirection(curSeedVec);
|
8761b649
Pavel Govyadinov
moved a lot of th...
|
1531
|
setMagnitude(curSeedMag);
|
4166e973
Pavel Govyadinov
Added debug tags ...
|
1532
1533
1534
1535
1536
1537
1538
1539
1540
|
#ifdef DEBUG
std::cout << "The new seed " << curSeed << curSeedVec << curSeedMag << std::endl;
#endif
// Bind(direction_texID, direction_buffID, numSamples, n_pixels);
// CHECK_OPENGL_ERROR
// findOptimalDirection();
// Unbind();
|
ec9d82e1
Pavel Govyadinov
finished the debu...
|
1541
1542
|
//THIS IS EXPERIMENTAL
Bind(radius_texID, radius_buffID, numSamplesMag, n_pixels);
|
97508a2e
Pavel Govyadinov
Added mehtods for...
|
1543
|
findOptimalRadius();
|
ec9d82e1
Pavel Govyadinov
finished the debu...
|
1544
1545
|
Unbind();
//THIS IS EXPERIMENTAL
|
0311ab81
Pavel Govyadinov
fixed some issues...
|
1546
|
|
8761b649
Pavel Govyadinov
moved a lot of th...
|
1547
1548
1549
|
// cL.push_back(curSeed);
// cM.push_back(curSeedMag);
// cD.push_back(curSeedMag);
|
0311ab81
Pavel Govyadinov
fixed some issues...
|
1550
|
traceLine(p, m, min_cost);
|
84eff8b1
Pavel Govyadinov
Merged only the n...
|
1551
|
}
|
84eff8b1
Pavel Govyadinov
Merged only the n...
|
1552
1553
|
}
|
5de3a9c2
Pavel Govyadinov
CHECKPOINT: befo...
|
1554
|
int
|
7d3162a2
Pavel Govyadinov
fixed majority of...
|
1555
|
selectObject(stim::vec3<float> loc, stim::vec3<float> dir, float mag)
|
84eff8b1
Pavel Govyadinov
Merged only the n...
|
1556
1557
|
{
//Define the varibles and turn on Selection Mode
|
efe7b7cc
Pavel Govyadinov
Added a detailed ...
|
1558
1559
1560
1561
|
#ifdef TIMING
gpuStartTimer();
#endif
|
84eff8b1
Pavel Govyadinov
Merged only the n...
|
1562
|
|
6ada8448
Pavel Govyadinov
Reverted to 40db1...
|
1563
|
// float s = 3.0;
|
84eff8b1
Pavel Govyadinov
Merged only the n...
|
1564
1565
1566
1567
1568
|
GLuint selectBuf[2048];
GLint hits;
glSelectBuffer(2048, selectBuf);
glDisable(GL_CULL_FACE);
(void) glRenderMode(GL_SELECT);
|
84eff8b1
Pavel Govyadinov
Merged only the n...
|
1569
1570
1571
1572
1573
1574
1575
1576
|
//Init Names stack
glInitNames();
glPushName(1);
CHECK_OPENGL_ERROR
//What would that vessel see in front of it.
camSel.setPosition(loc);
|
6ada8448
Pavel Govyadinov
Reverted to 40db1...
|
1577
1578
1579
1580
|
camSel.setFocalDistance(mag/stepsize);
camSel.LookAt((loc[0]+dir[0]*mag/stepsize),
(loc[1]+dir[1]*mag/stepsize),
(loc[2]+dir[2]*mag/stepsize));
|
84eff8b1
Pavel Govyadinov
Merged only the n...
|
1581
1582
1583
1584
1585
1586
|
ps = camSel.getPosition();
ups = camSel.getUp();
ds = camSel.getLookAt();
glMatrixMode(GL_PROJECTION);
glPushMatrix();
glLoadIdentity();
|
6ada8448
Pavel Govyadinov
Reverted to 40db1...
|
1587
|
glOrtho(-mag/stepsize/2.0, mag/stepsize/2.0, -mag/stepsize/2.0, mag/stepsize/2.0, 0.0, mag/stepsize/2.0);
|
84eff8b1
Pavel Govyadinov
Merged only the n...
|
1588
1589
1590
1591
1592
1593
1594
1595
|
glMatrixMode(GL_MODELVIEW);
glPushMatrix();
glLoadIdentity();
CHECK_OPENGL_ERROR
gluLookAt(ps[0], ps[1], ps[2],
ds[0], ds[1], ds[2],
ups[0], ups[1], ups[2]);
|
23af8e36
Pavel Govyadinov
modified spider t...
|
1596
|
|
0311ab81
Pavel Govyadinov
fixed some issues...
|
1597
1598
|
sk.Render();
// nt.Render();
|
23af8e36
Pavel Govyadinov
modified spider t...
|
1599
|
|
84eff8b1
Pavel Govyadinov
Merged only the n...
|
1600
|
CHECK_OPENGL_ERROR
|
23af8e36
Pavel Govyadinov
modified spider t...
|
1601
1602
|
|
0311ab81
Pavel Govyadinov
fixed some issues...
|
1603
1604
|
glLoadName((int) sk.numL());
// glLoadName(nt.sizeE());
|
23af8e36
Pavel Govyadinov
modified spider t...
|
1605
|
|
0311ab81
Pavel Govyadinov
fixed some issues...
|
1606
1607
|
sk.RenderLine(cL);
// nt.RenderLine(cL);
|
23af8e36
Pavel Govyadinov
modified spider t...
|
1608
|
|
84eff8b1
Pavel Govyadinov
Merged only the n...
|
1609
1610
1611
1612
1613
1614
1615
1616
1617
|
// glPopName();
glFlush();
glMatrixMode(GL_PROJECTION);
glPopMatrix();
glMatrixMode(GL_MODELVIEW);
CHECK_OPENGL_ERROR
glPopMatrix();
|
59781ee3
Pavel Govyadinov
fixed a stask bug...
|
1618
|
// glEnable(GL_CULL_FACE);
|
84eff8b1
Pavel Govyadinov
Merged only the n...
|
1619
|
hits = glRenderMode(GL_RENDER);
|
5de3a9c2
Pavel Govyadinov
CHECKPOINT: befo...
|
1620
|
int found_hits = processHits(hits, selectBuf);
|
efe7b7cc
Pavel Govyadinov
Added a detailed ...
|
1621
1622
1623
1624
|
#ifdef TIMING
hit_time += gpuStopTimer();
#endif
|
84eff8b1
Pavel Govyadinov
Merged only the n...
|
1625
1626
1627
1628
1629
|
return found_hits;
}
//Given a size of the array (hits) and the memory holding it (buffer)
//returns whether a hit tool place or not.
|
5de3a9c2
Pavel Govyadinov
CHECKPOINT: befo...
|
1630
|
int
|
84eff8b1
Pavel Govyadinov
Merged only the n...
|
1631
1632
|
processHits(GLint hits, GLuint buffer[])
{
|
6ada8448
Pavel Govyadinov
Reverted to 40db1...
|
1633
|
GLuint *ptr;
|
84eff8b1
Pavel Govyadinov
Merged only the n...
|
1634
|
ptr = (GLuint *) buffer;
|
5de3a9c2
Pavel Govyadinov
CHECKPOINT: befo...
|
1635
1636
1637
|
ptr++;
ptr++; //Skip the minimum depth value.
ptr++; //Skip the maximum depth value.
|
5de3a9c2
Pavel Govyadinov
CHECKPOINT: befo...
|
1638
1639
|
|
84eff8b1
Pavel Govyadinov
Merged only the n...
|
1640
|
if(hits == 0)
|
5de3a9c2
Pavel Govyadinov
CHECKPOINT: befo...
|
1641
1642
1643
|
{
return -1;
}
|
84eff8b1
Pavel Govyadinov
Merged only the n...
|
1644
|
else
|
5de3a9c2
Pavel Govyadinov
CHECKPOINT: befo...
|
1645
|
{
|
035d798f
Pavel Govyadinov
modified the spid...
|
1646
|
// printf ("%u ", *ptr);
|
5de3a9c2
Pavel Govyadinov
CHECKPOINT: befo...
|
1647
1648
1649
1650
1651
1652
1653
1654
|
return *ptr;
}
}
void
clearCurrent()
{
cL.clear();
|
ac430567
Pavel Govyadinov
comments comments...
|
1655
|
cM.clear();
|
0311ab81
Pavel Govyadinov
fixed some issues...
|
1656
|
}
|
5de3a9c2
Pavel Govyadinov
CHECKPOINT: befo...
|
1657
|
|
0311ab81
Pavel Govyadinov
fixed some issues...
|
1658
|
/*
|
23af8e36
Pavel Govyadinov
modified spider t...
|
1659
|
void
|
7d3162a2
Pavel Govyadinov
fixed majority of...
|
1660
1661
|
addToNetwork(pair<stim::fiber<float>, int> in, stim::vec3<float> spos,
stim::vec<float> smag, stim::vec3<float> sdir)
|
23af8e36
Pavel Govyadinov
modified spider t...
|
1662
|
{
|
efe7b7cc
Pavel Govyadinov
Added a detailed ...
|
1663
1664
1665
1666
|
#ifdef TIMING
double s = std::clock();
#endif
|
7d3162a2
Pavel Govyadinov
fixed majority of...
|
1667
|
std::vector<stim::vec3<float> > ce = in.first.centerline();
|
23af8e36
Pavel Govyadinov
modified spider t...
|
1668
|
std::vector<stim::vec<float> > cm = in.first.centerlinemag();
|
6707e8f5
Pavel Govyadinov
handled the case ...
|
1669
|
//if the fiber is longer than 2 steps (the number it takes to diverge)
|
6b8621f8
Pavel Govyadinov
stable version
|
1670
|
if(ce.size() > 3)
|
6707e8f5
Pavel Govyadinov
handled the case ...
|
1671
1672
|
{
//if we did not hit a fiber
|
23af8e36
Pavel Govyadinov
modified spider t...
|
1673
1674
|
if(in.second == -1)
{
|
6707e8f5
Pavel Govyadinov
handled the case ...
|
1675
1676
1677
|
spos[0] = spos[0]-sdir[0]*smag[0]/2.;
spos[1] = spos[1]-sdir[1]*smag[0]/2.;
spos[2] = spos[2]-sdir[2]*smag[0]/2.;
|
821409d5
Pavel Govyadinov
added a way to ad...
|
1678
|
int h = selectObject(spos, -sdir, smag[0]);
|
6707e8f5
Pavel Govyadinov
handled the case ...
|
1679
|
//did we start with a fiber?
|
11c1b46b
Pavel Govyadinov
minor bug fixes a...
|
1680
|
if(h != -1 && h < nt.sizeE())
|
821409d5
Pavel Govyadinov
added a way to ad...
|
1681
1682
1683
|
nt.addEdge(ce, cm, h, -1);
else
nt.addEdge(ce, cm, -1, -1);
|
23af8e36
Pavel Govyadinov
modified spider t...
|
1684
|
}
|
6707e8f5
Pavel Govyadinov
handled the case ...
|
1685
|
//if we hit a fiber?
|
23af8e36
Pavel Govyadinov
modified spider t...
|
1686
1687
|
else if(in.second != -1)
{
|
6707e8f5
Pavel Govyadinov
handled the case ...
|
1688
1689
1690
1691
|
nt.addEdge(ce,cm,-1, in.second);
spos[0] = spos[0]-sdir[0]*smag[0]/2.;
spos[1] = spos[1]-sdir[1]*smag[0]/2.;
spos[2] = spos[2]-sdir[2]*smag[0]/2.;
|
6707e8f5
Pavel Govyadinov
handled the case ...
|
1692
1693
|
int h = selectObject(spos, -sdir, smag[0]);
//did start with a fiber?
|
11c1b46b
Pavel Govyadinov
minor bug fixes a...
|
1694
|
if(h != -1 && h < nt.sizeE()){
|
ac430567
Pavel Govyadinov
comments comments...
|
1695
1696
|
// std::cout << "got here double" << smag.str() << std::endl;
nt.addEdge(ce,cm, h, in.second);
|
27194b56
Pavel Govyadinov
major bug fixes, ...
|
1697
|
} else { nt.addEdge(ce,cm, -1, -1);}
|
23af8e36
Pavel Govyadinov
modified spider t...
|
1698
1699
|
}
}
|
efe7b7cc
Pavel Govyadinov
Added a detailed ...
|
1700
1701
|
#ifdef TIMING
|
6ada8448
Pavel Govyadinov
Reverted to 40db1...
|
1702
1703
|
double nt = (std::clock() - s) / (double) CLOCKS_PER_SEC;
network_time += nt * 1000.0;
|
efe7b7cc
Pavel Govyadinov
Added a detailed ...
|
1704
|
#endif
|
23af8e36
Pavel Govyadinov
modified spider t...
|
1705
|
}
|
0311ab81
Pavel Govyadinov
fixed some issues...
|
1706
1707
|
*/
void
|
09049866
Pavel Govyadinov
fixed a drawing b...
|
1708
|
addToNetwork(std::vector<stim::vec3<float> > L, std::vector<float > M)
|
0311ab81
Pavel Govyadinov
fixed some issues...
|
1709
1710
1711
1712
1713
1714
|
{
if(L.size() > 3)
{
sk.Begin(stim::OBJ_LINE);
for(int i = 0; i < L.size(); i++)
{
|
09049866
Pavel Govyadinov
fixed a drawing b...
|
1715
|
sk.TexCoord(M[i]);
|
0311ab81
Pavel Govyadinov
fixed some issues...
|
1716
1717
1718
|
sk.Vertex(L[i][0], L[i][1], L[i][2]);
}
sk.End();
|
23af8e36
Pavel Govyadinov
modified spider t...
|
1719
|
|
0311ab81
Pavel Govyadinov
fixed some issues...
|
1720
|
nt.addEdge(L,M);
|
4166e973
Pavel Govyadinov
Added debug tags ...
|
1721
1722
1723
|
#ifdef DEBUG
iter++;
#endif
|
0311ab81
Pavel Govyadinov
fixed some issues...
|
1724
1725
|
}
}
|
6ada8448
Pavel Govyadinov
Reverted to 40db1...
|
1726
|
|
23af8e36
Pavel Govyadinov
modified spider t...
|
1727
|
|
821409d5
Pavel Govyadinov
added a way to ad...
|
1728
1729
1730
|
void
printSizes()
{
|
035d798f
Pavel Govyadinov
modified the spid...
|
1731
1732
|
std::cout << nt.sizeE() << " edges " << std::endl;
std::cout << nt.sizeV() << " nodes " << std::endl;
|
821409d5
Pavel Govyadinov
added a way to ad...
|
1733
1734
|
}
|
0311ab81
Pavel Govyadinov
fixed some issues...
|
1735
|
void
|
09049866
Pavel Govyadinov
fixed a drawing b...
|
1736
|
traceLine(stim::vec3<float> pos, float mag, int min_cost)
|
5de3a9c2
Pavel Govyadinov
CHECKPOINT: befo...
|
1737
|
{
|
821409d5
Pavel Govyadinov
added a way to ad...
|
1738
|
//starting (seed) position and magnitude.
|
7d3162a2
Pavel Govyadinov
fixed majority of...
|
1739
|
stim::vec3<float> spos = getPosition();
|
a36c3850
Pavel Govyadinov
fixed the bug tha...
|
1740
|
float smag = getMagnitude();
|
7d3162a2
Pavel Govyadinov
fixed majority of...
|
1741
|
stim::vec3<float> sdir = getDirection();
|
821409d5
Pavel Govyadinov
added a way to ad...
|
1742
|
|
47fe6300
Pavel Govyadinov
fixed an accident...
|
1743
|
// Bind();
|
8761b649
Pavel Govyadinov
moved a lot of th...
|
1744
|
// sk.Begin(stim::OBJ_LINE);
|
23af8e36
Pavel Govyadinov
modified spider t...
|
1745
1746
|
|
0311ab81
Pavel Govyadinov
fixed some issues...
|
1747
1748
|
sk.createFromSelf(GL_SELECT);
// nt.createFromSelf(GL_SELECT);
|
23af8e36
Pavel Govyadinov
modified spider t...
|
1749
|
|
5de3a9c2
Pavel Govyadinov
CHECKPOINT: befo...
|
1750
1751
1752
1753
1754
1755
1756
1757
|
cL.push_back(pos);
cM.push_back(mag);
// setPosition(pos);
// setMagnitude(mag);
int h;
bool started = false;
bool running = true;
|
7d3162a2
Pavel Govyadinov
fixed majority of...
|
1758
|
stim::vec3<float> size(S[0]*R[0], S[1]*R[1], S[2]*R[2]);
|
5de3a9c2
Pavel Govyadinov
CHECKPOINT: befo...
|
1759
1760
1761
1762
1763
|
while(running)
{
int cost = Step();
if (cost > min_cost){
running = false;
|
3e5d3ad3
Pavel Govyadinov
merged the change...
|
1764
|
branchDetection2();
|
0311ab81
Pavel Govyadinov
fixed some issues...
|
1765
|
addToNetwork(cL, cM);
|
ec9d82e1
Pavel Govyadinov
finished the debu...
|
1766
|
#ifdef DEBUG
|
a36c3850
Pavel Govyadinov
fixed the bug tha...
|
1767
|
std::cerr << "the cost of " << cost << " > " << min_cost << std::endl;
|
ec9d82e1
Pavel Govyadinov
finished the debu...
|
1768
|
#endif
|
5de3a9c2
Pavel Govyadinov
CHECKPOINT: befo...
|
1769
1770
1771
1772
1773
1774
1775
1776
|
break;
} else {
//Have we found the edge of the map?
pos = getPosition();
if(pos[0] > size[0] || pos[1] > size[1]
|| pos[2] > size[2] || pos[0] < 0
|| pos[1] < 0 || pos[2] < 0)
{
|
5de3a9c2
Pavel Govyadinov
CHECKPOINT: befo...
|
1777
|
running = false;
|
3e5d3ad3
Pavel Govyadinov
merged the change...
|
1778
|
branchDetection2();
|
0311ab81
Pavel Govyadinov
fixed some issues...
|
1779
|
addToNetwork(cL, cM);
|
ec9d82e1
Pavel Govyadinov
finished the debu...
|
1780
|
#ifdef DEBUG
|
a36c3850
Pavel Govyadinov
fixed the bug tha...
|
1781
|
std::cerr << "I hit and edge" << std::endl;
|
ec9d82e1
Pavel Govyadinov
finished the debu...
|
1782
|
#endif
|
5de3a9c2
Pavel Govyadinov
CHECKPOINT: befo...
|
1783
1784
1785
1786
1787
1788
1789
1790
1791
|
break;
}
//If this is the first step in the trace,
// save the direction
//(to be used later to trace the fiber in the opposite direction)
if(started == false){
rev = -getDirection();
started = true;
}
|
5de3a9c2
Pavel Govyadinov
CHECKPOINT: befo...
|
1792
1793
|
//Has the template size gotten unreasonable?
mag = getMagnitude();
|
09049866
Pavel Govyadinov
fixed a drawing b...
|
1794
|
if(mag > 75 || mag < 1){
|
5de3a9c2
Pavel Govyadinov
CHECKPOINT: befo...
|
1795
|
running = false;
|
3e5d3ad3
Pavel Govyadinov
merged the change...
|
1796
|
branchDetection2();
|
0311ab81
Pavel Govyadinov
fixed some issues...
|
1797
|
addToNetwork(cL, cM);
|
ec9d82e1
Pavel Govyadinov
finished the debu...
|
1798
|
#ifdef DEBUG
|
a36c3850
Pavel Govyadinov
fixed the bug tha...
|
1799
|
std::cerr << "The templates are too big" << std::endl;
|
ec9d82e1
Pavel Govyadinov
finished the debu...
|
1800
|
#endif
|
5de3a9c2
Pavel Govyadinov
CHECKPOINT: befo...
|
1801
1802
1803
1804
|
break;
}
else
{
|
7f297fc6
Pavel Govyadinov
added more detail...
|
1805
|
h = selectObject(p, getDirection(), m);
|
5de3a9c2
Pavel Govyadinov
CHECKPOINT: befo...
|
1806
1807
|
//Have we hit something previously traced?
if(h != -1){
|
ec9d82e1
Pavel Govyadinov
finished the debu...
|
1808
|
#ifdef DEBUG
|
a36c3850
Pavel Govyadinov
fixed the bug tha...
|
1809
|
std::cerr << "I hit the fiber " << h << std::endl;
|
ec9d82e1
Pavel Govyadinov
finished the debu...
|
1810
|
#endif
|
5de3a9c2
Pavel Govyadinov
CHECKPOINT: befo...
|
1811
|
running = false;
|
3e5d3ad3
Pavel Govyadinov
merged the change...
|
1812
|
branchDetection2();
|
0311ab81
Pavel Govyadinov
fixed some issues...
|
1813
|
addToNetwork(cL, cM);
|
5de3a9c2
Pavel Govyadinov
CHECKPOINT: befo...
|
1814
1815
1816
|
break;
}
else {
|
7d3162a2
Pavel Govyadinov
fixed majority of...
|
1817
|
cL.push_back(stim::vec3<float>(p[0], p[1],p[2]));
|
7f297fc6
Pavel Govyadinov
added more detail...
|
1818
|
cM.push_back(m);
|
47fe6300
Pavel Govyadinov
fixed an accident...
|
1819
|
// Unbind();
|
5de3a9c2
Pavel Govyadinov
CHECKPOINT: befo...
|
1820
|
CHECK_OPENGL_ERROR
|
5de3a9c2
Pavel Govyadinov
CHECKPOINT: befo...
|
1821
1822
1823
1824
|
}
}
}
}
|
4166e973
Pavel Govyadinov
Added debug tags ...
|
1825
1826
1827
|
#ifdef DEBUG
std::cout << "I broke out!" << std::endl;
#endif
|
84eff8b1
Pavel Govyadinov
Merged only the n...
|
1828
|
}
|
4cefeb6d
Pavel Govyadinov
Changes to the re...
|
1829
|
};
|
fb0bc2f1
Pavel Govyadinov
added the gl_spid...
|
1830
1831
|
}
#endif
|