Changeset 2076 for libcaca/trunk/csharpTweet

Timestamp:

Nov 26, 2007, 2:04:36 AM (13 years ago)

Author:

Sam Hocevar

Message:

• Implemented getVersion() in the C# bindings.
• Slightly improved the C# test program.

Location:

libcaca/trunk/csharp

Files:

• Caca.cs (modified) (2 diffs)
• Cucul.cs (modified) (1 diff)
• test.cs (modified) (3 diffs)

libcaca/trunk/csharp/Caca.cs

@@ -22 +22 @@
 namespace Caca
 {
+    /* Static libcaca stuff that does not fit in any object */
+    public static class Libcaca
+    {
+        [DllImport("libcaca.dll", CallingConvention=CallingConvention.Cdecl),
+         SuppressUnmanagedCodeSecurity]
+        private static extern IntPtr caca_get_version();
+        public static string getVersion()
+        {
+            return Marshal.PtrToStringAnsi(caca_get_version());
+        }
+    }
+
     public enum CacaEventType
     {
@@ -149 +161 @@
             {
                 caca_get_event_key_utf8(cevent, utf8);
-                return Marshal.PtrToStringUni(utf8);
+                return Marshal.PtrToStringAnsi(utf8);
             }
         }

libcaca/trunk/csharp/Cucul.cs

@@ -26 +26 @@
          SuppressUnmanagedCodeSecurity]
         private static extern int cucul_rand(int min, int max);
-
         public static int Rand(int min, int max)
         {
             return cucul_rand(min, max);
+        }
+
+        [DllImport("libcucul.dll", CallingConvention=CallingConvention.Cdecl),
+         SuppressUnmanagedCodeSecurity]
+        private static extern IntPtr cucul_get_version();
+        public static string getVersion()
+        {
+            return Marshal.PtrToStringAnsi(cucul_get_version());
         }
 

libcaca/trunk/csharp/test.cs

@@ -34 +34 @@
         table = new uint[16,16];
         d = new CuculDither(32, 16, 16, 16 * 4, 0xff0000, 0xff00, 0xff, 0x0);
-        for(int y = 0; y < 16; y++)
-            for(int x = 0; x < 16; x++)
-                table[x,y] = (uint)((x + y) << 16) | (uint)(x << 8) | (uint)(y);
     }
 
@@ -46 +43 @@
         Clear();
 
+        double cos = Math.Cos(t / 500.0);
+        double sin = Math.Sin(t / 500.0);
+
+        for(int y = 0; y < 16; y++)
+            for(int x = 0; x < 16; x++)
+            {
+                double xt = (double)(x - 8);
+                double yt = (double)(y - 8);
+                int x2 = (int)(xt * cos + yt * sin + 8.0);
+                int y2 = (int)(xt * sin - yt * cos + 8.0);
+                if(x2 < 0) x2 = 0;
+                if(y2 < 0) y2 = 0;
+
+                table[x,y] = (uint)((x2 + y2) << 16)
+                              | (uint)(x2 << 8)
+                              | (uint)(y2);
+            }
         ditherBitmap(0, 0, width, height, d, table);
 
@@ -103 +117 @@
     public static void Main()
     {
-        Console.WriteLine("libcaca .NET test");
+        Console.WriteLine("libcaca {0} .NET test", Libcaca.getVersion());
         Console.WriteLine("(c) 2006 Jean-Yves Lamoureux <jylam@lnxscene.org>");