Merge remote-tracking branch 'origin/develop'

Author: thefiddler

.gitattributes

@@ -13,6 +13,7 @@
 *.tm text
 *.glsl text
 *.resx text
+*.yml text
 
 *.dll binary
 *.exe binary

.travis.yml

@@ -0,0 +1,18 @@
+language: objective-c
+
+env:
+ global:
+  - EnableNuGetPackageRestore=true 
+ matrix:
+  - MONO_VER="2.10.11"
+  - MONO_VER="3.2.6"
+
+before_install:
+ - wget "http://download.mono-project.com/archive/${MONO_VER}/macos-10-x86/MonoFramework-MDK-${MONO_VER}.macos10.xamarin.x86.pkg" "http://download.mono-project.com/archive/${MONO_VER}/macos-10-x86/MonoFramework-MDK-${MONO_VER}.macos10.xamarin.x86.dmg" || true
+ - hdid "MonoFramework-MDK-${MONO_VER}.macos10.xamarin.x86.dmg" || true
+ - sudo installer -pkg "/Volumes/Mono Framework MDK ${MONO_VER}/MonoFramework-MDK-${MONO_VER}.macos10.xamarin.x86.pkg" -target / || true
+ - sudo installer -pkg "MonoFramework-MDK-${MONO_VER}.macos10.xamarin.x86.pkg" -target / || true
+
+script:
+ - xbuild && xbuild /p:Configuration=Release
+

Documentation/Build.Docs.csproj

@@ -57,7 +57,6 @@
     <None Include="Doxyfile" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="Changelog.txt" />
     <None Include="Contributors.txt" />
     <None Include="Instructions.txt" />
     <None Include="License.txt" />

Documentation/Changelog.txt

@@ -1,40 +1,39 @@
-The Open Toolkit 1.1
-15 February 2014
+The Open Toolkit 1.1.1
+15 March 2014
 
 http://www.opentk.com
 https://github.com/opentk/opentk
+https://www.nuget.org/packages/OpenTK/
 
 
 [Overview]
 
-This is the first stable release for OpenTK 1.1
-
-New features:
-1. support for OpenGL 4.4 and OpenGL ES 3.0
-2. strongly-typed enums for OpenGL ES 2.0 and 3.0
-3. new, faster OpenGL bindings based on hand-optimized IL
-4. a new SDL2 backend for improved platform compatibility
-5. new Joystick and GamePad APIs under OpenTK.Input
-6. improved startup time and reduced memory consumption
-7. inline documentation for all OpenGL and OpenGL ES core functions
-8. a greatly expanded math library
-9. numerous bugfixes for Mac OS X, Windows 8 and Linux
-10. ANGLE support for Windows systems without OpenGL drivers
-11. support for Retina / high-DPI monitors
-12. monolinker can now be used to reduce the size of OpenTK.dll
-13. precompiled binaries for optional dependencies (OpenAL, SDL2, monolinker)
-
-Users of previous versions are strongly encouraged to upgrade to OpenTK 1.1
+This is the second stable release for OpenTK 1.1. It fixes various reported issues and synchronizes the OpenGL and OpenGL ES API with the March 2014 Khronos specifications.
+
+Changelog:
+1. new OpenGL extensions:
+   - INTEL_performance_query
+2. Debug builds will now throw exceptions on OpenGL errors (thanks Frassle!)
+3. OpenGL documentation tooltips now report expected array lengths (thanks Frassle!)
+4. OpenGL documentation is now generated from the new docbook 5 API reference
+3. OpenGL ES now works on more platforms, including Android
+4. keyboard events now report Alt, Ctrl, Shift key states
+5. GameWindow.Run() now respects TargetRenderFrequency setting
+6. GLControl now works on Mac OS X (thanks Sappharad!)
+7. external contexts no longer require an explicit call to Toolkit.Init()
+8. Joysticks now correctly report hat position on Windows
+9. Joysticks now correctly report +y as up and -y as down
+
+OpenTK 1.1.1 is backwards compatible with 1.1.0. Users of previous versions are encouraged to upgrade.
 
 Visit http://www.opentk.com for the latest news and information on the Open Toolkit library.
 
 
 
 [Resolved issues]
 
-Please refer to the following pages:
-- https://github.com/opentk/opentk/issues/closed
-- http://www.opentk.com/project/issues/opentk?sort=desc&order=Last+updated&text=&versions=1357%2C1395&states=2%2C7&submitted=&assigned=&participated=&form_token=a33a92f28934981edc50bea360f01762&form_id=project_issue_query
+Visit the following page for a complete list:
+- https://github.com/opentk/opentk/issues?milestone=2&page=1&state=closed
 
 
 
@@ -54,17 +53,15 @@ Please refer to the following pages:
 
 If you encounter an issue with OpenTK, please report it at https://github.com/opentk/opentk/issues
 
-Don�t forget to mention your operating system and GPU! If possible, try to attach a small, self-contained test case that reproduces the bug.
+Don't forget to mention your operating system and GPU! If possible, try to attach a small, self-contained test case that reproduces the bug.
 
 
 
 [API compatibility]
 
-Most projects will be able to upgrade to OpenTK 1.1 without any modifications. However, due to updates in the official OpenGL specification and due to bugfixes in the binding generator, a number of OpenGL signatures have changed between OpenTK 1.0 and 1.1. 
-
-Modified signatures have been marked with the [Obsolete] attribute. A warning message will be generated with instructions on a suggested replacement.
+OpenTK 1.1.1 is backwards compatible with 1.1.0.
 
-In a small number of cases, using the original signature would lead to incorrect results or a crash. These cases will generate a compile-time error now. If you use any of the following signatures, please apply the suggested modification:
+OpenTK 1.1.0 is not backwards compatible with 1.0. Most projects will be able to upgrade without any modifications. Projects using the following signatures will have to implement the suggested changes:
 
 Namespace OpenTK.Graphics.OpenGL
 Change signature:
@@ -145,4 +142,4 @@ Change `ref` parameters to `out`:
 Change namespace:
 - GL.DisableDriverControlQCOM -> GL.Qcom.DisableDriverControl
 - GL.GetDriverControlsQCOM -> GL.Qcom.GetDriverControls
-- GL.GetDriverControlStringQCOM -> GL.Qcom.GetDriverControlString
+- GL.GetDriverControlStringQCOM -> GL.Qcom.GetDriverControlString

Documentation/Release.txt

@@ -9,10 +9,19 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenTK", "Source\OpenTK\Ope
 	EndProjectSection
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenTK.Compatibility", "Source\Compatibility\OpenTK.Compatibility.csproj", "{62C0DB35-0000-0000-0000-000000000000}"
+	ProjectSection(ProjectDependencies) = postProject
+		{75DC22B1-113F-4A66-96B9-2FF8208C10E8} = {75DC22B1-113F-4A66-96B9-2FF8208C10E8}
+	EndProjectSection
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenTK.Examples", "Source\Examples\OpenTK.Examples.csproj", "{868E37B3-0000-0000-0000-000000000000}"
+	ProjectSection(ProjectDependencies) = postProject
+		{75DC22B1-113F-4A66-96B9-2FF8208C10E8} = {75DC22B1-113F-4A66-96B9-2FF8208C10E8}
+	EndProjectSection
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenTK.GLControl", "Source\GLControl\OpenTK.GLControl.csproj", "{A625BE88-0000-0000-0000-000000000000}"
+	ProjectSection(ProjectDependencies) = postProject
+		{75DC22B1-113F-4A66-96B9-2FF8208C10E8} = {75DC22B1-113F-4A66-96B9-2FF8208C10E8}
+	EndProjectSection
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Build.Installer.Nsis", "Installers\Nsis\Build.Installer.Nsis.csproj", "{ADC34399-7613-44D2-90B2-19250F06FE7A}"
 	ProjectSection(ProjectDependencies) = postProject
@@ -25,10 +34,19 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Build.Installer.Nsis", "Ins
 	EndProjectSection
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Build.Docs", "Documentation\Build.Docs.csproj", "{650C6F3D-33B5-4216-9536-956AB42C0624}"
+	ProjectSection(ProjectDependencies) = postProject
+		{75DC22B1-113F-4A66-96B9-2FF8208C10E8} = {75DC22B1-113F-4A66-96B9-2FF8208C10E8}
+	EndProjectSection
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Generator.Bind", "Source\Bind\Generator.Bind.csproj", "{31D19132-0000-0000-0000-000000000000}"
+	ProjectSection(ProjectDependencies) = postProject
+		{75DC22B1-113F-4A66-96B9-2FF8208C10E8} = {75DC22B1-113F-4A66-96B9-2FF8208C10E8}
+	EndProjectSection
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Generator.Convert", "Source\Converter\Generator.Convert.csproj", "{5FDFF4B6-0000-0000-0000-000000000000}"
+	ProjectSection(ProjectDependencies) = postProject
+		{75DC22B1-113F-4A66-96B9-2FF8208C10E8} = {75DC22B1-113F-4A66-96B9-2FF8208C10E8}
+	EndProjectSection
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Build.UpdateVersion", "Source\Build.UpdateVersion\Build.UpdateVersion.csproj", "{75DC22B1-113F-4A66-96B9-2FF8208C10E8}"
 EndProject
@@ -52,6 +70,9 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Build.Installer.Nuget", "In
 	EndProjectSection
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Generator.Rewrite", "Source\Generator.Rewrite\Generator.Rewrite.csproj", "{C426C9D1-8857-4E52-BAC7-4C05EE6070AB}"
+	ProjectSection(ProjectDependencies) = postProject
+		{75DC22B1-113F-4A66-96B9-2FF8208C10E8} = {75DC22B1-113F-4A66-96B9-2FF8208C10E8}
+	EndProjectSection
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

OpenTK.sln

@@ -18,8 +18,11 @@ Features
 
 OpenTK is available on Windows, Linux, Mac OS X, *BSD, SteamOS, Android and iOS. It can be used standalone or integrated into a GUI (Windows.Forms, WPF, GTK+, Qt, VTK, ...)
 
-Binaries and NuGet packages available at http://www.opentk.com
- 
+Current Version 1.1 stable released 2014-Feb-10: http://www.opentk.com/news/opentk-1.1-stable-released
+
+Binaries available at http://www.opentk.com
+
+NuGet packages at http://www.nuget.org/packages/OpenTK/
 
 Roadmap
 =======

README.md

@@ -35,18 +35,18 @@
 
 namespace Bind
 {
-    class BindStreamWriter : StreamWriter
+    class BindStreamWriter : IDisposable
     {
-        int indent_level = 0;
-        Regex splitLines = new Regex(Environment.NewLine, RegexOptions.Compiled);
-        //Regex splitLines = new Regex("(\r\n|\n\r|\n|\r)", RegexOptions.Compiled);
-
+        static readonly char[] SplitCharacters = new char[] { '\r', '\n' };
+        readonly StreamWriter sw;
         public readonly string File;
 
+        int indent_level = 0;
+
         public BindStreamWriter(string file)
-            : base(file)
         {
             File = file;
+            sw = new StreamWriter(file);
         }
 
         public void Indent()
@@ -60,9 +60,10 @@ public void Unindent()
                 --indent_level;
         }
 
-        public override void Write(string value)
+        public void Write(string value)
         {
-            var lines = splitLines.Split(value);
+            var lines = value.Split(SplitCharacters,
+                StringSplitOptions.RemoveEmptyEntries);
             bool is_multiline = lines.Length > 1;
             if (is_multiline)
             {
@@ -71,39 +72,60 @@ public override void Write(string value)
                 {
                     var line = lines[i];
                     WriteIndentations();
-                    base.Write(line);
-                    base.Write(System.Environment.NewLine);
+                    sw.Write(line);
+                    sw.Write(System.Environment.NewLine);
                 }
                 // Write the last line without appending a newline
                 WriteIndentations();
-                base.Write(lines[lines.Length - 1]);
+                sw.Write(lines[lines.Length - 1]);
             }
             else
             {
                 WriteIndentations();
-                base.Write(value);
+                sw.Write(value);
             }
         }
 
-        public override void WriteLine(string value)
+        public void Write(string format, params object[] args)
         {
-            // The Mono implementation of WriteLine calls Write internally.
-            // The .Net implementation does not.
-            // If running on Mono, we must avoid indenting in WriteLine
-            // because then we'll indent twice (once in WriteLine and once in Write).
-            // If running on .Net we must indent in both WriteLine and Write.
-            // Neat, no?
-            if (System.Type.GetType("Mono.Runtime") == null)
-            {
-                WriteIndentations();
-            }
-            base.WriteLine(value);
+            Write(String.Format(format, args));
+        }
+
+        public void WriteLine()
+        {
+            sw.WriteLine();
+        }
+
+        public void WriteLine(string value)
+        {
+            Write(value);
+            WriteLine();
+        }
+
+        public void WriteLine(string format, params object[] args)
+        {
+            WriteLine(String.Format(format, args));
+        }
+
+        public void Flush()
+        {
+            sw.Flush();
+        }
+
+        public void Close()
+        {
+            sw.Close();
         }
 
         void WriteIndentations()
         {
             for (int i = indent_level; i > 0; i--)
-                base.Write("    ");
+                sw.Write("    ");
+        }
+
+        public void Dispose()
+        {
+            sw.Dispose();
         }
     }
 }

Source/Bind/BindStreamWriter.cs

@@ -173,7 +173,12 @@ void WriteWrappers(BindStreamWriter sw, FunctionCollection wrappers,
             sw.WriteLine("{");
             sw.Indent();
             foreach (var d in delegates.Values.Select(d => d.First()))
-                sw.WriteLine("\"{0}{1}\",", Settings.FunctionPrefix, d.Name);
+            {
+                if (!Settings.IsEnabled(Settings.Legacy.UseDllImports) || d.Extension != "Core")
+                {
+                    sw.WriteLine("\"{0}{1}\",", Settings.FunctionPrefix, d.Name);
+                }
+            }
             sw.Unindent();
             sw.WriteLine("};");
             sw.WriteLine("EntryPoints = new IntPtr[EntryPointNames.Length];");
@@ -327,6 +332,16 @@ void WriteDocumentation(BindStreamWriter sw, Function f)
                     docs[0] = docs[0].Insert(summary_start, category);
                 }
 
+                foreach (var param in f.WrappedDelegate.Parameters)
+                {
+                    var index = docs.IndexOf("/// <param name=\"" + param.Name +"\">");
+                    if (index != -1 && param.ComputeSize != "")
+                    {
+                        var compute_size = string.Format("[length: {0}]", param.ComputeSize);
+                        docs[index] = docs[index] + compute_size;
+                    }
+                }
+
                 foreach (var doc in docs)
                 {
                     sw.WriteLine(doc);

Source/Bind/CSharpSpecWriter.cs

@@ -33,6 +33,7 @@ public ESGenerator(Settings settings, string dirName)
             // overloads using the "All" enum in addition to strongly-typed enums.
             // This can be disabled by passing "-o:-keep_untyped_enums" as a cmdline parameter.
             Settings.DefaultCompatibility |= Settings.Legacy.KeepUntypedEnums;
+            Settings.DefaultCompatibility |= Settings.Legacy.UseDllImports;
         }
     }
 }