Release 3.3

.gitignore

@@ -2,6 +2,9 @@
 [Tt]humbs.db
 *.DS_Store
 
+#Linux installer file
+*.run
+
 #Visual Studio files
 *.pidb
 *.userprefs
@@ -38,9 +41,6 @@ _ReSharper*/
 *.resharper
 [Tt]est[Rr]esult*
 
-#Project files
-[Bb]uild/
-
 #Subversion files
 .svn
 
@@ -52,3 +52,20 @@ monodroid*.msi
 
 #Unix temporary files
 *~
+
+# Output docs
+Documentation/Output/
+
+# Protobuild Generated Files
+MonoGame.Framework.Content.Pipeline/*.csproj
+MonoGame.Framework/*.csproj
+Tools/2MGFX/*.csproj
+Tools/MGCB/*.csproj
+Tools/Pipeline/*.csproj
+ThirdParty/Lidgren.Network/*.csproj
+Test/*.csproj
+!Test/MonoGame.Test.XNA.csproj
+/*.sln
+*.speccache
+*.ncrunchproject
+*.ncrunchsolution

.gitmodules

@@ -1,6 +1,6 @@
-[submodule "ThirdParty/Libs"]
-	path = ThirdParty/Libs
-	url = https://github.com/kungfubanana/MonoGame-Dependencies.git
 [submodule "ThirdParty/Kickstart"]
 	path = ThirdParty/Kickstart
 	url = https://github.com/OutOfOrder/MonoKickstart.git
+[submodule "ThirdParty/Dependencies"]
+	path = ThirdParty/Dependencies
+	url = https://github.com/Mono-Game/MonoGame.Dependencies.git

Build/Module.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ModuleInfo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+  <Name>MonoGame.Framework</Name>
+  <ModuleAssemblies />
+  <DefaultAction>Generate</DefaultAction>
+  <SupportedPlatforms>Android,Angle,Linux,Ouya,PSMobile,Windows8,Windows,WindowsGL,WindowsPhone,WindowsPhone81,iOS,MacOS,Web</SupportedPlatforms>
+  <DefaultWindowsPlatforms>Android,Angle,Linux,Ouya,PSMobile,Windows8,Windows,WindowsGL,WindowsPhone,WindowsPhone81,iOS</DefaultWindowsPlatforms>
+  <DefaultMacOSPlatforms>Angle,MacOS,iOS,WindowsGL,Android</DefaultMacOSPlatforms>
+  <DefaultLinuxPlatforms>Angle,Linux,WindowsGL</DefaultLinuxPlatforms>
+  <DisableSynchronisation>true</DisableSynchronisation>
+</ModuleInfo>

Build/Projects/2MGFX.definition

@@ -0,0 +1,203 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project Name="2MGFX" Path="Tools/2MGFX" Type="Console" Platforms="Windows">
+
+  <!-- Common assembly references -->
+  <References>
+    <Reference Include="System" />
+    <Reference Include="System.Runtime.Serialization" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Xml" />
+    <Reference Include="2MGFXReferences" />
+  </References>
+
+  <Properties>
+
+    <NoWarn>1591,0436</NoWarn>
+
+    <RootNamespace>TwoMGFX</RootNamespace>
+    <PlatformSpecificOutputFolder>True</PlatformSpecificOutputFolder>
+
+    <CustomDefinitions>
+      <Platform Name="Windows">TRACE;WINDOWS</Platform>
+    </CustomDefinitions>
+
+    <ForceArchitecture>x64</ForceArchitecture>
+
+  </Properties>
+
+  <Files>
+
+    <!-- The program entry point -->
+    <Compile Include="Program.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="CommandLineParser.cs" />
+    <Compile Include="Options.cs" />
+
+
+    <!-- 
+        We directly include a few MonoGame.Framework classes just so 
+        we can use some enums and state classes from 2MGFX without all
+        the extra dependancies of MonoGame.Framework.
+    -->
+    <Compile Include="..\..\MonoGame.Framework\BoundingBox.cs">
+      <Link>MonoGame.Framework\BoundingBox.cs</Link>
+    </Compile>
+    <Compile Include="..\..\MonoGame.Framework\BoundingFrustum.cs">
+      <Link>MonoGame.Framework\BoundingFrustum.cs</Link>
+    </Compile>
+    <Compile Include="..\..\MonoGame.Framework\BoundingSphere.cs">
+      <Link>MonoGame.Framework\BoundingSphere.cs</Link>
+    </Compile>
+    <Compile Include="..\..\MonoGame.Framework\Color.cs">
+      <Link>MonoGame.Framework\Color.cs</Link>
+    </Compile>
+    <Compile Include="..\..\MonoGame.Framework\ContainmentType.cs">
+      <Link>MonoGame.Framework\ContainmentType.cs</Link>
+    </Compile>
+    <Compile Include="..\..\MonoGame.Framework\Graphics\ColorWriteChannels.cs">
+      <Link>MonoGame.Framework\ColorWriteChannels.cs</Link>
+    </Compile>
+    <Compile Include="..\..\MonoGame.Framework\Graphics\Effect\EffectParameterClass.cs">
+      <Link>MonoGame.Framework\EffectParameterClass.cs</Link>
+    </Compile>
+    <Compile Include="..\..\MonoGame.Framework\Graphics\Effect\EffectParameterType.cs">
+      <Link>MonoGame.Framework\EffectParameterType.cs</Link>
+    </Compile>
+    <Compile Include="..\..\MonoGame.Framework\Graphics\GraphicsResource.cs">
+      <Link>MonoGame.Framework\GraphicsResource.cs</Link>
+    </Compile>
+    <Compile Include="..\..\MonoGame.Framework\Graphics\States\Blend.cs">
+      <Link>MonoGame.Framework\Blend.cs</Link>
+    </Compile>
+    <Compile Include="..\..\MonoGame.Framework\Graphics\States\BlendFunction.cs">
+      <Link>MonoGame.Framework\BlendFunction.cs</Link>
+    </Compile>
+    <Compile Include="..\..\MonoGame.Framework\Graphics\States\BlendState.cs">
+      <Link>MonoGame.Framework\BlendState.cs</Link>
+    </Compile>
+    <Compile Include="..\..\MonoGame.Framework\Graphics\States\CompareFunction.cs">
+      <Link>MonoGame.Framework\CompareFunction.cs</Link>
+    </Compile>
+    <Compile Include="..\..\MonoGame.Framework\Graphics\States\CullMode.cs">
+      <Link>MonoGame.Framework\CullMode.cs</Link>
+    </Compile>
+    <Compile Include="..\..\MonoGame.Framework\Graphics\States\DepthStencilState.cs">
+      <Link>MonoGame.Framework\DepthStencilState.cs</Link>
+    </Compile>
+    <Compile Include="..\..\MonoGame.Framework\Graphics\States\FillMode.cs">
+      <Link>MonoGame.Framework\FillMode.cs</Link>
+    </Compile>
+    <Compile Include="..\..\MonoGame.Framework\Graphics\States\RasterizerState.cs">
+      <Link>MonoGame.Framework\RasterizerState.cs</Link>
+    </Compile>
+    <Compile Include="..\..\MonoGame.Framework\Graphics\States\SamplerState.cs">
+      <Link>MonoGame.Framework\SamplerState.cs</Link>
+    </Compile>
+    <Compile Include="..\..\MonoGame.Framework\Graphics\States\StencilOperation.cs">
+      <Link>MonoGame.Framework\StencilOperation.cs</Link>
+    </Compile>
+    <Compile Include="..\..\MonoGame.Framework\Graphics\States\TargetBlendState.cs">
+      <Link>MonoGame.Framework\TargetBlendState.cs</Link>
+    </Compile>
+    <Compile Include="..\..\MonoGame.Framework\Graphics\States\TextureAddressMode.cs">
+      <Link>MonoGame.Framework\TextureAddressMode.cs</Link>
+    </Compile>
+    <Compile Include="..\..\MonoGame.Framework\Graphics\States\TextureFilter.cs">
+      <Link>MonoGame.Framework\TextureFilter.cs</Link>
+    </Compile>
+    <Compile Include="..\..\MonoGame.Framework\Graphics\Vertices\VertexElementUsage.cs">
+      <Link>MonoGame.Framework\VertexElementUsage.cs</Link>
+    </Compile>
+    <Compile Include="..\..\MonoGame.Framework\MathHelper.cs">
+      <Link>MonoGame.Framework\MathHelper.cs</Link>
+    </Compile>
+    <Compile Include="..\..\MonoGame.Framework\Matrix.cs">
+      <Link>MonoGame.Framework\Matrix.cs</Link>
+    </Compile>
+    <Compile Include="..\..\MonoGame.Framework\Plane.cs">
+      <Link>MonoGame.Framework\Plane.cs</Link>
+    </Compile>
+	  <Compile Include="..\..\MonoGame.Framework\Point.cs">
+      <Link>MonoGame.Framework\Point.cs</Link>
+    </Compile>
+    <Compile Include="..\..\MonoGame.Framework\PlaneIntersectionType.cs">
+      <Link>MonoGame.Framework\PlaneIntersectionType.cs</Link>
+    </Compile>
+    <Compile Include="..\..\MonoGame.Framework\Quaternion.cs">
+      <Link>MonoGame.Framework\Quaternion.cs</Link>
+    </Compile>
+    <Compile Include="..\..\MonoGame.Framework\Ray.cs">
+      <Link>MonoGame.Framework\Ray.cs</Link>
+    </Compile>
+    <Compile Include="..\..\MonoGame.Framework\Vector2.cs">
+      <Link>MonoGame.Framework\Vector2.cs</Link>
+    </Compile>
+    <Compile Include="..\..\MonoGame.Framework\Vector3.cs">
+      <Link>MonoGame.Framework\Vector3.cs</Link>
+    </Compile>
+    <Compile Include="..\..\MonoGame.Framework\Vector4.cs">
+      <Link>MonoGame.Framework\Vector4.cs</Link>
+    </Compile>
+    <Compile Include="..\..\MonoGame.Framework\Design\Vector2TypeConverter.cs">
+      <Link>MonoGame.Framework\Design\Vector2TypeConverter.cs</Link>
+    </Compile>
+    <Compile Include="..\..\MonoGame.Framework\Design\Vector3TypeConverter.cs">
+      <Link>MonoGame.Framework\Design\Vector3TypeConverter.cs</Link>
+    </Compile>
+    <Compile Include="..\..\MonoGame.Framework\Design\Vector4TypeConverter.cs">
+      <Link>MonoGame.Framework\Design\Vector4TypeConverter.cs</Link>
+    </Compile>
+    <Compile Include="..\..\MonoGame.Framework\Design\VectorConversion.cs">
+      <Link>MonoGame.Framework\Design\VectorConversion.cs</Link>
+    </Compile>
+    <Compile Include="..\..\MonoGame.Framework\Graphics\PackedVector\IPackedVector.cs">
+      <Link>MonoGame.Framework\Graphics\PackedVector\IPackedVector.cs</Link>
+    </Compile>    
+    <Compile Include="..\..\MonoGame.Framework\Utilities\Hash.cs">
+      <Link>MonoGame.Framework\Utilities\Hash.cs</Link>
+    </Compile>
+
+    <!-- A fake GraphicsDevice to satisfy some of the framework classes above! -->
+    <Compile Include="MonoGame.Framework\GraphicsDevice.cs" />
+
+    <!-- The core mgfx generation classes -->
+    <Compile Include="CompilerInclude.cs" />
+    <Compile Include="ConstantBufferData.cs" />
+    <Compile Include="ConstantBufferData.mojo.cs" />
+    <Compile Include="ConstantBufferData.sharpdx.cs" />
+    <Compile Include="ConstantBufferData.writer.cs" />
+    <Compile Include="EffectObject.cs" />
+    <Compile Include="EffectObject.hlsl.cs" />
+    <Compile Include="EffectObject.pssl.cs" />
+    <Compile Include="EffectObject.writer.cs" />    
+    <Compile Include="ShaderCompilerException.cs" />
+    <Compile Include="ShaderData.cs" />
+    <Compile Include="ShaderData.mojo.cs" />
+    <Compile Include="ShaderData.pssl.cs" />
+    <Compile Include="ShaderData.sharpdx.cs" />
+    <Compile Include="ShaderData.writer.cs" />
+    <Compile Include="PassInfo.cs" />
+    <Compile Include="SamplerStateInfo.cs" />
+    <Compile Include="ShaderInfo.cs" />
+    <Compile Include="ShaderProfile.cs" />
+    <Compile Include="TechniqueInfo.cs" />
+    <Compile Include="TextureFilterType.cs" />
+
+    <!-- The HLSL to GLSL conversion utility -->
+    <Compile Include="MarshalHelper.cs" />
+    <Compile Include="MojoShader.cs" />
+    <None Include="..\..\ThirdParty\Dependencies\MojoShader\Windows\libmojoshader_64.dll">
+      <Link>libmojoshader_64.dll</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+
+    <!-- The MGFX parser -->
+    <None Include="MGFX.tpg" />
+    <Compile Include="Parser.cs" />
+    <Compile Include="ParseTree.cs" />
+    <Compile Include="Scanner.cs" />
+    <Compile Include="ParseTreeTools.cs" />
+
+  </Files>
+</Project>

Build/Projects/2MGFXReferences.definition

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<ExternalProject Name="2MGFXReferences">
+
+  <Platform Type="Windows">
+    <Binary
+      Name="SharpDX"
+      Path="ThirdParty/Dependencies/SharpDX/Windows/SharpDX.dll" />
+    <Binary
+      Name="SharpDX.D3DCompiler"
+      Path="ThirdParty/Dependencies/SharpDX/Windows/SharpDX.D3DCompiler.dll" />
+  </Platform>
+
+</ExternalProject>

Build/Projects/Framework.Content.Pipeline.References.definition

@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<ExternalProject Name="Framework.Content.Pipeline.References">
+
+  <Platform Type="Linux">
+    <Binary
+      Name="AssimpNet"
+      Path="ThirdParty\Dependencies\assimp\AssimpNet.dll" />
+    <Binary
+      Name="Nvidia.TextureTools"
+      Path="ThirdParty\Dependencies\NVTT\Windows\Nvidia.TextureTools.dll" />
+    <Binary
+      Name="SharpFont"
+      Path="ThirdParty\Dependencies\SharpFont\x32\SharpFont.dll" />
+    <Binary
+      Name="ManagedPVRTC"
+      Path="ThirdParty\Dependencies\ManagedPVRTC\ManagedPVRTC.dll" />
+  </Platform>
+
+
+  <Platform Type="MacOS">
+    <Reference Include="MonoMac, Version=0.0.0.0, Culture=neutral" />
+    <Binary
+      Name="AssimpNet"
+      Path="ThirdParty\Dependencies\assimp\AssimpNet.dll" />
+    <Binary
+      Name="Nvidia.TextureTools"
+      Path="ThirdParty\Dependencies\NVTT\Windows\Nvidia.TextureTools.dll" />
+    <Binary
+      Name="SharpFont"
+      Path="ThirdParty\Dependencies\SharpFont\x64\SharpFont.dll" />
+    <Binary
+      Name="ManagedPVRTC"
+      Path="ThirdParty\Dependencies\ManagedPVRTC\ManagedPVRTC.dll" />
+    <Binary
+      Name="FreeImageNET"
+      Path="ThirdParty\Dependencies\FreeImage.NET\FreeImageNET.dll" />
+  </Platform>
+
+
+  <Platform Type="Windows">
+    <Binary
+      Name="SharpDX"
+      Path="ThirdParty/Dependencies/SharpDX/Windows/SharpDX.dll" />
+    <Binary
+      Name="SharpDX.D3DCompiler"
+      Path="ThirdParty\Dependencies\SharpDX\Windows\SharpDX.D3DCompiler.dll" />
+    <Binary
+      Name="AssimpNet"
+      Path="ThirdParty\Dependencies\assimp\AssimpNet.dll" />
+    <Binary
+      Name="Nvidia.TextureTools"
+      Path="ThirdParty\Dependencies\NVTT\Windows\Nvidia.TextureTools.dll" />
+    <Binary
+      Name="SharpFont"
+      Path="ThirdParty\Dependencies\SharpFont\x64\SharpFont.dll" />
+    <Binary
+      Name="ManagedPVRTC"
+      Path="ThirdParty\Dependencies\ManagedPVRTC\ManagedPVRTC.dll" />
+  <Binary
+      Name="FreeImageNET"
+       Path="ThirdParty\Dependencies\FreeImage.NET\Windows\FreeImageNET.dll" />
+  </Platform>
+
+</ExternalProject>