From b92a60c591756df6c2a93c212f425290b0a559ec Mon Sep 17 00:00:00 2001 From: jpbruyere Date: Sat, 30 Apr 2016 21:34:04 +0200 Subject: [PATCH] code clean --- GLCrow/Window.cs | 4 ++- Tests/GLCrow.cs | 16 +++++----- Tests/Interfaces/Splitter/1.crow | 30 +++++++++++++++++++ .../{Divers/1.crow => Splitter/3.crow} | 0 Tests/Tests.csproj | 10 +++++-- 5 files changed, 49 insertions(+), 11 deletions(-) create mode 100755 Tests/Interfaces/Splitter/1.crow rename Tests/Interfaces/{Divers/1.crow => Splitter/3.crow} (100%) diff --git a/GLCrow/Window.cs b/GLCrow/Window.cs index 5d4a07bb..19bf0db5 100644 --- a/GLCrow/Window.cs +++ b/GLCrow/Window.cs @@ -178,7 +178,8 @@ namespace GLC Environment.Exit (1); } Debug.WriteLine("GLFW: " + Glfw.GetVersionString ()); - // Create GLFW window + // Create GLFW window. + Glfw.WindowHint(WindowHint.Samples, 1); Glfw.WindowHint(WindowHint.ContextVersionMajor, 3 ); Glfw.WindowHint(WindowHint.ContextVersionMinor, 3); @@ -317,6 +318,7 @@ namespace GLC CrowInterface.DirtyRect.Left, CrowInterface.DirtyRect.Top, CrowInterface.DirtyRect.Width, CrowInterface.DirtyRect.Height, PixelFormat.Bgra, PixelType.UnsignedByte, CrowInterface.dirtyBmp); + //TODO:use pbo //updatePBOs (); CrowInterface.IsDirty = false; } diff --git a/Tests/GLCrow.cs b/Tests/GLCrow.cs index 2602bd72..35ee72b3 100644 --- a/Tests/GLCrow.cs +++ b/Tests/GLCrow.cs @@ -97,13 +97,15 @@ namespace Tests public override void OnLoad () { - testFiles = Directory.GetFiles(@"Interfaces/Expandable", "*.crow").ToArray(); - testFiles = Directory.GetFiles(@"Interfaces/GraphicObject", "*.crow").Concat(testFiles).ToArray(); - testFiles = Directory.GetFiles(@"Interfaces/Container", "*.crow").Concat (testFiles).ToArray(); - testFiles = Directory.GetFiles(@"Interfaces/Group", "*.crow").Concat (testFiles).ToArray(); - testFiles = Directory.GetFiles(@"Interfaces/Stack", "*.crow").Concat (testFiles).ToArray(); - testFiles = Directory.GetFiles(@"Interfaces/basicTests", "*.crow").Concat (testFiles).ToArray(); - testFiles = Directory.GetFiles (@"Interfaces/Divers", "*.crow").Concat (testFiles).ToArray (); + testFiles = new string [0]; + //testFiles = testFiles.Concat (Directory.GetFiles (@"Interfaces/GraphicObject", "*.crow")).ToArray (); + //testFiles = testFiles.Concat (Directory.GetFiles (@"Interfaces/basicTests", "*.crow")).ToArray (); + //testFiles = testFiles.Concat (Directory.GetFiles (@"Interfaces/Container", "*.crow")).ToArray (); + //testFiles = testFiles.Concat (Directory.GetFiles (@"Interfaces/Group", "*.crow")).ToArray (); + //testFiles = testFiles.Concat (Directory.GetFiles (@"Interfaces/Stack", "*.crow")).ToArray (); + testFiles = testFiles.Concat (Directory.GetFiles (@"Interfaces/Splitter", "*.crow")).ToArray (); + //testFiles = testFiles.Concat (Directory.GetFiles (@"Interfaces/Expandable", "*.crow")).ToArray (); + //testFiles = testFiles.Concat (Directory.GetFiles (@"Interfaces/Divers", "*.crow")).ToArray (); //testFiles = Directory.GetFiles(@"Interfaces", "*.crow").Concat(testFiles).ToArray(); this.Title = testFiles [idx]; diff --git a/Tests/Interfaces/Splitter/1.crow b/Tests/Interfaces/Splitter/1.crow new file mode 100755 index 00000000..ca54c721 --- /dev/null +++ b/Tests/Interfaces/Splitter/1.crow @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Tests/Interfaces/Divers/1.crow b/Tests/Interfaces/Splitter/3.crow similarity index 100% rename from Tests/Interfaces/Divers/1.crow rename to Tests/Interfaces/Splitter/3.crow diff --git a/Tests/Tests.csproj b/Tests/Tests.csproj index 591df4dd..e4f9711d 100644 --- a/Tests/Tests.csproj +++ b/Tests/Tests.csproj @@ -165,9 +165,6 @@ PreserveNewest - - PreserveNewest - PreserveNewest @@ -341,6 +338,12 @@ PreserveNewest + + PreserveNewest + + + PreserveNewest + @@ -351,6 +354,7 @@ + -- 2.47.3