isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2025-08-07 09:04:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

[fixed-to-float-patches] Updates the patches in line with the last merge

Browse Source 
Most of the patches updated weren't failing but there were a number of
hunk offsets when applying so it tidies that up. The change in
mtx_transform.0.patch has been moved to clutter-actor.c.0.patch.
This commit is contained in:
Robert Bragg
2009-01-08 13:10:32 +00:00
parent 378ca42d5b
commit 012b169a73
6 changed files with 85 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
fixed-to-float-patches/clutter-texture.c.0.patch
View File

@@ -1,13 +1,13 @@
diff --git a/clutter/clutter-texture.c b/clutter/clutter-texture.c
index fc5541b..0f1a77e 100644
index 42be677..7273946 100644
--- a/clutter/clutter-texture.c
+++ b/clutter/clutter-texture.c
@@ -457,7 +457,7 @@ clutter_texture_set_fbo_projection (ClutterActor *self)
@@ -463,7 +463,7 @@ clutter_texture_set_fbo_projection (ClutterActor *self)
/* Set up a projection matrix so that the actor will be projected as
if it was drawn at its original location */
- tan_angle = clutter_tani (CLUTTER_ANGLE_FROM_DEGX (perspective.fovy / 2));
+ tan_angle = clutter_tanx (perspective.fovy / 2);
- tan_angle = tanf (COGL_ANGLE_FROM_DEGX (perspective.fovy / 2 * (G_PI/180.0)));
+ tan_angle = tanf ((perspective.fovy / 2) * (G_PI/180.0));
near_size = CLUTTER_FIXED_MUL (perspective.z_near, tan_angle);
cogl_frustum (CLUTTER_FIXED_MUL (x_min, near_size),
cogl_frustum (CLUTTER_FIXED_MUL (tx_min, near_size),