From 0a67792ab731bc79cfd74263a3a8fe3c94febb1b Mon Sep 17 00:00:00 2001 From: John Lewin Date: Thu, 12 Jul 2018 12:17:11 -0700 Subject: [PATCH] Revise casing and member naming --- .../GCodeRenderer/GCodeRenderer.cs | 4 +-- .../GCodeRenderer/GCodeVertexBuffer.cs | 36 +++++++++---------- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/MatterControl.OpenGL/GCodeRenderer/GCodeRenderer.cs b/MatterControl.OpenGL/GCodeRenderer/GCodeRenderer.cs index d50e74fa8..48c8633e6 100644 --- a/MatterControl.OpenGL/GCodeRenderer/GCodeRenderer.cs +++ b/MatterControl.OpenGL/GCodeRenderer/GCodeRenderer.cs @@ -345,7 +345,7 @@ namespace MatterHackers.GCodeVisualizer int featuresOnLayer = renderFeatures[i].Count; if (featuresOnLayer > 1) { - layerVertexBuffer[i].renderRange(0, featureEndIndex[i][featuresOnLayer - 1]); + layerVertexBuffer[i].RenderRange(0, featureEndIndex[i][featuresOnLayer - 1]); } } } @@ -376,7 +376,7 @@ namespace MatterHackers.GCodeVisualizer { int ellementCount = featureEndIndex[layerIndex][endFeature - 1] - featureStartIndex[layerIndex][startFeature]; - layerVertexBuffer[layerIndex].renderRange(featureStartIndex[layerIndex][startFeature], ellementCount); + layerVertexBuffer[layerIndex].RenderRange(featureStartIndex[layerIndex][startFeature], ellementCount); } } GL.PopAttrib(); diff --git a/MatterControl.OpenGL/GCodeRenderer/GCodeVertexBuffer.cs b/MatterControl.OpenGL/GCodeRenderer/GCodeVertexBuffer.cs index ec484f6a4..6979f7939 100644 --- a/MatterControl.OpenGL/GCodeRenderer/GCodeVertexBuffer.cs +++ b/MatterControl.OpenGL/GCodeRenderer/GCodeVertexBuffer.cs @@ -35,24 +35,24 @@ namespace MatterHackers.GCodeVisualizer { public class GCodeVertexBuffer : IDisposable { - private int myIndexId; - private int myIndexLength; + private int indexID; + private int indexLength; private BeginMode pointMode = BeginMode.Triangles; private bool disposed = false; - private int myVertexId; - private int myVertexLength; + private int vertexID; + private int vertexLength; public GCodeVertexBuffer(int[] indexData, ColorVertexData[] colorData) { - GL.GenBuffers(1, out myVertexId); - GL.GenBuffers(1, out myIndexId); + GL.GenBuffers(1, out vertexID); + GL.GenBuffers(1, out indexID); // Set vertex data - myVertexLength = colorData.Length; - if (myVertexLength > 0) + vertexLength = colorData.Length; + if (vertexLength > 0) { - GL.BindBuffer(BufferTarget.ArrayBuffer, myVertexId); + GL.BindBuffer(BufferTarget.ArrayBuffer, vertexID); unsafe { fixed (ColorVertexData* dataPointer = colorData) @@ -63,10 +63,10 @@ namespace MatterHackers.GCodeVisualizer } // Set index data - myIndexLength = indexData.Length; - if (myIndexLength > 0) + indexLength = indexData.Length; + if (indexLength > 0) { - GL.BindBuffer(BufferTarget.ElementArrayBuffer, myIndexId); + GL.BindBuffer(BufferTarget.ElementArrayBuffer, indexID); unsafe { fixed (int* dataPointer = indexData) @@ -77,7 +77,7 @@ namespace MatterHackers.GCodeVisualizer } } - public void renderRange(int offset, int count) + public void RenderRange(int offset, int count) { GL.EnableClientState(ArrayCap.ColorArray); GL.EnableClientState(ArrayCap.NormalArray); @@ -87,8 +87,8 @@ namespace MatterHackers.GCodeVisualizer GL.EnableClientState(ArrayCap.IndexArray); - GL.BindBuffer(BufferTarget.ArrayBuffer, myVertexId); - GL.BindBuffer(BufferTarget.ElementArrayBuffer, myIndexId); + GL.BindBuffer(BufferTarget.ArrayBuffer, vertexID); + GL.BindBuffer(BufferTarget.ElementArrayBuffer, indexID); GL.ColorPointer(4, ColorPointerType.UnsignedByte, ColorVertexData.Stride, new IntPtr(0)); GL.NormalPointer(NormalPointerType.Float, ColorVertexData.Stride, new IntPtr(4)); @@ -98,7 +98,7 @@ namespace MatterHackers.GCodeVisualizer GL.DrawRangeElements( pointMode, 0, - myIndexLength, + indexLength, count, DrawElementsType.UnsignedInt, new IntPtr(offset * 4)); @@ -120,8 +120,8 @@ namespace MatterHackers.GCodeVisualizer { UiThread.RunOnIdle(() => { - GL.DeleteBuffers(1, ref myVertexId); - GL.DeleteBuffers(1, ref myIndexId); + GL.DeleteBuffers(1, ref vertexID); + GL.DeleteBuffers(1, ref indexID); }); disposed = true;