aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacob Nevins <jacobn@chiark.greenend.org.uk>2005-05-31 12:03:25 +0000
committerJacob Nevins <jacobn@chiark.greenend.org.uk>2005-05-31 12:03:25 +0000
commita029c2095de3845d3b42f441fe04eaefdc9d52a5 (patch)
treec8cd9b589fe1ae4e8f98b79ef879ff97eac71279
parentcaee305b47bd93eda98ba40d98de7aa180a470c7 (diff)
downloadpuzzles-a029c2095de3845d3b42f441fe04eaefdc9d52a5.zip
puzzles-a029c2095de3845d3b42f441fe04eaefdc9d52a5.tar.gz
puzzles-a029c2095de3845d3b42f441fe04eaefdc9d52a5.tar.bz2
puzzles-a029c2095de3845d3b42f441fe04eaefdc9d52a5.tar.xz
Move definition of PI into puzzles.h. If nothing else, the definition in cube.c
had a typo :) [originally from svn r5878]
-rw-r--r--cube.c2
-rw-r--r--net.c2
-rw-r--r--netslide.c2
-rw-r--r--puzzles.h2
-rw-r--r--twiddle.c2
5 files changed, 2 insertions, 8 deletions
diff --git a/cube.c b/cube.c
index bf24960..671918e 100644
--- a/cube.c
+++ b/cube.c
@@ -11,8 +11,6 @@
#include "puzzles.h"
-#define PI 3.14159265358979323846264338327950884197169399
-
#define MAXVERTICES 20
#define MAXFACES 20
#define MAXORDER 4
diff --git a/net.c b/net.c
index 447f4e3..40f68f9 100644
--- a/net.c
+++ b/net.c
@@ -12,8 +12,6 @@
#include "puzzles.h"
#include "tree234.h"
-#define PI 3.141592653589793238462643383279502884197169399
-
#define MATMUL(xr,yr,m,x,y) do { \
float rx, ry, xx = (x), yy = (y), *mat = (m); \
rx = mat[0] * xx + mat[2] * yy; \
diff --git a/netslide.c b/netslide.c
index b81a816..86efb2f 100644
--- a/netslide.c
+++ b/netslide.c
@@ -13,8 +13,6 @@
#include "puzzles.h"
#include "tree234.h"
-#define PI 3.141592653589793238462643383279502884197169399
-
#define MATMUL(xr,yr,m,x,y) do { \
float rx, ry, xx = (x), yy = (y), *mat = (m); \
rx = mat[0] * xx + mat[2] * yy; \
diff --git a/puzzles.h b/puzzles.h
index de0f819..7b35896 100644
--- a/puzzles.h
+++ b/puzzles.h
@@ -12,6 +12,8 @@
#define FALSE 0
#endif
+#define PI 3.141592653589793238462643383279502884197169399
+
#define lenof(array) ( sizeof(array) / sizeof(*(array)) )
#define STR_INT(x) #x
diff --git a/twiddle.c b/twiddle.c
index 273ce8c..66e8e95 100644
--- a/twiddle.c
+++ b/twiddle.c
@@ -20,8 +20,6 @@
#define COORD(x) ( (x) * TILE_SIZE + BORDER )
#define FROMCOORD(x) ( ((x) - BORDER + TILE_SIZE) / TILE_SIZE - 1 )
-#define PI 3.141592653589793238462643383279502884197169399
-
#define ANIM_PER_RADIUS_UNIT 0.13F
#define FLASH_FRAME 0.13F