manolas
/
vcglib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

*** empty log message ***

This commit is contained in:
Federico Ponchio 2004-02-19 15:28:01 +00:00
parent a952f745a0
commit ca807a0787
2 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
vcg/math/base.h
View File

@ -24,6 +24,9 @@
History History
$Log: not supported by cvs2svn $ $Log: not supported by cvs2svn $
Revision 1.2 2004/02/13 02:18:57 cignoni
Edited Comments and GPL license
****************************************************************************/ ****************************************************************************/
@ -45,6 +48,9 @@ namespace vcg {
public: public:
static T inline Sqrt(const T v); static T inline Sqrt(const T v);
static T inline Abs(const T v); static T inline Abs(const T v);
static T inline Cos(const T v);
static T inline Sin(const T v);
static const T MaxVal; static const T MaxVal;
static T ToDeg(const T &a); static T ToDeg(const T &a);
@ -62,10 +68,20 @@ namespace vcg {
{ return sqrtf(v); } { return sqrtf(v); }
float Math<float>::Abs(const float v) float Math<float>::Abs(const float v)
{ return fabsf(v); } { return fabsf(v); }
float Math<float>::Cos(const float v)
{ return cosf(v); }
float Math<float>::Sin(const float v)
{ return sinf(v); }
double Math<double>::Sqrt(const double v) double Math<double>::Sqrt(const double v)
{ return sqrt(v); } { return sqrt(v); }
double Math<double>::Abs(const double v) double Math<double>::Abs(const double v)
{ return fabs(v); } { return fabs(v); }
double Math<double>::Cos(const double v)
{ return cos(v); }
double Math<double>::Sin(const double v)
{ return sin(v); }
const unsigned char Math<unsigned char >::MaxVal = 255; const unsigned char Math<unsigned char >::MaxVal = 255;

11
vcg/math/matrix44.h
View File

@ -30,12 +30,9 @@ $LOG$
#ifndef __VCGLIB_MATRIX44 #ifndef __VCGLIB_MATRIX44
#define __VCGLIB_MATRIX44 #define __VCGLIB_MATRIX44
#include <math.h>
#include <string.h> #include <string.h>
#include "../space/Point3.h" #include <vcg/space/point3.h>
#include "../space/Point4.h" #include <vcg/space/point4.h>
namespace vcg { namespace vcg {
@ -311,8 +308,8 @@ template <class T> void Matrix44<T>::SetTranslate(const T sx, const T sy, const
} }
template <class T> void Matrix44<T>::SetRotate(T angle, const Point3<T> & axis) { template <class T> void Matrix44<T>::SetRotate(T angle, const Point3<T> & axis) {
//angle = angle*(T)3.14159265358979323846/180; e' in radianti! //angle = angle*(T)3.14159265358979323846/180; e' in radianti!
T c = Cos(angle); T c = Math<T>::Cos(angle);
T s = Sin(angle); T s = Math<T>::Sin(angle);
T q = 1-c; T q = 1-c;
Point3<T> t = axis; Point3<T> t = axis;
t.Normalize(); t.Normalize();