isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-09-20 14:35:48 -04:00
Code Issues Packages Projects Releases Wiki Activity

2007-08-07 Matthew Allum <mallum@openedhand.com>

Browse Source 
* clutter/clutter-fixed.c:
        * clutter/clutter-fixed.h:
        Add documentation.

        * clutter/cogl/gl/cogl.c: (cogl_perspective):
        Remove CFX_* shortened macros
This commit is contained in:
Matthew Allum 2007-08-07 11:35:22 +00:00
parent bb3e6a91bb
commit a752579845
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
gl/cogl.c
View File

@ -453,7 +453,7 @@ cogl_perspective (ClutterFixed fovy,
{ {
ClutterFixed xmax, ymax; ClutterFixed xmax, ymax;
ClutterFixed x, y, c, d; ClutterFixed x, y, c, d;
ClutterFixed fovy_rad_half = CFX_MUL (fovy, CFX_PI) / 360; ClutterFixed fovy_rad_half = CLUTTER_FIXED_MUL (fovy, CFX_PI) / 360;
GLfloat m[16]; GLfloat m[16];
@ -468,14 +468,14 @@ cogl_perspective (ClutterFixed fovy,
* 2) When working with small numbers, we are loosing significant * 2) When working with small numbers, we are loosing significant
* precision, hence we use clutter_qmulx() here, not the fast macro. * precision, hence we use clutter_qmulx() here, not the fast macro.
*/ */
ymax = clutter_qmulx (zNear, CFX_DIV (clutter_sinx (fovy_rad_half), ymax = clutter_qmulx (zNear, CLUTTER_FIXED_DIV (clutter_sinx (fovy_rad_half),
clutter_cosx (fovy_rad_half))); clutter_cosx (fovy_rad_half)));
xmax = clutter_qmulx (ymax, aspect); xmax = clutter_qmulx (ymax, aspect);
x = CFX_DIV (zNear, xmax); x = CLUTTER_FIXED_DIV (zNear, xmax);
y = CFX_DIV (zNear, ymax); y = CLUTTER_FIXED_DIV (zNear, ymax);
c = CFX_DIV (-(zFar + zNear), ( zFar - zNear)); c = CLUTTER_FIXED_DIV (-(zFar + zNear), ( zFar - zNear));
d = CFX_DIV (-(clutter_qmulx (2*zFar, zNear)), (zFar - zNear)); d = CLUTTER_FIXED_DIV (-(clutter_qmulx (2*zFar, zNear)), (zFar - zNear));
#define M(row,col) m[col*4+row] #define M(row,col) m[col*4+row]
M(0,0) = CLUTTER_FIXED_TO_FLOAT (x); M(0,0) = CLUTTER_FIXED_TO_FLOAT (x);