From 018dcc69d1f00d40dc69e31148a8e09b1ca5da98 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Sun, 6 Feb 2011 09:12:05 +0100 Subject: [PATCH] cogl-1.0: Fix Matrix from_array, get_inverse and transform_point --- vapi/cogl-1.0.vapi | 6 +++--- vapi/packages/cogl-1.0/cogl-1.0-custom.vala | 2 +- vapi/packages/cogl-1.0/cogl-1.0.metadata | 2 ++ 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/vapi/cogl-1.0.vapi b/vapi/cogl-1.0.vapi index 715eb2636..84fc48a05 100644 --- a/vapi/cogl-1.0.vapi +++ b/vapi/cogl-1.0.vapi @@ -257,11 +257,11 @@ namespace Cogl { public weak float[] inv; public uint type; public uint flags; - public Matrix.from_array (float[] array); + public Matrix.from_array ([CCode (array_length = false)] float[] array); public void frustum (float left, float right, float bottom, float top, float z_near, float z_far); [CCode (array_length = false)] public unowned float[] get_array (); - public bool get_inverse (Cogl.Matrix inverse); + public bool get_inverse (out Cogl.Matrix inverse); public Matrix.identity (); [CCode (cname = "cogl_matrix_multiply")] public Matrix.multiply (Cogl.Matrix a, Cogl.Matrix b); @@ -269,7 +269,7 @@ namespace Cogl { public void perspective (float fov_y, float aspect, float z_near, float z_far); public void rotate (float angle, float x, float y, float z); public void scale (float sx, float sy, float sz); - public void transform_point (float x, float y, float z, float w); + public void transform_point (ref float x, ref float y, ref float z, ref float w); public void translate (float x, float y, float z); } [CCode (type_id = "COGL_TYPE_TEXTURE_VERTEX", cheader_filename = "cogl/cogl.h")] diff --git a/vapi/packages/cogl-1.0/cogl-1.0-custom.vala b/vapi/packages/cogl-1.0/cogl-1.0-custom.vala index be78ad8d6..47da825d8 100644 --- a/vapi/packages/cogl-1.0/cogl-1.0-custom.vala +++ b/vapi/packages/cogl-1.0/cogl-1.0-custom.vala @@ -178,7 +178,7 @@ namespace Cogl { [CCode (type_id = "COGL_TYPE_MATRIX", cheader_filename = "cogl/cogl.h")] public struct Matrix { [CCode (cname = "cogl_matrix_init_from_array", array_length = false, array_null_terminated = false)] - public Matrix.from_array (float[] array); + public Matrix.from_array ([CCode (array_length = false)] float[] array); [CCode (cname = "cogl_matrix_init_identity")] public Matrix.identity (); [CCode (cname = "cogl_matrix_multiply")] diff --git a/vapi/packages/cogl-1.0/cogl-1.0.metadata b/vapi/packages/cogl-1.0/cogl-1.0.metadata index 5ae607760..1c3c6f6d7 100644 --- a/vapi/packages/cogl-1.0/cogl-1.0.metadata +++ b/vapi/packages/cogl-1.0/cogl-1.0.metadata @@ -39,9 +39,11 @@ cogl_is_vertex_buffer hidden="1" CoglMatrix is_value_type="1" cogl_matrix_get_array is_array="1" no_array_length="1" +cogl_matrix_get_inverse.inverse is_out="1" cogl_matrix_multiply hidden="1" cogl_matrix_init_from_array hidden="1" cogl_matrix_init_identity hidden="1" +cogl_matrix_transform_point.* is_ref="1" cogl_pop_draw_buffer hidden="1" cogl_push_draw_buffer hidden="1" -- 2.47.2