diff --git a/stim/cuda/testKernel.cuh b/stim/cuda/testKernel.cuh index a5c69aa..3e318f8 100644 --- a/stim/cuda/testKernel.cuh +++ b/stim/cuda/testKernel.cuh @@ -120,7 +120,7 @@ cudaDeviceSynchronize(); stringstream name; //for debugging name << nam.c_str(); - stim::gpu2image(print, name.str(),x,y,0,255); + //stim::gpu2image(print, name.str(),x,y,0,255); tx.UnmapCudaTexture(); cleanUP(); diff --git a/stim/gl/gl_spider.h b/stim/gl/gl_spider.h index 717692b..3ddc82c 100644 --- a/stim/gl/gl_spider.h +++ b/stim/gl/gl_spider.h @@ -52,7 +52,7 @@ class gl_spider : public virtual gl_texture stim::vec3 p; //vector designating the position of the spider. stim::vec3 d; //vector designating the orientation of the spider //always a unit vector. - stim::vec3 m; //magnitude of the spider vector. + stim::vec m; //magnitude of the spider vector. //mag[0] = length. //mag[1] = width. std::vector > dV; //A list of all the direction vectors. @@ -983,7 +983,7 @@ class gl_spider : public virtual gl_texture } ///Returns the m vector. - vec + stim::vec getMagnitude() { return m; @@ -1092,7 +1092,7 @@ class gl_spider : public virtual gl_texture ///rotates from 0.0, 0.0, 1.0 to dir. ///return is in degrees for use with glRotatef. stim::vec - getRotation(stim::vec dir) + getRotation(stim::vec3 dir) { stim::vec out(0.0,0.0,0.0,0.0); stim::vec from(0.0,0.0,1.0); @@ -1104,7 +1104,8 @@ class gl_spider : public virtual gl_texture out[3] = 1.0; } else { stim::vec temp(0.0, 0.0, 0.0);; - temp = (from.cross(dir)).norm(); + stim::vec dir1(dir[0], dir[1], dir[2]); + temp = (from.cross(dir1)).norm(); out[1] = temp[0]; out[2] = temp[1]; out[3] = temp[2]; diff --git a/stim/math/vector.h b/stim/math/vector.h index 02cfcd2..05b35f2 100644 --- a/stim/math/vector.h +++ b/stim/math/vector.h @@ -75,12 +75,12 @@ struct vec : public std::vector } } - vec( vec3& other){ - resize(3); //resize the current vector to match the copy - for(size_t i=0; i<3; i++){ //copy each element - at(i) = other[i]; - } - } +// vec( vec3& other){ +// resize(3); //resize the current vector to match the copy +// for(size_t i=0; i<3; i++){ //copy each element +// at(i) = other[i]; +// } +// } //I'm not sure what these were doing here. //Keep them now, we'll worry about it later. -- libgit2 0.21.4