brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bug 985 - MSC math.h / M_PI issue

Browse Source 
* clutter/cogl/gl/cogl.c (set_clip_plane): 
	* clutter/clutter-alpha.c (sinc_func): Use G_PI instead of M_PI
	because M_PI isn't defined in MSVC without a special
	#define. Thanks to Haakon Sporsheim
This commit is contained in:
Neil Roberts 2008-06-30 16:15:53 +00:00
parent abbcf0ee4b
commit 604990a53b
3 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,3 +1,12 @@
2008-06-30 Neil Roberts <neil@o-hand.com>
Bug 985 - MSC math.h / M_PI issue
* clutter/cogl/gl/cogl.c (set_clip_plane):
* clutter/clutter-alpha.c (sinc_func): Use G_PI instead of M_PI
because M_PI isn't defined in MSVC without a special
#define. Thanks to Haakon Sporsheim
2008-06-30 Neil Roberts <neil@o-hand.com> 2008-06-30 Neil Roberts <neil@o-hand.com>
* clutter/win32/clutter-backend-win32.c (check_vblank_env): Use * clutter/win32/clutter-backend-win32.c (check_vblank_env): Use

4
clutter/clutter-alpha.c
View File

@ -633,8 +633,8 @@ sinc_func (ClutterAlpha *alpha,
/* FIXME: fixed point, and fixed point sine() */ /* FIXME: fixed point, and fixed point sine() */
x = (gdouble) (current_frame_num * angle * M_PI) / n_frames ; x = (gdouble) (current_frame_num * angle * G_PI) / n_frames ;
sine = (sin (x - (M_PI / angle)) + offset) * 0.5f; sine = (sin (x - (G_PI / angle)) + offset) * 0.5f;
CLUTTER_NOTE (ALPHA, "sine: %2f\n",sine); CLUTTER_NOTE (ALPHA, "sine: %2f\n",sine);

2
clutter/cogl/gl/cogl.c
View File

@ -420,7 +420,7 @@ set_clip_plane (GLint plane_num,
/* Calculate the angle between the axes and the line crossing the /* Calculate the angle between the axes and the line crossing the
two points */ two points */
angle = atan2f ((vertex_b[1] - vertex_a[1]), angle = atan2f ((vertex_b[1] - vertex_a[1]),
(vertex_b[0] - vertex_a[0])) * 180.0f / M_PI; (vertex_b[0] - vertex_a[0])) * 180.0f / G_PI;
GE( glPushMatrix () ); GE( glPushMatrix () );
/* Load the identity matrix and multiply by the reverse of the /* Load the identity matrix and multiply by the reverse of the