projects
/
ctsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
r96: *** empty log message ***
[ctsim.git]
/
include
/
kmath.h
diff --git
a/include/kmath.h
b/include/kmath.h
index 5599327d2c285de22af7b1745f3965edf8b86fbd..48370267f1f9d92740bded47f363b83e3a4dde78 100644
(file)
--- a/
include/kmath.h
+++ b/
include/kmath.h
@@
-9,7
+9,7
@@
** This is part of the CTSim program
** Copyright (C) 1983-2000 Kevin Rosenberg
**
** This is part of the CTSim program
** Copyright (C) 1983-2000 Kevin Rosenberg
**
-** $Id: kmath.h,v 1.1
2 2000/06/13 16:20:31
kevin Exp $
+** $Id: kmath.h,v 1.1
3 2000/06/15 19:07:10
kevin Exp $
**
** This program is free software; you can redistribute it and/or modify
** it under the terms of the GNU General Public License (version 2) as
**
** This program is free software; you can redistribute it and/or modify
** it under the terms of the GNU General Public License (version 2) as
@@
-30,7
+30,6
@@
#include <stdio.h>
#include <math.h>
#include <stdio.h>
#include <math.h>
-#include <algo.h>
#define PI 3.14159265358979323846
#define HALFPI 1.57079632679489661923 /* PI divided by 2 */
#define PI 3.14159265358979323846
#define HALFPI 1.57079632679489661923 /* PI divided by 2 */
@@
-44,21
+43,25
@@
#define F_EPSILON 1.0E-6
#define D_EPSILON 1.0E-10
#define F_EPSILON 1.0E-6
#define D_EPSILON 1.0E-10
-#define DEG_TO_RAD(x) (x*(PI/180.))
-#define RAD_TO_DEG(x) (x*(180./PI))
-
#define ASSUMEDZERO 1E-10
typedef double GRFMTX_2D[3][3];
typedef double GRFMTX_3D[4][4];
#define ASSUMEDZERO 1E-10
typedef double GRFMTX_2D[3][3];
typedef double GRFMTX_3D[4][4];
+inline double
+convertDegreesToRadians (double x)
+{ return (x * (PI/180.)); }
+
+inline double
+convertRadiansToDegrees (double x)
+{ return (x*(180./PI)); }
template<class T>
inline T nearest (double x)
{ return (x > 0 ? static_cast<T>(x+0.5) : static_cast<T>(x-0.5)); }
template<class T>
template<class T>
inline T nearest (double x)
{ return (x > 0 ? static_cast<T>(x+0.5) : static_cast<T>(x-0.5)); }
template<class T>
-inline T clamp (T value, T
upperBounds, T low
erBounds)
+inline T clamp (T value, T
lowerBounds, T upp
erBounds)
{ return (value >= upperBounds ? upperBounds : (value <= lowerBounds ? lowerBounds : value )); }
{ return (value >= upperBounds ? upperBounds : (value <= lowerBounds ? lowerBounds : value )); }