gered/Blarg.GameFramework
Archived
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

fix bit int-value setting to properly overwrite all the bits instead of only OR-ing them in

Browse source
This commit is contained in:
Gered 2013-09-08 17:56:38 -04:00
parent f4c7dd9f50
commit 35378670a5
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
Blarg.GameFramework/Support/Bits.cs
View file

@ -239,49 +239,49 @@ namespace Blarg.GameFramework.Support
{ {
long maxValue = MathHelpers.Pow(2, valueMaxBitLength) - 1; long maxValue = MathHelpers.Pow(2, valueMaxBitLength) - 1;
long actualValue = (value > maxValue ? maxValue : value) << shift; long actualValue = (value > maxValue ? maxValue : value) << shift;
return (bitfield | actualValue); return (bitfield.ClearBit(bitmask) | actualValue);
} }
public static ulong SetValue(this ulong bitfield, ulong value, ulong bitmask, int shift, uint valueMaxBitLength) public static ulong SetValue(this ulong bitfield, ulong value, ulong bitmask, int shift, uint valueMaxBitLength)
{ {
ulong maxValue = (ulong)MathHelpers.Pow((long)2, valueMaxBitLength) - 1; ulong maxValue = (ulong)MathHelpers.Pow((long)2, valueMaxBitLength) - 1;
ulong actualValue = (value > maxValue ? maxValue : value) << shift; ulong actualValue = (value > maxValue ? maxValue : value) << shift;
return (bitfield | actualValue); return (bitfield.ClearBit(bitmask) | actualValue);
} }
public static int SetValue(this int bitfield, int value, int bitmask, int shift, uint valueMaxBitLength) public static int SetValue(this int bitfield, int value, int bitmask, int shift, uint valueMaxBitLength)
{ {
int maxValue = MathHelpers.Pow(2, valueMaxBitLength) - 1; int maxValue = MathHelpers.Pow(2, valueMaxBitLength) - 1;
int actualValue = (value > maxValue ? maxValue : value) << shift; int actualValue = (value > maxValue ? maxValue : value) << shift;
return (bitfield | actualValue); return (bitfield.ClearBit(bitmask) | actualValue);
} }
public static uint SetValue(this uint bitfield, uint value, uint bitmask, int shift, uint valueMaxBitLength) public static uint SetValue(this uint bitfield, uint value, uint bitmask, int shift, uint valueMaxBitLength)
{ {
uint maxValue = (uint)MathHelpers.Pow(2, valueMaxBitLength) - 1; uint maxValue = (uint)MathHelpers.Pow(2, valueMaxBitLength) - 1;
uint actualValue = (value > maxValue ? maxValue : value) << shift; uint actualValue = (value > maxValue ? maxValue : value) << shift;
return (bitfield | actualValue); return (bitfield.ClearBit(bitmask) | actualValue);
} }
public static short SetValue(this short bitfield, short value, short bitmask, int shift, uint valueMaxBitLength) public static short SetValue(this short bitfield, short value, short bitmask, int shift, uint valueMaxBitLength)
{ {
short maxValue = (short)(MathHelpers.Pow(2, valueMaxBitLength) - 1); short maxValue = (short)(MathHelpers.Pow(2, valueMaxBitLength) - 1);
int actualValue = (value > maxValue ? maxValue : value) << shift; int actualValue = (value > maxValue ? maxValue : value) << shift;
return (short)((int)bitfield | actualValue); return (short)((int)bitfield.ClearBit(bitmask) | actualValue);
} }
public static ushort SetValue(this ushort bitfield, ushort value, ushort bitmask, int shift, uint valueMaxBitLength) public static ushort SetValue(this ushort bitfield, ushort value, ushort bitmask, int shift, uint valueMaxBitLength)
{ {
ushort maxValue = (ushort)(MathHelpers.Pow(2, valueMaxBitLength) - 1); ushort maxValue = (ushort)(MathHelpers.Pow(2, valueMaxBitLength) - 1);
int actualValue = (value > maxValue ? maxValue : value) << shift; int actualValue = (value > maxValue ? maxValue : value) << shift;
return (ushort)((int)bitfield | actualValue); return (ushort)((int)bitfield.ClearBit(bitmask) | actualValue);
} }
public static byte SetValue(this byte bitfield, byte value, byte bitmask, int shift, uint valueMaxBitLength) public static byte SetValue(this byte bitfield, byte value, byte bitmask, int shift, uint valueMaxBitLength)
{ {
byte maxValue = (byte)(MathHelpers.Pow(2, valueMaxBitLength) - 1); byte maxValue = (byte)(MathHelpers.Pow(2, valueMaxBitLength) - 1);
int actualValue = (value > maxValue ? maxValue : value) << shift; int actualValue = (value > maxValue ? maxValue : value) << shift;
return (byte)((int)bitfield | actualValue); return (byte)((int)bitfield.ClearBit(bitmask) | actualValue);
} }
#endregion #endregion