Commit 794eef45 authored by Kenneth Vanhoey's avatar Kenneth Vanhoey
Browse files

localFrame cleanup

parent 0940d983
...@@ -49,7 +49,7 @@ class LocalFrame ...@@ -49,7 +49,7 @@ class LocalFrame
{ {
typedef typename PFP::REAL REAL ; typedef typename PFP::REAL REAL ;
typedef typename Geom::Vector<2,REAL> VEC2 ; typedef typename Geom::Vector<2,REAL> VEC2 ;
typedef typename PFP::VEC3 VEC3 ; typedef typename Geom::Vector<3,REAL> VEC3 ;
typedef typename Geom::Vector<4,REAL> VEC4 ; typedef typename Geom::Vector<4,REAL> VEC4 ;
private: // fields private: // fields
...@@ -159,7 +159,7 @@ public: // methods ...@@ -159,7 +159,7 @@ public: // methods
friend std::ostream& operator<< (std::ostream &out, const LocalFrame& lf) { friend std::ostream& operator<< (std::ostream &out, const LocalFrame& lf) {
out << "T : " << lf.m_T << std::endl ; out << "T : " << lf.m_T << std::endl ;
out << "B : " << lf.m_B << std::endl ; out << "B : " << lf.m_B << std::endl ;
out << "N : " << lf.m_N << std::endl ; out << "N : " << lf.m_N ;
return out ; return out ;
} ; } ;
......
...@@ -44,9 +44,7 @@ LocalFrame<PFP>::LocalFrame(const VEC3& compressedFrame) ...@@ -44,9 +44,7 @@ LocalFrame<PFP>::LocalFrame(const VEC3& compressedFrame)
const REAL& thetaT = compressedFrame[2] ; const REAL& thetaT = compressedFrame[2] ;
// compute phiT // compute phiT
REAL phiT = 0.0 ; REAL phiT = -std::atan((std::cos(thetaN)*std::cos(thetaT) + std::sin(thetaN)*std::sin(thetaT))*std::cos(phiN) / std::sin(phiN)) ; // if quot==0, atan returns Pi/2
if (std::fabs(phiN) < M_PI/2.0 - 1e-3)
phiT = -std::atan((std::cos(thetaN)*std::cos(thetaT) + std::sin(thetaN)*std::sin(thetaT))*std::cos(phiN) / std::sin(phiN)) ; // if quot==0, atan returns Pi/2
VEC2 Nspher(thetaN,phiN) ; VEC2 Nspher(thetaN,phiN) ;
VEC2 Tspher(thetaT,phiT) ; VEC2 Tspher(thetaT,phiT) ;
...@@ -80,7 +78,7 @@ LocalFrame<PFP>::LocalFrame(const VEC4& compressedFrame) ...@@ -80,7 +78,7 @@ LocalFrame<PFP>::LocalFrame(const VEC4& compressedFrame)
} }
template<typename PFP> template<typename PFP>
typename PFP::VEC3 LocalFrame<PFP>::getCompressed() const typename Geom::Vector<3,typename PFP::REAL> LocalFrame<PFP>::getCompressed() const
{ {
VEC3 res ; VEC3 res ;
...@@ -197,7 +195,7 @@ typename Geom::Vector<2,typename PFP::REAL> LocalFrame<PFP>::carthToSpherical (c ...@@ -197,7 +195,7 @@ typename Geom::Vector<2,typename PFP::REAL> LocalFrame<PFP>::carthToSpherical (c
} }
template<typename PFP> template<typename PFP>
typename PFP::VEC3 LocalFrame<PFP>::sphericalToCarth (const VEC2& sph) const typename Geom::Vector<3,typename PFP::REAL> LocalFrame<PFP>::sphericalToCarth (const VEC2& sph) const
{ {
VEC3 res ; VEC3 res ;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment