Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Added ifdef for XNA namespace replacement.
Added several implementatios for utility methods.
  • Loading branch information
SergioEstevao committed Mar 10, 2011
1 parent d01c717 commit 5c24517
Show file tree
Hide file tree
Showing 19 changed files with 921 additions and 255 deletions.
19 changes: 10 additions & 9 deletions Benchmark/Benchmark.csproj
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Safe</Configuration>
Expand All @@ -12,11 +12,12 @@
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Safe|AnyCPU' ">
<DebugType>none</DebugType>
<Optimize>true</Optimize>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Safe</OutputPath>
<WarningLevel>4</WarningLevel>
<DefineConstants>SAFE</DefineConstants>
<DefineConstants>TRACE;DEBUG;SAFE</DefineConstants>
<DebugSymbols>true</DebugSymbols>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Unsafe|AnyCPU' ">
<DebugType>none</DebugType>
Expand Down Expand Up @@ -53,6 +54,9 @@
<DefineConstants>SAFE</DefineConstants>
<PlatformTarget>x86</PlatformTarget>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'XnaReplace|AnyCPU'">
<OutputPath>bin\XnaReplace\</OutputPath>
</PropertyGroup>
<ItemGroup>
<Reference Include="System">
</Reference>
Expand All @@ -69,12 +73,9 @@
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<ItemGroup>
<ProjectReference Include="..\Mono.GameMath\Mono.GameMath.csproj" Condition="'$(Configuration)'!='Xna'">
<ProjectReference Include="..\Mono.GameMath\Mono.GameMath.csproj">
<Project>{DAC0541A-CB1C-44CA-BE7C-BF6CD5A8A9EE}</Project>
<Name>Mono.GameMath</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Folder Include="Micro\" />
</ItemGroup>
</Project>
</Project>
10 changes: 6 additions & 4 deletions Benchmark/Main.cs
Expand Up @@ -27,13 +27,15 @@
using System.Reflection;
using System.IO;

using Mono.GameMath;

namespace Benchmark
{
class Driver
{
public static int Main (string[] args)
{
string type = null;
{
public static int Main (string[] args)
{
string type = null;
string method = null;
if (args.Length > 0 && args[0] != "*")
type = args[0];
Expand Down
63 changes: 53 additions & 10 deletions Mono.GameMath.sln
Expand Up @@ -5,15 +5,41 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mono.GameMath", "Mono.GameM
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Benchmark", "Benchmark\Benchmark.csproj", "{5A022A72-8858-4BCB-8380-7522C35E0006}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mono.GameMath.Silverlight", "Mono.GameMath\Mono.GameMath.Silverlight.csproj", "{6703EC70-C5F6-450E-8901-8642A3CE2174}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
Safe|Any CPU = Safe|Any CPU
Unsafe|Any CPU = Unsafe|Any CPU
SafeX86|Any CPU = SafeX86|Any CPU
Simd|Any CPU = Simd|Any CPU
Unsafe|Any CPU = Unsafe|Any CPU
Xna|Any CPU = Xna|Any CPU
SafeX86|Any CPU = SafeX86|Any CPU
XnaReplace|Any CPU = XnaReplace|Any CPU
XnaReplaceSimd|Any CPU = XnaReplaceSimd|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{DAC0541A-CB1C-44CA-BE7C-BF6CD5A8A9EE}.Debug|Any CPU.ActiveCfg = XnaReplace|Any CPU
{DAC0541A-CB1C-44CA-BE7C-BF6CD5A8A9EE}.Debug|Any CPU.Build.0 = XnaReplace|Any CPU
{DAC0541A-CB1C-44CA-BE7C-BF6CD5A8A9EE}.Release|Any CPU.ActiveCfg = XnaReplace|Any CPU
{DAC0541A-CB1C-44CA-BE7C-BF6CD5A8A9EE}.Release|Any CPU.Build.0 = XnaReplace|Any CPU
{DAC0541A-CB1C-44CA-BE7C-BF6CD5A8A9EE}.Safe|Any CPU.ActiveCfg = Safe|Any CPU
{DAC0541A-CB1C-44CA-BE7C-BF6CD5A8A9EE}.Safe|Any CPU.Build.0 = Safe|Any CPU
{DAC0541A-CB1C-44CA-BE7C-BF6CD5A8A9EE}.SafeX86|Any CPU.ActiveCfg = Safe|Any CPU
{DAC0541A-CB1C-44CA-BE7C-BF6CD5A8A9EE}.Simd|Any CPU.ActiveCfg = Simd|Any CPU
{DAC0541A-CB1C-44CA-BE7C-BF6CD5A8A9EE}.Simd|Any CPU.Build.0 = Simd|Any CPU
{DAC0541A-CB1C-44CA-BE7C-BF6CD5A8A9EE}.Unsafe|Any CPU.ActiveCfg = Unsafe|Any CPU
{DAC0541A-CB1C-44CA-BE7C-BF6CD5A8A9EE}.Unsafe|Any CPU.Build.0 = Unsafe|Any CPU
{DAC0541A-CB1C-44CA-BE7C-BF6CD5A8A9EE}.Xna|Any CPU.ActiveCfg = Safe|Any CPU
{DAC0541A-CB1C-44CA-BE7C-BF6CD5A8A9EE}.XnaReplace|Any CPU.ActiveCfg = XnaReplace|Any CPU
{DAC0541A-CB1C-44CA-BE7C-BF6CD5A8A9EE}.XnaReplace|Any CPU.Build.0 = XnaReplace|Any CPU
{DAC0541A-CB1C-44CA-BE7C-BF6CD5A8A9EE}.XnaReplaceSimd|Any CPU.ActiveCfg = XnaReplaceSimd|Any CPU
{DAC0541A-CB1C-44CA-BE7C-BF6CD5A8A9EE}.XnaReplaceSimd|Any CPU.Build.0 = XnaReplaceSimd|Any CPU
{5A022A72-8858-4BCB-8380-7522C35E0006}.Debug|Any CPU.ActiveCfg = XnaReplace|Any CPU
{5A022A72-8858-4BCB-8380-7522C35E0006}.Debug|Any CPU.Build.0 = XnaReplace|Any CPU
{5A022A72-8858-4BCB-8380-7522C35E0006}.Release|Any CPU.ActiveCfg = XnaReplace|Any CPU
{5A022A72-8858-4BCB-8380-7522C35E0006}.Release|Any CPU.Build.0 = XnaReplace|Any CPU
{5A022A72-8858-4BCB-8380-7522C35E0006}.Safe|Any CPU.ActiveCfg = Safe|Any CPU
{5A022A72-8858-4BCB-8380-7522C35E0006}.Safe|Any CPU.Build.0 = Safe|Any CPU
{5A022A72-8858-4BCB-8380-7522C35E0006}.SafeX86|Any CPU.ActiveCfg = SafeX86|Any CPU
Expand All @@ -24,14 +50,31 @@ Global
{5A022A72-8858-4BCB-8380-7522C35E0006}.Unsafe|Any CPU.Build.0 = Unsafe|Any CPU
{5A022A72-8858-4BCB-8380-7522C35E0006}.Xna|Any CPU.ActiveCfg = Xna|Any CPU
{5A022A72-8858-4BCB-8380-7522C35E0006}.Xna|Any CPU.Build.0 = Xna|Any CPU
{DAC0541A-CB1C-44CA-BE7C-BF6CD5A8A9EE}.Safe|Any CPU.ActiveCfg = Safe|Any CPU
{DAC0541A-CB1C-44CA-BE7C-BF6CD5A8A9EE}.Safe|Any CPU.Build.0 = Safe|Any CPU
{DAC0541A-CB1C-44CA-BE7C-BF6CD5A8A9EE}.SafeX86|Any CPU.ActiveCfg = Safe|Any CPU
{DAC0541A-CB1C-44CA-BE7C-BF6CD5A8A9EE}.Simd|Any CPU.ActiveCfg = Simd|Any CPU
{DAC0541A-CB1C-44CA-BE7C-BF6CD5A8A9EE}.Simd|Any CPU.Build.0 = Simd|Any CPU
{DAC0541A-CB1C-44CA-BE7C-BF6CD5A8A9EE}.Unsafe|Any CPU.ActiveCfg = Unsafe|Any CPU
{DAC0541A-CB1C-44CA-BE7C-BF6CD5A8A9EE}.Unsafe|Any CPU.Build.0 = Unsafe|Any CPU
{DAC0541A-CB1C-44CA-BE7C-BF6CD5A8A9EE}.Xna|Any CPU.ActiveCfg = Safe|Any CPU
{5A022A72-8858-4BCB-8380-7522C35E0006}.XnaReplace|Any CPU.ActiveCfg = XnaReplace|Any CPU
{5A022A72-8858-4BCB-8380-7522C35E0006}.XnaReplace|Any CPU.Build.0 = XnaReplace|Any CPU
{5A022A72-8858-4BCB-8380-7522C35E0006}.XnaReplaceSimd|Any CPU.ActiveCfg = Simd|Any CPU
{5A022A72-8858-4BCB-8380-7522C35E0006}.XnaReplaceSimd|Any CPU.Build.0 = Simd|Any CPU
{6703EC70-C5F6-450E-8901-8642A3CE2174}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{6703EC70-C5F6-450E-8901-8642A3CE2174}.Debug|Any CPU.Build.0 = Debug|Any CPU
{6703EC70-C5F6-450E-8901-8642A3CE2174}.Release|Any CPU.ActiveCfg = Release|Any CPU
{6703EC70-C5F6-450E-8901-8642A3CE2174}.Release|Any CPU.Build.0 = Release|Any CPU
{6703EC70-C5F6-450E-8901-8642A3CE2174}.Safe|Any CPU.ActiveCfg = Release|Any CPU
{6703EC70-C5F6-450E-8901-8642A3CE2174}.Safe|Any CPU.Build.0 = Release|Any CPU
{6703EC70-C5F6-450E-8901-8642A3CE2174}.SafeX86|Any CPU.ActiveCfg = Release|Any CPU
{6703EC70-C5F6-450E-8901-8642A3CE2174}.SafeX86|Any CPU.Build.0 = Release|Any CPU
{6703EC70-C5F6-450E-8901-8642A3CE2174}.Simd|Any CPU.ActiveCfg = Release|Any CPU
{6703EC70-C5F6-450E-8901-8642A3CE2174}.Simd|Any CPU.Build.0 = Release|Any CPU
{6703EC70-C5F6-450E-8901-8642A3CE2174}.Unsafe|Any CPU.ActiveCfg = Release|Any CPU
{6703EC70-C5F6-450E-8901-8642A3CE2174}.Unsafe|Any CPU.Build.0 = Release|Any CPU
{6703EC70-C5F6-450E-8901-8642A3CE2174}.Xna|Any CPU.ActiveCfg = Release|Any CPU
{6703EC70-C5F6-450E-8901-8642A3CE2174}.Xna|Any CPU.Build.0 = Release|Any CPU
{6703EC70-C5F6-450E-8901-8642A3CE2174}.XnaReplace|Any CPU.ActiveCfg = Release|Any CPU
{6703EC70-C5F6-450E-8901-8642A3CE2174}.XnaReplace|Any CPU.Build.0 = Release|Any CPU
{6703EC70-C5F6-450E-8901-8642A3CE2174}.XnaReplaceSimd|Any CPU.ActiveCfg = Release|Any CPU
{6703EC70-C5F6-450E-8901-8642A3CE2174}.XnaReplaceSimd|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(MonoDevelopProperties) = preSolution
StartupItem = Benchmark\Benchmark.csproj
Expand Down
9 changes: 7 additions & 2 deletions Mono.GameMath/BoundingBox.cs
Expand Up @@ -26,10 +26,15 @@

using System;
using System.Collections.Generic;

#if XNA
namespace Microsoft.Xna.Framework
#else
namespace Mono.GameMath
#endif
{
[Serializable]
#if !(SILVERLIGHT)
[Serializable]
#endif
public struct BoundingBox : IEquatable<BoundingBox>
{
public Vector3 Min, Max;
Expand Down
8 changes: 7 additions & 1 deletion Mono.GameMath/BoundingFrustum.cs
Expand Up @@ -25,9 +25,15 @@
// THE SOFTWARE.
using System;

#if XNA
namespace Microsoft.Xna.Framework
#else
namespace Mono.GameMath
#endif
{
[Serializable]
#if !(SILVERLIGHT)
[Serializable]
#endif
public class BoundingFrustum : IEquatable<BoundingFrustum>
{
public const int CornerCount = 8;
Expand Down
8 changes: 7 additions & 1 deletion Mono.GameMath/BoundingSphere.cs
Expand Up @@ -26,9 +26,15 @@
using System;
using System.Collections.Generic;

#if XNA
namespace Microsoft.Xna.Framework
#else
namespace Mono.GameMath
#endif
{
[Serializable]
#if !(SILVERLIGHT)
[Serializable]
#endif
public struct BoundingSphere : IEquatable<BoundingSphere>
{
public Vector3 Center;
Expand Down

0 comments on commit 5c24517

Please sign in to comment.