Permalink
Browse files

Merge branch 'develop3d' of https://github.com/mono/MonoGame into dev…

…elop3d
  • Loading branch information...
2 parents ad5b5f5 + 62a1522 commit 3e9dd5927b818e16a407687d54abfab6f8be51a8 Alexandre Zollinger Chohfi committed Feb 12, 2013
View
19 MonoGame.Framework/Graphics/GraphicsDevice.cs
@@ -2078,13 +2078,26 @@ private int SetUserIndexBuffer<T>(T[] indexData, int indexOffset, int indexCount
}
#endif
- public void DrawIndexedPrimitives(PrimitiveType primitiveType, int baseVertex, int minVertexIndex, int numbVertices, int startIndex, int primitiveCount)
+ /// <summary>
+ /// Draw geometry by indexing into the vertex buffer.
+ /// </summary>
+ /// <param name="primitiveType">The type of primitives in the index buffer.</param>
+ /// <param name="baseVertex">Used to offset the vertex range indexed from the vertex buffer.</param>
+ /// <param name="minVertexIndex">A hint of the lowest vertex indexed relative to baseVertex.</param>
+ /// <param name="numVertices">An hint of the maximum vertex indexed.</param>
+ /// <param name="startIndex">The index within the index buffer to start drawing from.</param>
+ /// <param name="primitiveCount">The number of primitives to render from the index buffer.</param>
+ /// <remarks>Note that minVertexIndex and numVertices are unused in MonoGame and will be ignored.</remarks>
+ public void DrawIndexedPrimitives(PrimitiveType primitiveType, int baseVertex, int minVertexIndex, int numVertices, int startIndex, int primitiveCount)
{
Debug.Assert(_vertexBuffer != null, "The vertex buffer is null!");
Debug.Assert(_indexBuffer != null, "The index buffer is null!");
- if (minVertexIndex > 0)
- throw new NotImplementedException ("minVertexIndex > 0 is supported");
+ // NOTE: minVertexIndex and numVertices are only hints of the
+ // range of vertex data which will be indexed.
+ //
+ // They will only be used if the graphics API can use
+ // this range hint to optimize rendering.
#if DIRECTX
2 ThirdParty/Libs
@@ -1 +1 @@
-Subproject commit 8d0c752af62fbbdbac1b9d3095f5f6331e5aa61c
+Subproject commit c3d492e6a8218f13501d47254b37ea81eee69edb
View
10 Tools/MGCB/MGCB.MacOS.csproj
@@ -36,7 +36,6 @@
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<OutputPath>bin\Debug</OutputPath>
<DefineConstants>TRACE;DEBUG</DefineConstants>
- <PlatformTarget>anycpu</PlatformTarget>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugSymbols>False</DebugSymbols>
@@ -78,4 +77,13 @@
<Target Name="AfterBuild">
</Target>
-->
+ <ItemGroup>
+ <Content Include="Nvidia.TextureTools.dll.config">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </Content>
+ <Content Include="..\..\ThirdParty\Libs\NVTT\MacOS\libnvtt.dylib">
+ <Link>libnvtt.dylib</Link>
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </Content>
+ </ItemGroup>
</Project>
View
4 Tools/MGCB/Nvidia.TextureTools.dll.config
@@ -0,0 +1,4 @@
+<configuration>
+<dllmap os="macos" dll="nvtt.dll" target="libnvtt.dylib"/>
+<dllmap os="linux" dll="nvtt.dll" target="libnvtt.so"/>
+</configuration>

0 comments on commit 3e9dd59

Please sign in to comment.