diff --git a/Source/Converter/ESCLParser.cs b/Source/Converter/ESCLParser.cs index c1ff85a0..8548f7d5 100644 --- a/Source/Converter/ESCLParser.cs +++ b/Source/Converter/ESCLParser.cs @@ -70,7 +70,9 @@ namespace CHeaderToXML else return t; } +#pragma warning disable 0162 //CS0162: Unreachable code detected /* gmcs bug 336258 */ return ""; +#pragma warning restore 0162 }).ToArray(); Func get_name = tokens => diff --git a/Source/Converter/GLParser.cs b/Source/Converter/GLParser.cs index 307d0c17..b5fbd05e 100644 --- a/Source/Converter/GLParser.cs +++ b/Source/Converter/GLParser.cs @@ -43,7 +43,6 @@ namespace CHeaderToXML ParserModes CurrentMode; enum EntryModes { Core, Compatibility }; - EntryModes CurrentEntryMode; public override IEnumerable Parse(string[] lines) { @@ -67,7 +66,6 @@ namespace CHeaderToXML new XAttribute("name", words[0])); CurrentMode = ParserModes.Enum; - CurrentEntryMode = EntryModes.Core; } else if (line.StartsWith(words[0] + "(")) { @@ -94,21 +92,15 @@ namespace CHeaderToXML current.Add(new XElement("use", new XAttribute("enum", words[1]), new XAttribute("token", words[2]))); - //new XAttribute("profile", CurrentEntryMode == EntryModes.Compatibility ? - // "compatibility" : "core"))); } else if (words[1] == "=") { current.Add(new XElement("token", new XAttribute("name", words[0]), new XAttribute("value", words[2]))); - //new XAttribute("profile", CurrentEntryMode == EntryModes.Compatibility ? - // "compatibility" : "core"))); } else if (words[0] == "profile:") { - //CurrentEntryMode = words[1] == "compatibility" ? - // EntryModes.Compatibility : EntryModes.Core; } else if (words[0].Contains("future_use")) { diff --git a/Source/Examples/OpenGL/1.x/DisplayLists.cs b/Source/Examples/OpenGL/1.x/DisplayLists.cs index b985bafc..034929e2 100644 --- a/Source/Examples/OpenGL/1.x/DisplayLists.cs +++ b/Source/Examples/OpenGL/1.x/DisplayLists.cs @@ -65,7 +65,7 @@ namespace Examples.Tutorial GL.Rotate(c * 360.0f, 0.0, 0.0, 1.0); GL.Translate(5.0, 0.0, 0.0); - GL.Begin(BeginMode.Quads); + GL.Begin(PrimitiveType.Quads); GL.Vertex3(-1.0f, -1.0f, 1.0f); GL.Vertex3(1.0f, -1.0f, 1.0f); diff --git a/Source/Examples/OpenGL/1.x/FramebufferObject.cs b/Source/Examples/OpenGL/1.x/FramebufferObject.cs index c4bd9f2b..0847a9a0 100644 --- a/Source/Examples/OpenGL/1.x/FramebufferObject.cs +++ b/Source/Examples/OpenGL/1.x/FramebufferObject.cs @@ -39,7 +39,6 @@ namespace Examples.Tutorial { throw new NotSupportedException( "GL_EXT_framebuffer_object extension is required. Please update your drivers."); - Exit(); } Object = new Shapes.TorusKnot(256, 16, 0.2, 7,8, 1, true); @@ -234,7 +233,7 @@ namespace Examples.Tutorial // Draw the Color Texture GL.Translate(-1.1f, 0f, 0f); GL.BindTexture(TextureTarget.Texture2D, ColorTexture); - GL.Begin(BeginMode.Quads); + GL.Begin(PrimitiveType.Quads); { GL.TexCoord2(0f, 1f); GL.Vertex2(-1.0f, 1.0f); @@ -250,7 +249,7 @@ namespace Examples.Tutorial // Draw the Depth Texture GL.Translate(+2.2f, 0f, 0f); GL.BindTexture(TextureTarget.Texture2D, DepthTexture); - GL.Begin(BeginMode.Quads); + GL.Begin(PrimitiveType.Quads); { GL.TexCoord2(0f, 1f); GL.Vertex2(-1.0f, 1.0f); diff --git a/Source/Examples/OpenGL/1.x/ImmediateMode.cs b/Source/Examples/OpenGL/1.x/ImmediateMode.cs index c44c2f5b..166ff6ef 100644 --- a/Source/Examples/OpenGL/1.x/ImmediateMode.cs +++ b/Source/Examples/OpenGL/1.x/ImmediateMode.cs @@ -127,7 +127,7 @@ namespace Examples.Tutorial private void DrawCube() { - GL.Begin(BeginMode.Quads); + GL.Begin(PrimitiveType.Quads); GL.Color3(Color.Silver); GL.Vertex3(-1.0f, -1.0f, -1.0f); diff --git a/Source/Examples/OpenGL/1.x/Picking.cs b/Source/Examples/OpenGL/1.x/Picking.cs index d3b9a0c5..67c8323b 100644 --- a/Source/Examples/OpenGL/1.x/Picking.cs +++ b/Source/Examples/OpenGL/1.x/Picking.cs @@ -65,7 +65,7 @@ namespace Examples.Tutorial const TextureTarget Target = TextureTarget.TextureRectangleArb; float angle; - BeginMode VBO_PrimMode; + PrimitiveType VBO_PrimMode; Vertex[] VBO_Array; uint VBO_Handle; @@ -235,7 +235,7 @@ namespace Examples.Tutorial protected override void OnRenderFrame(FrameEventArgs e) { GL.Color3(Color.White); - GL.EnableClientState(EnableCap.ColorArray); + GL.EnableClientState(ArrayCap.ColorArray); #region Pass 1: Draw Object and pick Triangle GL.ClearColor(1f, 1f, 1f, 1f); // clears to uint.MaxValue @@ -261,7 +261,7 @@ namespace Examples.Tutorial #endregion Pass 1: Draw Object and pick Triangle GL.Color3(Color.White); - GL.DisableClientState(EnableCap.ColorArray); + GL.DisableClientState(ArrayCap.ColorArray); #region Pass 2: Draw Shape if (SelectedTriangle == uint.MaxValue) diff --git a/Source/Examples/OpenGL/1.x/StencilCSG.cs b/Source/Examples/OpenGL/1.x/StencilCSG.cs index 4162c39d..116fcf03 100644 --- a/Source/Examples/OpenGL/1.x/StencilCSG.cs +++ b/Source/Examples/OpenGL/1.x/StencilCSG.cs @@ -145,7 +145,7 @@ namespace Examples.Tutorial #region Invert Operand B's Normals // only the inside of the operand is ever drawn to color buffers and lighting requires this. - BeginMode tempPrimMode; + PrimitiveType tempPrimMode; VertexT2dN3dV3d[] tempVertices; uint[] tempIndices; diff --git a/Source/Examples/OpenGL/1.x/TextRendering.cs b/Source/Examples/OpenGL/1.x/TextRendering.cs index 202adcbe..9eb975f0 100644 --- a/Source/Examples/OpenGL/1.x/TextRendering.cs +++ b/Source/Examples/OpenGL/1.x/TextRendering.cs @@ -234,7 +234,7 @@ namespace Examples.Tutorial GL.Enable(EnableCap.Texture2D); GL.BindTexture(TextureTarget.Texture2D, renderer.Texture); - GL.Begin(BeginMode.Quads); + GL.Begin(PrimitiveType.Quads); GL.TexCoord2(0.0f, 1.0f); GL.Vertex2(-1f, -1f); GL.TexCoord2(1.0f, 1.0f); GL.Vertex2(1f, -1f); diff --git a/Source/Examples/OpenGL/1.x/TextureMatrix.cs b/Source/Examples/OpenGL/1.x/TextureMatrix.cs index 4070639e..7f98ea12 100644 --- a/Source/Examples/OpenGL/1.x/TextureMatrix.cs +++ b/Source/Examples/OpenGL/1.x/TextureMatrix.cs @@ -45,7 +45,7 @@ namespace Examples.Tutorial const int slices = 32; const float distance = 0.25f; - GL.Begin(BeginMode.Quads); + GL.Begin(PrimitiveType.Quads); for (float scale = 0.26f; scale < 5f; scale += distance) for (int i = 0; i < slices; i++) diff --git a/Source/Examples/OpenGL/1.x/Textures.cs b/Source/Examples/OpenGL/1.x/Textures.cs index 4beea6c9..4ad60814 100644 --- a/Source/Examples/OpenGL/1.x/Textures.cs +++ b/Source/Examples/OpenGL/1.x/Textures.cs @@ -114,7 +114,7 @@ namespace Examples.Tutorial GL.LoadIdentity(); GL.BindTexture(TextureTarget.Texture2D, texture); - GL.Begin(BeginMode.Quads); + GL.Begin(PrimitiveType.Quads); GL.TexCoord2(0.0f, 1.0f); GL.Vertex2(-0.6f, -0.4f); GL.TexCoord2(1.0f, 1.0f); GL.Vertex2(0.6f, -0.4f); diff --git a/Source/Examples/OpenGL/1.x/VBODynamic.cs b/Source/Examples/OpenGL/1.x/VBODynamic.cs index 97716cb6..16b012db 100644 --- a/Source/Examples/OpenGL/1.x/VBODynamic.cs +++ b/Source/Examples/OpenGL/1.x/VBODynamic.cs @@ -185,7 +185,7 @@ namespace Examples.Tutorial // Fill newly allocated buffer GL.BufferData(BufferTarget.ArrayBuffer, (IntPtr)(VertexC4ubV3f.SizeInBytes * MaxParticleCount), VBO, BufferUsageHint.StreamDraw); // Only draw particles that are alive - GL.DrawArrays(BeginMode.Points, MaxParticleCount - VisibleParticleCount, VisibleParticleCount); + GL.DrawArrays(PrimitiveType.Points, MaxParticleCount - VisibleParticleCount, VisibleParticleCount); GL.PopMatrix(); diff --git a/Source/Examples/OpenGL/1.x/VBOStatic.cs b/Source/Examples/OpenGL/1.x/VBOStatic.cs index 4e378177..0c43a81d 100644 --- a/Source/Examples/OpenGL/1.x/VBOStatic.cs +++ b/Source/Examples/OpenGL/1.x/VBOStatic.cs @@ -158,7 +158,7 @@ namespace Examples.Tutorial GL.VertexPointer(3, VertexPointerType.Float, BlittableValueType.StrideOf(CubeVertices), new IntPtr(0)); GL.ColorPointer(4, ColorPointerType.UnsignedByte, BlittableValueType.StrideOf(CubeVertices), new IntPtr(12)); - GL.DrawElements(BeginMode.Triangles, handle.NumElements, DrawElementsType.UnsignedShort, IntPtr.Zero); + GL.DrawElements(PrimitiveType.Triangles, handle.NumElements, DrawElementsType.UnsignedShort, IntPtr.Zero); } /// diff --git a/Source/Examples/OpenGL/1.x/VertexArrays.cs b/Source/Examples/OpenGL/1.x/VertexArrays.cs index 0b6c529f..6f50602e 100644 --- a/Source/Examples/OpenGL/1.x/VertexArrays.cs +++ b/Source/Examples/OpenGL/1.x/VertexArrays.cs @@ -153,7 +153,7 @@ namespace Examples.Tutorial angle -= 360.0f; GL.Rotate(angle, 0.0f, 1.0f, 0.0f); - GL.DrawElements(BeginMode.Triangles, shape.Indices.Length, + GL.DrawElements(PrimitiveType.Triangles, shape.Indices.Length, DrawElementsType.UnsignedInt, shape.Indices); //GL.Begin(GL.Enums.BeginMode.TRIANGLES); diff --git a/Source/Examples/OpenGL/1.x/VertexLighting.cs b/Source/Examples/OpenGL/1.x/VertexLighting.cs index 33299851..fb950f23 100644 --- a/Source/Examples/OpenGL/1.x/VertexLighting.cs +++ b/Source/Examples/OpenGL/1.x/VertexLighting.cs @@ -143,7 +143,7 @@ namespace Examples.Tutorial GL.Rotate(x_angle, 0.0f, 1.0f, 0.0f); - GL.Begin(BeginMode.Triangles); + GL.Begin(PrimitiveType.Triangles); foreach (int index in shape.Indices) { GL.Normal3(shape.Normals[index]); diff --git a/Source/Examples/OpenGL/2.x/DDSCubeMap.cs b/Source/Examples/OpenGL/2.x/DDSCubeMap.cs index 9a541d8d..3e152fdf 100644 --- a/Source/Examples/OpenGL/2.x/DDSCubeMap.cs +++ b/Source/Examples/OpenGL/2.x/DDSCubeMap.cs @@ -130,7 +130,7 @@ namespace Examples.Tutorial GL.DeleteShader( FragmentShaderObject ); int[] temp = new int[1]; - GL.GetProgram( ProgramObject, ProgramParameter.LinkStatus, out temp[0] ); + GL.GetProgram(ProgramObject, GetProgramParameterName.LinkStatus, out temp[0]); Trace.WriteLine( "Linking Program (" + ProgramObject + ") " + ( ( temp[0] == 1 ) ? "succeeded." : "FAILED!" ) ); if ( temp[0] != 1 ) { @@ -138,7 +138,7 @@ namespace Examples.Tutorial Trace.WriteLine( "Program Log:\n" + LogInfo ); } - GL.GetProgram( ProgramObject, ProgramParameter.ActiveAttributes, out temp[0] ); + GL.GetProgram(ProgramObject, GetProgramParameterName.ActiveAttributes, out temp[0]); Trace.WriteLine( "Program registered " + temp[0] + " Attributes. (Should be 4: Pos, UV, Normal, Tangent)" ); Trace.WriteLine( "Tangent attribute bind location: " + GL.GetAttribLocation( ProgramObject, "AttributeTangent" ) ); diff --git a/Source/Examples/OpenGL/2.x/GeometryShader.cs b/Source/Examples/OpenGL/2.x/GeometryShader.cs index 5f2365e3..26b9d4c7 100644 --- a/Source/Examples/OpenGL/2.x/GeometryShader.cs +++ b/Source/Examples/OpenGL/2.x/GeometryShader.cs @@ -107,15 +107,15 @@ namespace Examples.Tutorial // Set the input type of the primitives we are going to feed the geometry shader, this should be the same as // the primitive type given to GL.Begin. If the types do not match a GL error will occur (todo: verify GL_INVALID_ENUM, on glBegin) - GL.Ext.ProgramParameter(shaderProgram, ExtGeometryShader4.GeometryInputTypeExt, (int)BeginMode.Lines); + GL.Ext.ProgramParameter(shaderProgram, AssemblyProgramParameterArb.GeometryInputType, (int)BeginMode.Lines); // Set the output type of the geometry shader. Becasue we input Lines we will output LineStrip(s). - GL.Ext.ProgramParameter(shaderProgram, ExtGeometryShader4.GeometryOutputTypeExt, (int)BeginMode.LineStrip); + GL.Ext.ProgramParameter(shaderProgram, AssemblyProgramParameterArb.GeometryOutputType, (int)BeginMode.LineStrip); // We must tell the shader program how much vertices the geometry shader will output (at most). // One simple way is to query the maximum and use that. // NOTE: Make sure that the number of vertices * sum(components of active varyings) does not // exceed MaxGeometryTotalOutputComponents. - GL.Ext.ProgramParameter(shaderProgram, ExtGeometryShader4.GeometryVerticesOutExt, 50); + GL.Ext.ProgramParameter(shaderProgram, AssemblyProgramParameterArb.GeometryVerticesOut, 50); // NOTE: calls to ProgramParameter do not take effect until you call LinkProgram. GL.LinkProgram(shaderProgram); @@ -211,7 +211,7 @@ namespace Examples.Tutorial GL.Clear(ClearBufferMask.ColorBufferBit | ClearBufferMask.DepthBufferBit); // draw two vertical lines - GL.Begin(BeginMode.Lines); + GL.Begin(PrimitiveType.Lines); { // line one GL.Vertex2(-0.5f, -0.5f); diff --git a/Source/Examples/OpenGL/2.x/GeometryShaderAdvanced.cs b/Source/Examples/OpenGL/2.x/GeometryShaderAdvanced.cs index af9e6fae..6d72e0ea 100644 --- a/Source/Examples/OpenGL/2.x/GeometryShaderAdvanced.cs +++ b/Source/Examples/OpenGL/2.x/GeometryShaderAdvanced.cs @@ -352,10 +352,10 @@ namespace Examples.Tutorial int tmp; GL.GetInteger((GetPName)ExtGeometryShader4.MaxGeometryOutputVerticesExt, out tmp); - GL.Ext.ProgramParameter(shaderProgramCubemap, ExtGeometryShader4.GeometryVerticesOutExt, 18); + GL.Ext.ProgramParameter(shaderProgramCubemap, AssemblyProgramParameterArb.GeometryVerticesOut, 18); - GL.Ext.ProgramParameter(shaderProgramCubemap, ExtGeometryShader4.GeometryInputTypeExt, (int)All.Triangles); - GL.Ext.ProgramParameter(shaderProgramCubemap, ExtGeometryShader4.GeometryOutputTypeExt, (int)All.TriangleStrip); + GL.Ext.ProgramParameter(shaderProgramCubemap, AssemblyProgramParameterArb.GeometryInputType, (int)All.Triangles); + GL.Ext.ProgramParameter(shaderProgramCubemap, AssemblyProgramParameterArb.GeometryOutputType, (int)All.TriangleStrip); // attach shaders and link the program. GL.AttachShader(shaderProgramCubemap, frag); @@ -623,7 +623,7 @@ namespace Examples.Tutorial GL.PushMatrix(); GL.LoadIdentity(); - GL.Begin(BeginMode.Quads); + GL.Begin(PrimitiveType.Quads); // 0 -x GL.TexCoord3(-1.0f, +1.0f, -1.0f); @@ -705,7 +705,7 @@ namespace Examples.Tutorial GL.TexCoordPointer(2, TexCoordPointerType.Float, vboCubeStride, new IntPtr(Vector3.SizeInBytes + Vector3.SizeInBytes)); //GL.Arb.DrawArraysInstanced(BeginMode.Triangles, 0, cubeData.Length/8, 1); - GL.DrawArrays(BeginMode.Triangles, 0, cubeData.Length / (vboCubeStride / sizeof(float))); + GL.DrawArrays(PrimitiveType.Triangles, 0, cubeData.Length / (vboCubeStride / sizeof(float))); GL.DisableClientState(ArrayCap.VertexArray); GL.DisableClientState(ArrayCap.NormalArray); @@ -725,7 +725,7 @@ namespace Examples.Tutorial GL.TexCoordPointer(2, TexCoordPointerType.Float, vboSphereStride, new IntPtr(Vector3.SizeInBytes + Vector3.SizeInBytes)); GL.BindBuffer(BufferTarget.ElementArrayBuffer, eboSphere); - GL.DrawElements(BeginMode.Triangles, 16 * 16 * 6, DrawElementsType.UnsignedShort, IntPtr.Zero); + GL.DrawElements(PrimitiveType.Triangles, 16 * 16 * 6, DrawElementsType.UnsignedShort, IntPtr.Zero); //GL.Arb.DrawArraysInstanced(BeginMode.Triangles, 0, cubeData.Length/8, 1); //GL.DrawArrays(BeginMode.Triangles, 0, sphereData.Length / (vboSphereStride / sizeof(float))); @@ -758,7 +758,7 @@ namespace Examples.Tutorial // Create 6 ModelViewProjection matrices, one to look in each direction // proj with 90 degrees (1/2 pi) fov // translate negative to place cam insize sphere - Matrix4 model = Matrix4.Scale(-1) * Matrix4.CreateTranslation(spherePos); + Matrix4 model = Matrix4.CreateScale(-1) * Matrix4.CreateTranslation(spherePos); Matrix4 proj = Matrix4.CreatePerspectiveFieldOfView(MathHelper.PiOver2, 1, 0.1f, 100f); Matrix4[] m = new Matrix4[6]; diff --git a/Source/Examples/OpenGL/2.x/JuliaSetFractal.cs b/Source/Examples/OpenGL/2.x/JuliaSetFractal.cs index 4b1ee244..f9c88a20 100644 --- a/Source/Examples/OpenGL/2.x/JuliaSetFractal.cs +++ b/Source/Examples/OpenGL/2.x/JuliaSetFractal.cs @@ -158,11 +158,11 @@ namespace Examples.Tutorial } #endregion Textures - Keyboard.KeyUp += KeyUp; + Keyboard.KeyUp += Keyboard_KeyUp; } int i = 0; - void KeyUp(object sender, KeyboardKeyEventArgs e) + void Keyboard_KeyUp(object sender, KeyboardKeyEventArgs e) { if (e.Key == Key.F12) { @@ -272,7 +272,7 @@ namespace Examples.Tutorial GL.Uniform1(GL.GetUniformLocation(ProgramObject, "OFFSETY"), UniformOffsetY); // Fullscreen quad. Using immediate mode, since this app is fragment shader limited anyways. - GL.Begin(BeginMode.Quads); + GL.Begin(PrimitiveType.Quads); { GL.Vertex2(-1.0f, -1.0f); GL.Vertex2(1.0f, -1.0f); diff --git a/Source/Examples/OpenGL/2.x/SimpleGLSL.cs b/Source/Examples/OpenGL/2.x/SimpleGLSL.cs index d0e37fe6..c2eac194 100644 --- a/Source/Examples/OpenGL/2.x/SimpleGLSL.cs +++ b/Source/Examples/OpenGL/2.x/SimpleGLSL.cs @@ -252,7 +252,7 @@ namespace Examples.Tutorial GL.ColorPointer(4, ColorPointerType.UnsignedByte, 0, IntPtr.Zero); GL.BindBuffer(BufferTarget.ElementArrayBuffer, element_buffer_object); - GL.DrawElements(BeginMode.Triangles, shape.Indices.Length, + GL.DrawElements(PrimitiveType.Triangles, shape.Indices.Length, DrawElementsType.UnsignedInt, IntPtr.Zero); //GL.DrawArrays(GL.Enums.BeginMode.POINTS, 0, shape.Vertices.Length); diff --git a/Source/Examples/OpenGL/2.x/SwizzledParallax.cs b/Source/Examples/OpenGL/2.x/SwizzledParallax.cs index 9293c798..6e5bf4e5 100644 --- a/Source/Examples/OpenGL/2.x/SwizzledParallax.cs +++ b/Source/Examples/OpenGL/2.x/SwizzledParallax.cs @@ -161,7 +161,7 @@ namespace Examples.Tutorial GL.DeleteShader( VertexShaderObject ); GL.DeleteShader( FragmentShaderObject ); - GL.GetProgram( ProgramObject, ProgramParameter.LinkStatus, out temp[0] ); + GL.GetProgram(ProgramObject, GetProgramParameterName.LinkStatus, out temp[0]); Trace.WriteLine( "Linking Program (" + ProgramObject + ") " + ( ( temp[0] == 1 ) ? "succeeded." : "FAILED!" ) ); if ( temp[0] != 1 ) { @@ -169,7 +169,7 @@ namespace Examples.Tutorial Trace.WriteLine( "Program Log:\n" + LogInfo ); } - GL.GetProgram( ProgramObject, ProgramParameter.ActiveAttributes, out temp[0] ); + GL.GetProgram(ProgramObject, GetProgramParameterName.ActiveAttributes, out temp[0]); Trace.WriteLine( "Program registered " + temp[0] + " Attributes. (Should be 4: Pos, UV, Normal, Tangent)" ); Trace.WriteLine( "Tangent attribute bind location: " + GL.GetAttribLocation( ProgramObject, "AttributeTangent" ) ); @@ -315,7 +315,7 @@ namespace Examples.Tutorial GL.Color3( 1f, 1f, 1f ); - GL.Begin( BeginMode.Quads ); + GL.Begin(PrimitiveType.Quads); { GL.Normal3( Normal ); GL.VertexAttrib3( AttribTangent, ref Tangent ); @@ -344,7 +344,7 @@ namespace Examples.Tutorial GL.UseProgram( 0 ); // visualize the light position 'somehow' - GL.Begin( BeginMode.Points ); + GL.Begin(PrimitiveType.Points); { GL.Color3( LightSpecular ); GL.Vertex3( LightPosition ); diff --git a/Source/Examples/OpenTK/GLControl/GLControlGameLoop.cs b/Source/Examples/OpenTK/GLControl/GLControlGameLoop.cs index 44230363..0ee55fb5 100644 --- a/Source/Examples/OpenTK/GLControl/GLControlGameLoop.cs +++ b/Source/Examples/OpenTK/GLControl/GLControlGameLoop.cs @@ -160,7 +160,7 @@ namespace Examples.WinForms private void DrawCube() { - GL.Begin(BeginMode.Quads); + GL.Begin(PrimitiveType.Quads); GL.Color3(Color.Silver); GL.Vertex3(-1.0f, -1.0f, -1.0f); diff --git a/Source/Examples/OpenTK/GameWindow/GameWindowMsaa.cs b/Source/Examples/OpenTK/GameWindow/GameWindowMsaa.cs index e225d456..afecfcd7 100644 --- a/Source/Examples/OpenTK/GameWindow/GameWindowMsaa.cs +++ b/Source/Examples/OpenTK/GameWindow/GameWindowMsaa.cs @@ -99,7 +99,7 @@ namespace Examples { GL.Clear(ClearBufferMask.ColorBufferBit); - GL.Begin(BeginMode.Triangles); + GL.Begin(PrimitiveType.Triangles); GL.Color3(Color.MidnightBlue); GL.Vertex2(-1.0f, 1.0f); diff --git a/Source/Examples/OpenTK/GameWindow/GameWindowSimple.cs b/Source/Examples/OpenTK/GameWindow/GameWindowSimple.cs index 4fadfd19..383fdfad 100644 --- a/Source/Examples/OpenTK/GameWindow/GameWindowSimple.cs +++ b/Source/Examples/OpenTK/GameWindow/GameWindowSimple.cs @@ -98,7 +98,7 @@ namespace Examples.Tutorial { GL.Clear(ClearBufferMask.ColorBufferBit); - GL.Begin(BeginMode.Triangles); + GL.Begin(PrimitiveType.Triangles); GL.Color3(Color.MidnightBlue); GL.Vertex2(-1.0f, 1.0f); diff --git a/Source/Examples/OpenTK/GameWindow/GameWindowThreaded.cs b/Source/Examples/OpenTK/GameWindow/GameWindowThreaded.cs index 78cf0be0..bcc7183d 100644 --- a/Source/Examples/OpenTK/GameWindow/GameWindowThreaded.cs +++ b/Source/Examples/OpenTK/GameWindow/GameWindowThreaded.cs @@ -287,7 +287,7 @@ namespace Examples.Tutorial GL.Clear(ClearBufferMask.ColorBufferBit | ClearBufferMask.DepthBufferBit); - GL.Begin(BeginMode.Points); + GL.Begin(PrimitiveType.Points); foreach (Particle p in Particles) { GL.Color4(p.Color); diff --git a/Source/Examples/OpenTK/Test/TestShaderUtf8Support.cs b/Source/Examples/OpenTK/Test/TestShaderUtf8Support.cs index 0de01d45..b410fca0 100644 --- a/Source/Examples/OpenTK/Test/TestShaderUtf8Support.cs +++ b/Source/Examples/OpenTK/Test/TestShaderUtf8Support.cs @@ -218,7 +218,7 @@ void main(void) GL.Clear(ClearBufferMask.ColorBufferBit | ClearBufferMask.DepthBufferBit); GL.BindVertexArray(vaoHandle); - GL.DrawElements(BeginMode.Triangles, indicesVboData.Length, + GL.DrawElements(PrimitiveType.Triangles, indicesVboData.Length, DrawElementsType.UnsignedInt, IntPtr.Zero); SwapBuffers(); diff --git a/Source/Examples/Shapes/Base/DrawableShape.cs b/Source/Examples/Shapes/Base/DrawableShape.cs index f6f9be7f..2c786d15 100644 --- a/Source/Examples/Shapes/Base/DrawableShape.cs +++ b/Source/Examples/Shapes/Base/DrawableShape.cs @@ -22,7 +22,7 @@ namespace Examples.Shapes public abstract class DrawableShape: IDisposable { - protected BeginMode PrimitiveMode; + protected PrimitiveType PrimitiveMode; protected VertexT2dN3dV3d[] VertexArray; protected uint[] IndexArray; @@ -31,8 +31,8 @@ namespace Examples.Shapes get { switch ( PrimitiveMode ) - { - case BeginMode.Triangles: + { + case PrimitiveType.Triangles: if ( IndexArray != null ) { return IndexArray.Length / 3; @@ -56,14 +56,14 @@ namespace Examples.Shapes public DrawableShape( bool useDisplayList ) { UseDisplayList = useDisplayList; - PrimitiveMode = BeginMode.Triangles; + PrimitiveMode = PrimitiveType.Triangles; VertexArray = null; IndexArray = null; } #region Convert to VBO - public void GetArraysforVBO(out BeginMode primitives, out VertexT2dN3dV3d[] vertices, out uint[] indices) + public void GetArraysforVBO(out PrimitiveType primitives, out VertexT2dN3dV3d[] vertices, out uint[] indices) { primitives = PrimitiveMode; @@ -78,7 +78,7 @@ namespace Examples.Shapes indices = IndexArray; } - public void GetArraysforVBO(out BeginMode primitives, out VertexT2fN3fV3f[] vertices, out uint[] indices) + public void GetArraysforVBO(out PrimitiveType primitives, out VertexT2fN3fV3f[] vertices, out uint[] indices) { primitives = PrimitiveMode; @@ -93,7 +93,7 @@ namespace Examples.Shapes indices = IndexArray; } - public void GetArraysforVBO(out BeginMode primitives, out VertexT2hN3hV3h[] vertices, out uint[] indices) + public void GetArraysforVBO(out PrimitiveType primitives, out VertexT2hN3hV3h[] vertices, out uint[] indices) { primitives = PrimitiveMode; diff --git a/Source/Examples/Shapes/Capsule.cs b/Source/Examples/Shapes/Capsule.cs index f194273f..3ada2fca 100644 --- a/Source/Examples/Shapes/Capsule.cs +++ b/Source/Examples/Shapes/Capsule.cs @@ -46,9 +46,9 @@ namespace Examples.Shapes HoseSubDivs = 15; break; } - PrimitiveMode = OpenTK.Graphics.OpenGL.BeginMode.Triangles; + PrimitiveMode = OpenTK.Graphics.OpenGL.PrimitiveType.Triangles; - OpenTK.Graphics.OpenGL.BeginMode TemporaryMode; + OpenTK.Graphics.OpenGL.PrimitiveType TemporaryMode; VertexT2dN3dV3d[] TemporaryVBO; uint[] TemporaryIBO; diff --git a/Source/Examples/Shapes/ChamferCube.cs b/Source/Examples/Shapes/ChamferCube.cs index 0f21b7f6..08383af0 100644 --- a/Source/Examples/Shapes/ChamferCube.cs +++ b/Source/Examples/Shapes/ChamferCube.cs @@ -50,7 +50,7 @@ namespace Examples.Shapes #region Temporary Storage List AllChunks = new List(); - OpenTK.Graphics.OpenGL.BeginMode TemporaryMode; + OpenTK.Graphics.OpenGL.PrimitiveType TemporaryMode; VertexT2dN3dV3d[] TemporaryVBO; uint[] TemporaryIBO; @@ -271,7 +271,7 @@ namespace Examples.Shapes #endregion 6 quads for the sides #region Final Assembly of Chunks - PrimitiveMode = OpenTK.Graphics.OpenGL.BeginMode.Triangles; + PrimitiveMode = OpenTK.Graphics.OpenGL.PrimitiveType.Triangles; Chunk.GetArray( ref AllChunks, out VertexArray, out IndexArray ); AllChunks.Clear(); #endregion Final Assembly of Chunks diff --git a/Source/Examples/Shapes/Helpers/VboShape.cs b/Source/Examples/Shapes/Helpers/VboShape.cs index 7f72ec46..23c4b21a 100644 --- a/Source/Examples/Shapes/Helpers/VboShape.cs +++ b/Source/Examples/Shapes/Helpers/VboShape.cs @@ -6,7 +6,7 @@ namespace Examples.Shapes { public sealed class VboShape: DrawableShape { - public VboShape( ref OpenTK.Graphics.OpenGL.BeginMode primitives, ref VertexT2dN3dV3d[] vertices, ref uint[] indices, bool useDL ) + public VboShape(ref OpenTK.Graphics.OpenGL.PrimitiveType primitives, ref VertexT2dN3dV3d[] vertices, ref uint[] indices, bool useDL) : base( useDL ) { PrimitiveMode = primitives; diff --git a/Source/Examples/Shapes/KochTetrahedron.cs b/Source/Examples/Shapes/KochTetrahedron.cs index f2b5230d..8d3f2fab 100644 --- a/Source/Examples/Shapes/KochTetrahedron.cs +++ b/Source/Examples/Shapes/KochTetrahedron.cs @@ -50,7 +50,7 @@ namespace Examples.Shapes } - PrimitiveMode = OpenTK.Graphics.OpenGL.BeginMode.Triangles; + PrimitiveMode = OpenTK.Graphics.OpenGL.PrimitiveType.Triangles; SierpinskiTetrahedron.GetVertexArray( ref Triangles, out VertexArray ); IndexArray = null; } diff --git a/Source/Examples/Shapes/MengerSponge.cs b/Source/Examples/Shapes/MengerSponge.cs index 42a66c7a..dd78af82 100644 --- a/Source/Examples/Shapes/MengerSponge.cs +++ b/Source/Examples/Shapes/MengerSponge.cs @@ -39,7 +39,7 @@ namespace Examples.Shapes default: throw new ArgumentOutOfRangeException( "Subdivisions other than contained in the enum cause overflows and are not allowed." ); } - PrimitiveMode = OpenTK.Graphics.OpenGL.BeginMode.Triangles; + PrimitiveMode = OpenTK.Graphics.OpenGL.PrimitiveType.Triangles; #region Get Array Dimensions uint diff --git a/Source/Examples/Shapes/Old/SierpinskiTetrahedron.cs b/Source/Examples/Shapes/Old/SierpinskiTetrahedron.cs index f1b4c96b..22f59cfe 100644 --- a/Source/Examples/Shapes/Old/SierpinskiTetrahedron.cs +++ b/Source/Examples/Shapes/Old/SierpinskiTetrahedron.cs @@ -66,7 +66,7 @@ namespace Examples.Shapes default: throw new ArgumentOutOfRangeException( "Subdivisions other than contained in the enum cause overflows and are not allowed." ); } - PrimitiveMode = OpenTK.Graphics.OpenGL.BeginMode.Triangles; + PrimitiveMode = OpenTK.Graphics.OpenGL.PrimitiveType.Triangles; SierpinskiTetrahedron.GetVertexArray( ref Triangles, out VertexArray ); IndexArray = null; } diff --git a/Source/Examples/Shapes/SlicedHose.cs b/Source/Examples/Shapes/SlicedHose.cs index 95e8df1b..a27ab67b 100644 --- a/Source/Examples/Shapes/SlicedHose.cs +++ b/Source/Examples/Shapes/SlicedHose.cs @@ -32,7 +32,7 @@ namespace Examples.Shapes public SlicedHose( eSide side, uint subdivs, double scale, Vector3d offset1, Vector3d offset2, bool useDL ) : base( useDL ) { - PrimitiveMode = OpenTK.Graphics.OpenGL.BeginMode.Triangles; + PrimitiveMode = OpenTK.Graphics.OpenGL.PrimitiveType.Triangles; Vector3d start = Vector3d.Zero, end = Vector3d.Zero; diff --git a/Source/Examples/Shapes/SlicedSphere.cs b/Source/Examples/Shapes/SlicedSphere.cs index 52105bbd..818d981c 100644 --- a/Source/Examples/Shapes/SlicedSphere.cs +++ b/Source/Examples/Shapes/SlicedSphere.cs @@ -40,7 +40,7 @@ namespace Examples.Shapes { double Diameter = radius; - PrimitiveMode = OpenTK.Graphics.OpenGL.BeginMode.Triangles; + PrimitiveMode = OpenTK.Graphics.OpenGL.PrimitiveType.Triangles; if ( sides[0] == eDir.All ) { diff --git a/Source/Examples/Shapes/TorusKnot.cs b/Source/Examples/Shapes/TorusKnot.cs index c1aa9dfc..6686d449 100644 --- a/Source/Examples/Shapes/TorusKnot.cs +++ b/Source/Examples/Shapes/TorusKnot.cs @@ -21,7 +21,7 @@ namespace Examples.Shapes Trace.Assert( shapevertices >= MINShapeVertices, "A Shape must contain at least " + MINShapeVertices + " Vertices to be considered valid and create a volume." ); Trace.Assert( TexCount >= 1, "at least 1 Texture set is required." ); - PrimitiveMode = OpenTK.Graphics.OpenGL.BeginMode.TriangleStrip; + PrimitiveMode = OpenTK.Graphics.OpenGL.PrimitiveType.TriangleStrip; Vector3d[] PathPositions = new Vector3d[pathsteps]; diff --git a/Source/OpenTK/BindingsBase.cs b/Source/OpenTK/BindingsBase.cs index dee9caa2..7261cbf1 100644 --- a/Source/OpenTK/BindingsBase.cs +++ b/Source/OpenTK/BindingsBase.cs @@ -188,7 +188,7 @@ namespace OpenTK /// /// Frees a marshalled string that allocated by MarshalStringToPtr. /// - /// An unmanaged pointer allocated with MarshalStringToPtr + /// An unmanaged pointer allocated with MarshalStringToPtr protected static void FreeStringPtr(IntPtr ptr) { Marshal.FreeHGlobal(ptr); diff --git a/Source/OpenTK/Configuration.cs b/Source/OpenTK/Configuration.cs index fcae8212..0f3e99af 100644 --- a/Source/OpenTK/Configuration.cs +++ b/Source/OpenTK/Configuration.cs @@ -44,7 +44,6 @@ namespace OpenTK { static bool runningOnWindows, runningOnUnix, runningOnX11, runningOnMacOS, runningOnLinux; static bool runningOnMono; - static bool runningOnAndroid; volatile static bool initialized; readonly static object InitLock = new object(); diff --git a/Source/OpenTK/Graphics/ColorFormat.cs b/Source/OpenTK/Graphics/ColorFormat.cs index 12d7aafb..f781410a 100644 --- a/Source/OpenTK/Graphics/ColorFormat.cs +++ b/Source/OpenTK/Graphics/ColorFormat.cs @@ -183,6 +183,11 @@ namespace OpenTK.Graphics #region IEquatable Members + /// + /// Compares whether this ColorFormat structure is equal to the specified ColorFormat. + /// + /// The ColorFormat structure to compare to. + /// True if both ColorFormat structures contain the same components; false otherwise. public bool Equals(ColorFormat other) { return diff --git a/Source/OpenTK/Graphics/GraphicsContext.cs b/Source/OpenTK/Graphics/GraphicsContext.cs index 970bdab8..9069ebd6 100644 --- a/Source/OpenTK/Graphics/GraphicsContext.cs +++ b/Source/OpenTK/Graphics/GraphicsContext.cs @@ -39,7 +39,17 @@ namespace OpenTK.Graphics /// public sealed class GraphicsContext : IGraphicsContext, IGraphicsContextInternal { + /// + /// Used to retrive function pointers by name. + /// + /// The function name. + /// A function pointer to , or IntPtr.Zero public delegate IntPtr GetAddressDelegate(string function); + + /// + /// Used to return the handel of the current OpenGL context. + /// + /// The current OpenGL context, or IntPtr.Zero if no context is on the calling thread. public delegate ContextHandle GetCurrentContextDelegate(); #region --- Fields --- @@ -497,8 +507,10 @@ namespace OpenTK.Graphics [Obsolete("Use SwapInterval property instead.")] public bool VSync { +#pragma warning disable 0612, 0618 // CS0612/CS0618: 'member' is obsolete get { return implementation.VSync; } - set { implementation.VSync = value; } + set { implementation.VSync = value; } +#pragma warning restore 0612, 0618 } /// @@ -646,7 +658,7 @@ namespace OpenTK.Graphics /// /// Marks this context as deleted, but does not actually release unmanaged resources - /// due to the threading requirements of OpenGL. Use + /// due to the threading requirements of OpenGL. Use /// instead. /// ~GraphicsContext() diff --git a/Source/OpenTK/Platform/Dummy/DummyGLContext.cs b/Source/OpenTK/Platform/Dummy/DummyGLContext.cs index bb6f1a2a..95059613 100644 --- a/Source/OpenTK/Platform/Dummy/DummyGLContext.cs +++ b/Source/OpenTK/Platform/Dummy/DummyGLContext.cs @@ -24,7 +24,6 @@ namespace OpenTK.Platform.Dummy { readonly GraphicsContext.GetAddressDelegate Loader; - bool vsync; int swap_interval; static int handle_count; Thread current_thread; diff --git a/Source/OpenTK/Platform/Factory.cs b/Source/OpenTK/Platform/Factory.cs index 571deb44..59e5d578 100644 --- a/Source/OpenTK/Platform/Factory.cs +++ b/Source/OpenTK/Platform/Factory.cs @@ -164,7 +164,6 @@ namespace OpenTK.Platform { #region Fields - bool disposed; static readonly string error_string = "Please, refer to http://www.opentk.com for more information."; #endregion diff --git a/Source/OpenTK/Platform/MacOS/AglContext.cs b/Source/OpenTK/Platform/MacOS/AglContext.cs index eab21a05..ed42bc93 100644 --- a/Source/OpenTK/Platform/MacOS/AglContext.cs +++ b/Source/OpenTK/Platform/MacOS/AglContext.cs @@ -49,7 +49,6 @@ namespace OpenTK.Platform.MacOS CarbonWindowInfo carbonWindow; IntPtr shareContextRef; - DisplayDevice device; bool mIsFullscreen = false; public AglContext(GraphicsMode mode, IWindowInfo window, IGraphicsContext shareContext) diff --git a/Source/OpenTK/Platform/MacOS/CarbonGLNative.cs b/Source/OpenTK/Platform/MacOS/CarbonGLNative.cs index b3307e16..12baf2c9 100644 --- a/Source/OpenTK/Platform/MacOS/CarbonGLNative.cs +++ b/Source/OpenTK/Platform/MacOS/CarbonGLNative.cs @@ -64,8 +64,6 @@ namespace OpenTK.Platform.MacOS bool mExists = true; DisplayDevice mDisplayDevice; - WindowAttributes mWindowAttrib; - WindowClass mWindowClass; WindowPositionMethod mPositionMethod = WindowPositionMethod.CenterOnMainScreen; int mTitlebarHeight; private WindowBorder windowBorder = WindowBorder.Resizable; diff --git a/Source/OpenTK/Platform/Windows/WinGLNative.cs b/Source/OpenTK/Platform/Windows/WinGLNative.cs index 9688984d..aa846826 100644 --- a/Source/OpenTK/Platform/Windows/WinGLNative.cs +++ b/Source/OpenTK/Platform/Windows/WinGLNative.cs @@ -58,7 +58,6 @@ namespace OpenTK.Platform.Windows readonly uint ModalLoopTimerPeriod = 1; UIntPtr timer_handle; - readonly Functions.TimerProc ModalLoopCallback; bool class_registered; bool disposed; @@ -716,7 +715,7 @@ namespace OpenTK.Platform.Windows { if (timer_handle == UIntPtr.Zero) { - timer_handle = Functions.SetTimer(handle, new UIntPtr(1), ModalLoopTimerPeriod, ModalLoopCallback); + timer_handle = Functions.SetTimer(handle, new UIntPtr(1), ModalLoopTimerPeriod, null); if (timer_handle == UIntPtr.Zero) Debug.Print("[Warning] Failed to set modal loop timer callback ({0}:{1}->{2}).", GetType().Name, handle, Marshal.GetLastWin32Error()); diff --git a/Source/OpenTK/Platform/Windows/WinRawInput.cs b/Source/OpenTK/Platform/Windows/WinRawInput.cs index 80c5b0c2..9f12099f 100644 --- a/Source/OpenTK/Platform/Windows/WinRawInput.cs +++ b/Source/OpenTK/Platform/Windows/WinRawInput.cs @@ -144,7 +144,7 @@ namespace OpenTK.Platform.Windows { gamepad_driver = new XInputJoystick(); } - catch (Exception e) + catch (Exception) { Debug.Print("[Win] XInput driver not supported, falling back to WinMM"); gamepad_driver = new MappedGamePadDriver(); diff --git a/Source/OpenTK/Platform/X11/X11Factory.cs b/Source/OpenTK/Platform/X11/X11Factory.cs index 985f21cb..40cc402a 100644 --- a/Source/OpenTK/Platform/X11/X11Factory.cs +++ b/Source/OpenTK/Platform/X11/X11Factory.cs @@ -34,8 +34,6 @@ namespace OpenTK.Platform.X11 { class X11Factory : PlatformFactoryBase { - bool disposed; - #region Constructors public X11Factory()