nettika/mattercontrol
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Made it so that we can run tests in software mode.

Browse source
This commit is contained in:
Lars Brubaker 2016-12-02 16:49:18 -08:00
parent fc7b576784
commit 21b45ec761
5 changed files with 13 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

7
MatterControlApplication.cs
View file

@ -134,8 +134,6 @@ namespace MatterHackers.MatterControl
this.commandLineArgs = Environment.GetCommandLineArgs();
Thread.CurrentThread.CurrentCulture = CultureInfo.InvariantCulture;
bool forceSofwareRendering = false;
for (int currentCommandIndex = 0; currentCommandIndex < commandLineArgs.Length; currentCommandIndex++)
{
string command = commandLineArgs[currentCommandIndex];
@ -143,8 +141,7 @@ namespace MatterHackers.MatterControl
switch (commandUpper)
{
case "FORCE_SOFTWARE_RENDERING":
forceSofwareRendering = true;
GL.ForceSoftwareRendering();
GL.HardwareAvailable = false;
break;
case "CLEAR_CACHE":
@ -288,7 +285,7 @@ namespace MatterHackers.MatterControl
#endif
this.AnchorAll();
if (!forceSofwareRendering)
if (GL.HardwareAvailable)
{
UseOpenGL = true;
}

2
Submodules/agg-sharp

@ -1 +1 @@
Subproject commit f1738f9683e01f0add7216c00ad7ec169bb4f2fa
Subproject commit 5166299f18f51cf49d507697f9dd6294db50246c

4
Tests/MatterControl.AutomationTests/MatterControl.AutomationTests.csproj
View file

@ -105,6 +105,10 @@
<Project>{86f6aaf2-9b50-40b8-a427-1897d76471c5}</Project>
<Name>PolygonMesh</Name>
</ProjectReference>
<ProjectReference Include="..\..\Submodules\agg-sharp\RenderOpenGl\RenderOpenGl.csproj">
<Project>{545B6912-77FF-4B34-BA76-6C3D6A32BE6A}</Project>
<Name>RenderOpenGl</Name>
</ProjectReference>
<ProjectReference Include="..\..\Submodules\agg-sharp\Tests\Agg.Tests\Agg.Tests.csproj">
<Project>{195cbe56-e654-437b-ab05-3be1b9452497}</Project>
<Name>Agg.Tests</Name>

4
Tests/MatterControl.Tests/MatterControl.Tests.csproj
View file

@ -143,6 +143,10 @@
<Project>{86F6AAF2-9B50-40B8-A427-1897D76471C5}</Project>
<Name>PolygonMesh</Name>
</ProjectReference>
<ProjectReference Include="..\..\Submodules\agg-sharp\RenderOpenGl\RenderOpenGl.csproj">
<Project>{545b6912-77ff-4b34-ba76-6c3d6a32be6a}</Project>
<Name>RenderOpenGl</Name>
</ProjectReference>
<ProjectReference Include="..\..\Submodules\agg-sharp\Tests\Agg.Tests\Agg.Tests.csproj">
<Project>{195CBE56-E654-437B-AB05-3BE1B9452497}</Project>
<Name>Agg.Tests</Name>

3
Tests/MatterControl.Tests/MatterControl/MatterControlUtilities.cs
View file

@ -39,11 +39,11 @@ using MatterHackers.Agg;
using MatterHackers.Agg.Image;
using MatterHackers.Agg.PlatformAbstract;
using MatterHackers.Agg.UI;
using MatterHackers.Agg.UI.Tests;
using MatterHackers.GuiAutomation;
using MatterHackers.MatterControl.DataStorage;
using MatterHackers.MatterControl.PrintLibrary.Provider;
using MatterHackers.MatterControl.SlicerConfiguration;
using MatterHackers.RenderOpenGl.OpenGl;
using Newtonsoft.Json;
using Newtonsoft.Json.Converters;
using NUnit.Framework;
@ -391,6 +391,7 @@ namespace MatterHackers.MatterControl.Tests.Automation
}
UserSettings.Instance.set(UserSettingsKey.ThumbnailRenderingMode, "orthographic");
GL.HardwareAvailable = false;
MatterControlApplication matterControlWindow = MatterControlApplication.CreateInstance(overrideWidth, overrideHeight);
var config = TestAutomationConfig.Load();