Skip to content
This repository has been archived by the owner on Jan 4, 2023. It is now read-only.

Commit

Permalink
Removed packed vectors.
Browse files Browse the repository at this point in the history
  • Loading branch information
@jessefreeman
jessefreeman committed May 21, 2020
1 parent 751768c commit 9634590
Show file tree
Hide file tree
Showing 3 changed files with 141 additions and 138 deletions.
14 changes: 7 additions & 7 deletions MonoGame/MonoGame.Framework/Design/VectorConversion.cs
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using System;
using System.ComponentModel;
using System.Globalization;
using Microsoft.Xna.Framework.Graphics.PackedVector;
// using Microsoft.Xna.Framework.Graphics.PackedVector;

namespace Microsoft.Xna.Framework.Design
{
Expand Down Expand Up @@ -33,12 +33,12 @@ public static object ConvertToFromVector4(ITypeDescriptorContext context, Cultur
return new Vector3(value.X, value.Y, value.Z);
if (destinationType == typeof(Vector4))
return new Vector4(value.X, value.Y, value.Z, value.W);
if (destinationType.GetInterface("IPackedVector") != null)
{
var packedVec = (IPackedVector)Activator.CreateInstance(destinationType);
packedVec.PackFromVector4(value);
return packedVec;
}
// if (destinationType.GetInterface("IPackedVector") != null)
// {
// var packedVec = (IPackedVector)Activator.CreateInstance(destinationType);
// packedVec.PackFromVector4(value);
// return packedVec;
// }

return null;
}
Expand Down
262 changes: 131 additions & 131 deletions MonoGame/MonoGame.Framework/Graphics/Texture2D.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
using System;
using System.IO;
using System.Runtime.InteropServices;
using Microsoft.Xna.Framework.Graphics.PackedVector;
// using Microsoft.Xna.Framework.Graphics.PackedVector;
using MonoGame.Utilities;

namespace Microsoft.Xna.Framework.Graphics
Expand Down Expand Up @@ -447,136 +447,136 @@ internal Color[] GetColorData()
GetData(colorData);
break;

case SurfaceFormat.Alpha8:
var alpha8Data = new Alpha8[colorDataLength];
GetData(alpha8Data);

for (int i = 0; i < colorDataLength; i++)
{
colorData[i] = new Color(alpha8Data[i].ToVector4());
}

break;

case SurfaceFormat.Bgr565:
var bgr565Data = new Bgr565[colorDataLength];
GetData(bgr565Data);

for (int i = 0; i < colorDataLength; i++)
{
colorData[i] = new Color(bgr565Data[i].ToVector4());
}

break;

case SurfaceFormat.Bgra4444:
var bgra4444Data = new Bgra4444[colorDataLength];
GetData(bgra4444Data);

for (int i = 0; i < colorDataLength; i++)
{
colorData[i] = new Color(bgra4444Data[i].ToVector4());
}

break;

case SurfaceFormat.Bgra5551:
var bgra5551Data = new Bgra5551[colorDataLength];
GetData(bgra5551Data);

for (int i = 0; i < colorDataLength; i++)
{
colorData[i] = new Color(bgra5551Data[i].ToVector4());
}
break;

case SurfaceFormat.HalfSingle:
var halfSingleData = new HalfSingle[colorDataLength];
GetData(halfSingleData);

for (int i = 0; i < colorDataLength; i++)
{
colorData[i] = new Color(halfSingleData[i].ToVector4());
}

break;

case SurfaceFormat.HalfVector2:
var halfVector2Data = new HalfVector2[colorDataLength];
GetData(halfVector2Data);

for (int i = 0; i < colorDataLength; i++)
{
colorData[i] = new Color(halfVector2Data[i].ToVector4());
}

break;

case SurfaceFormat.HalfVector4:
var halfVector4Data = new HalfVector4[colorDataLength];
GetData(halfVector4Data);

for (int i = 0; i < colorDataLength; i++)
{
colorData[i] = new Color(halfVector4Data[i].ToVector4());
}

break;

case SurfaceFormat.NormalizedByte2:
var normalizedByte2Data = new NormalizedByte2[colorDataLength];
GetData(normalizedByte2Data);

for (int i = 0; i < colorDataLength; i++)
{
colorData[i] = new Color(normalizedByte2Data[i].ToVector4());
}

break;

case SurfaceFormat.NormalizedByte4:
var normalizedByte4Data = new NormalizedByte4[colorDataLength];
GetData(normalizedByte4Data);

for (int i = 0; i < colorDataLength; i++)
{
colorData[i] = new Color(normalizedByte4Data[i].ToVector4());
}

break;

case SurfaceFormat.Rg32:
var rg32Data = new Rg32[colorDataLength];
GetData(rg32Data);

for (int i = 0; i < colorDataLength; i++)
{
colorData[i] = new Color(rg32Data[i].ToVector4());
}

break;

case SurfaceFormat.Rgba64:
var rgba64Data = new Rgba64[colorDataLength];
GetData(rgba64Data);

for (int i = 0; i < colorDataLength; i++)
{
colorData[i] = new Color(rgba64Data[i].ToVector4());
}

break;

case SurfaceFormat.Rgba1010102:
var rgba1010102Data = new Rgba1010102[colorDataLength];
GetData(rgba1010102Data);

for (int i = 0; i < colorDataLength; i++)
{
colorData[i] = new Color(rgba1010102Data[i].ToVector4());
}

break;
// case SurfaceFormat.Alpha8:
// var alpha8Data = new Alpha8[colorDataLength];
// GetData(alpha8Data);
//
// for (int i = 0; i < colorDataLength; i++)
// {
// colorData[i] = new Color(alpha8Data[i].ToVector4());
// }
//
// break;
//
// case SurfaceFormat.Bgr565:
// var bgr565Data = new Bgr565[colorDataLength];
// GetData(bgr565Data);
//
// for (int i = 0; i < colorDataLength; i++)
// {
// colorData[i] = new Color(bgr565Data[i].ToVector4());
// }
//
// break;
//
// case SurfaceFormat.Bgra4444:
// var bgra4444Data = new Bgra4444[colorDataLength];
// GetData(bgra4444Data);
//
// for (int i = 0; i < colorDataLength; i++)
// {
// colorData[i] = new Color(bgra4444Data[i].ToVector4());
// }
//
// break;
//
// case SurfaceFormat.Bgra5551:
// var bgra5551Data = new Bgra5551[colorDataLength];
// GetData(bgra5551Data);
//
// for (int i = 0; i < colorDataLength; i++)
// {
// colorData[i] = new Color(bgra5551Data[i].ToVector4());
// }
// break;
//
// case SurfaceFormat.HalfSingle:
// var halfSingleData = new HalfSingle[colorDataLength];
// GetData(halfSingleData);
//
// for (int i = 0; i < colorDataLength; i++)
// {
// colorData[i] = new Color(halfSingleData[i].ToVector4());
// }
//
// break;
//
// case SurfaceFormat.HalfVector2:
// var halfVector2Data = new HalfVector2[colorDataLength];
// GetData(halfVector2Data);
//
// for (int i = 0; i < colorDataLength; i++)
// {
// colorData[i] = new Color(halfVector2Data[i].ToVector4());
// }
//
// break;
//
// case SurfaceFormat.HalfVector4:
// var halfVector4Data = new HalfVector4[colorDataLength];
// GetData(halfVector4Data);
//
// for (int i = 0; i < colorDataLength; i++)
// {
// colorData[i] = new Color(halfVector4Data[i].ToVector4());
// }
//
// break;
//
// case SurfaceFormat.NormalizedByte2:
// var normalizedByte2Data = new NormalizedByte2[colorDataLength];
// GetData(normalizedByte2Data);
//
// for (int i = 0; i < colorDataLength; i++)
// {
// colorData[i] = new Color(normalizedByte2Data[i].ToVector4());
// }
//
// break;
//
// case SurfaceFormat.NormalizedByte4:
// var normalizedByte4Data = new NormalizedByte4[colorDataLength];
// GetData(normalizedByte4Data);
//
// for (int i = 0; i < colorDataLength; i++)
// {
// colorData[i] = new Color(normalizedByte4Data[i].ToVector4());
// }
//
// break;
//
// case SurfaceFormat.Rg32:
// var rg32Data = new Rg32[colorDataLength];
// GetData(rg32Data);
//
// for (int i = 0; i < colorDataLength; i++)
// {
// colorData[i] = new Color(rg32Data[i].ToVector4());
// }
//
// break;
//
// case SurfaceFormat.Rgba64:
// var rgba64Data = new Rgba64[colorDataLength];
// GetData(rgba64Data);
//
// for (int i = 0; i < colorDataLength; i++)
// {
// colorData[i] = new Color(rgba64Data[i].ToVector4());
// }
//
// break;
//
// case SurfaceFormat.Rgba1010102:
// var rgba1010102Data = new Rgba1010102[colorDataLength];
// GetData(rgba1010102Data);
//
// for (int i = 0; i < colorDataLength; i++)
// {
// colorData[i] = new Color(rgba1010102Data[i].ToVector4());
// }
//
// break;

default:
throw new Exception("Texture surface format not supported");
Expand Down
3 changes: 3 additions & 0 deletions MonoGame/MonoGame.Framework/MonoGame.Framework.DesktopGL.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,20 +24,23 @@ This package provides you with MonoGame Framework that uses OpenGL for rendering
<ItemGroup>
<Compile Remove="bin\**\*" />
<Compile Remove="Content\**" />
<Compile Remove="Graphics\PackedVector\**" />
<Compile Remove="Media\**" />
<Compile Remove="obj\**\*" />
<Compile Remove="Platform\**\*" />
<Compile Remove="Platform\Media\**" />
<Compile Remove="Properties\**\*" />
<Compile Remove="Utilities\LzxStream\**" />
<EmbeddedResource Remove="Content\**" />
<EmbeddedResource Remove="Graphics\PackedVector\**" />
<EmbeddedResource Remove="Media\**" />
<EmbeddedResource Remove="Platform\Media\**" />
<EmbeddedResource Remove="Utilities\LzxStream\**" />
</ItemGroup>

<ItemGroup>
<None Remove="Content\**" />
<None Remove="Graphics\PackedVector\**" />
<None Remove="Media\**" />
<None Remove="Platform\**\*" />
<None Remove="Platform\Media\**" />
Expand Down

0 comments on commit 9634590

Please sign in to comment.