Author: dhudson
Date: 2007-11-07 11:05:13 -0500 (Wed, 07 Nov 2007)
New Revision: 89116
Modified:
trunk/tao/src/Tao.Glfw/Glfw.cs
trunk/tao/src/Tao.Glfw/Properties/AssemblyInfo.cs
trunk/tao/src/Tao.Glfw/Tao.Glfw.Readme.txt
Log:
update to 2.6.0 from ultima
Modified: trunk/tao/src/Tao.Glfw/Glfw.cs
===================================================================
--- trunk/tao/src/Tao.Glfw/Glfw.cs 2007-11-07 15:57:05 UTC (rev 89115)
+++ trunk/tao/src/Tao.Glfw/Glfw.cs 2007-11-07 16:05:13 UTC (rev 89116)
@@ -33,7 +33,7 @@
namespace Tao.Glfw {
#region Class Documentation
/// <summary>
- /// GLFW (OpenGL Framework) binding for .NET, implementing GLFW 2.6
Beta 1.
+ /// GLFW (OpenGL Framework) binding for .NET, implementing GLFW 2.6.0.
/// </summary>
/// <remarks>
/// <para>
@@ -1078,7 +1078,8 @@
#region GLFW_WINDOW_NO_RESIZE
/// <summary>
- ///
+ /// Specify whether the window can be resized (can be <see
cref="Gl.GL_TRUE" />
+ /// or <see cref="Gl.GL_FALSE" />).
/// </summary>
// #define GLFW_WINDOW_NO_RESIZE 0x00020012
public const int GLFW_WINDOW_NO_RESIZE = 0x00020012;
@@ -1086,11 +1087,13 @@
#region GLFW_FSAA_SAMPLES
/// <summary>
- ///
+ /// Specify if full screen antialiasing should be supported. Zero
disabless multisampling, greater
+ /// values define the number of samples.
/// </summary>
// #define GLFW_FSAA_SAMPLES 0x00020013
public const int GLFW_FSAA_SAMPLES = 0x00020013;
#endregion GLFW_FSAA_SAMPLES
+
#endregion glfwGetWindowParam/glfwOpenWindowHint Tokens
#region glfwEnable/glfwDisable Tokens
@@ -2158,16 +2161,16 @@
// GLFWAPI int GLFWAPIENTRY glfwReadImage(const char *name, GLFWimage
*img, int flags);
[DllImport(GLFW_NATIVE_LIBRARY), SuppressUnmanagedCodeSecurity]
public static extern int glfwReadImage(string name, out GLFWimage
image, int flags);
- #endregion int glfwReadImage(string name, out GLFWimage image, int
flags)
+ #endregion int glfwReadImage(string name, out GLFWimage image,
int flags)
- #region int glfwReadMemoryImage(IntPtr data, int size, ref GLFWimage
image, int flags)
+ #region int glfwReadMemoryImage(IntPtr data, int size, out GLFWimage
image, int flags)
/// <summary>
///
/// </summary>
- // GLFWAPI int glfwReadMemoryImage( const void *data, long size,
GLFWimage *img, int flags );
+ // GLFWAPI int GLFWAPIENTRY glfwReadMemoryImage( const void *data,
long size, GLFWimage *img, int flags );
[DllImport(GLFW_NATIVE_LIBRARY), SuppressUnmanagedCodeSecurity]
- public static extern int glfwReadMemoryImage(IntPtr data, int size,
ref GLFWimage image, int flags);
- #endregion int glfwReadMemoryImage(IntPtr data, int size, ref
GLFWimage image, int flags)
+ public static extern int glfwReadMemoryImage(IntPtr data, int size,
out GLFWimage image, int flags);
+ #endregion int glfwReadMemoryImage(IntPtr data, int size, out
GLFWimage image, int flags)
#region void glfwFreeImage(ref GLFWimage image)
/// <summary>
@@ -2187,23 +2190,23 @@
public static extern int glfwLoadTexture2D(string name, int flags);
#endregion int glfwLoadTexture2D(string name, int flags)
- #region int glfwLoadMemoryTexture2D(IntPtr data, int size, int
flags)
+ #region int glfwLoadMemoryTexture2D(IntPtr data, int size, int flags)
/// <summary>
///
/// </summary>
- // GLFWAPI int glfwLoadMemoryTexture2D( const void *data, long size,
int flags )
+ // GLFWAPI int GLFWAPIENTRY glfwLoadMemoryTexture2D( const void
*data, long size, int flags );
[DllImport(GLFW_NATIVE_LIBRARY), SuppressUnmanagedCodeSecurity]
public static extern int glfwLoadMemoryTexture2D(IntPtr data, int
size, int flags);
- #endregion int glfwLoadMemoryTexture2D(IntPtr data, int size,
int flags)
+ #endregion int glfwLoadMemoryTexture2D(IntPtr data, int size, int
flags)
- #region int glfwLoadTextureImage2D(ref GLFWimage img, int flags)
+ #region int glfwLoadTextureImage2D(ref GLFWimage img, int flags)
/// <summary>
///
/// </summary>
- // GLFWAPI int glfwLoadTextureImage2D( GLFWimage *img, int flags )
+ // GLFWAPI int GLFWAPIENTRY glfwLoadTextureImage2D( GLFWimage *img,
int flags );
[DllImport(GLFW_NATIVE_LIBRARY), SuppressUnmanagedCodeSecurity]
public static extern int glfwLoadTextureImage2D(ref GLFWimage img, int
flags);
- #endregion int glfwLoadTextureImage2D(ref GLFWimage img, int
flags)
+ #endregion int glfwLoadTextureImage2D(ref GLFWimage img, int flags)
#endregion Image/Texture I/O Support
}
Modified: trunk/tao/src/Tao.Glfw/Properties/AssemblyInfo.cs
===================================================================
--- trunk/tao/src/Tao.Glfw/Properties/AssemblyInfo.cs 2007-11-07 15:57:05 UTC
(rev 89115)
+++ trunk/tao/src/Tao.Glfw/Properties/AssemblyInfo.cs 2007-11-07 16:05:13 UTC
(rev 89116)
@@ -39,13 +39,13 @@
[assembly: AssemblyDefaultAlias("Tao.Glfw")]
[assembly: AssemblyDelaySign(false)]
[assembly: AssemblyDescription("Tao Framework GLFW Binding For .NET")]
-[assembly: AssemblyFileVersion("2.6.1.0")]
-[assembly: AssemblyInformationalVersion("2.6.1.0")]
+[assembly: AssemblyFileVersion("2.6.0.0")]
+[assembly: AssemblyInformationalVersion("2.6.0.0")]
[assembly: AssemblyKeyName("")]
[assembly: AssemblyProduct("Tao.Glfw.dll")]
[assembly: AssemblyTitle("Tao Framework GLFW Binding For .NET")]
[assembly: AssemblyTrademark("Tao Framework -- http://www.taoframework.com";)]
-[assembly: AssemblyVersion("2.6.1.0")]
+[assembly: AssemblyVersion("2.6.0.0")]
[assembly: CLSCompliant(true)]
[assembly: ComVisible(false)]
[assembly: SecurityPermission(SecurityAction.RequestMinimum, Flags =
SecurityPermissionFlag.Execution)]
Modified: trunk/tao/src/Tao.Glfw/Tao.Glfw.Readme.txt
===================================================================
--- trunk/tao/src/Tao.Glfw/Tao.Glfw.Readme.txt 2007-11-07 15:57:05 UTC (rev
89115)
+++ trunk/tao/src/Tao.Glfw/Tao.Glfw.Readme.txt 2007-11-07 16:05:13 UTC (rev
89116)
@@ -1,14 +1,14 @@
-Tao.Glfw 2.6.1.0
+Tao.Glfw 2.6.0.0
http://www.taoframework.com
Copyright �2003-2004 Randy Ridge, All rights reserved.
-Tao.Glfw is a GLFW API binding for .NET, implementing GLFW 2.6 Beta 1.
+Tao.Glfw is a GLFW API binding for .NET, implementing GLFW 2.6.0.
Change Log:
-2.6.1.0 - June 21, 2007:
- Updated to GLFW 2.6 Beta 1.
+2.6.0.0 - Sept. 04, 2007:
+ Updated to GLFW 2.6.0.
2.5.0.0 - April 25, 2006:
Updated to GLFW 2.5.0, fixed GLFW threading.
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
