Source2Roblox/Roblox-File-Format
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Consistency adjustments

Browse Source
This commit is contained in:
Max G 2019-02-24 21:17:53 -06:00 committed by GitHub
parent 47bdbeb25d
commit f80d6942cc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 27 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
BinaryFormat/ChunkTypes/PROP.cs
View File

@ -31,7 +31,6 @@ namespace RobloxFiles.BinaryFormat.Chunks
{ {
Type = PropertyType.Unknown; Type = PropertyType.Unknown;
} }
} }
public void ReadProperties(BinaryRobloxFile file) public void ReadProperties(BinaryRobloxFile file)
@ -57,6 +56,9 @@ namespace RobloxFiles.BinaryFormat.Chunks
} }
// Setup some short-hand functions for actions frequently used during the read procedure. // Setup some short-hand functions for actions frequently used during the read procedure.
var readInts = new Func<int[]>(() => Reader.ReadInts(instCount));
var readFloats = new Func<float[]>(() => Reader.ReadFloats(instCount));
var loadProperties = new Action<Func<int, object>>(read => var loadProperties = new Action<Func<int, object>>(read =>
{ {
for (int i = 0; i < instCount; i++) for (int i = 0; i < instCount; i++)
@ -65,9 +67,6 @@ namespace RobloxFiles.BinaryFormat.Chunks
props[i].Value = result; props[i].Value = result;
} }
}); });
var readInts = new Func<int[]>(() => Reader.ReadInts(instCount));
var readFloats = new Func<float[]>(() => Reader.ReadFloats(instCount));
// Read the property data based on the property type. // Read the property data based on the property type.
switch (Type) switch (Type)
@ -161,11 +160,11 @@ namespace RobloxFiles.BinaryFormat.Chunks
break; break;
case PropertyType.BrickColor: case PropertyType.BrickColor:
int[] brickColors = readInts(); int[] BrickColorIds = readInts();
loadProperties(i => loadProperties(i =>
{ {
int number = brickColors[i]; int number = BrickColorIds[i];
return BrickColor.FromNumber(number); return BrickColor.FromNumber(number);
}); });
@ -186,28 +185,28 @@ namespace RobloxFiles.BinaryFormat.Chunks
break; break;
case PropertyType.Vector2: case PropertyType.Vector2:
float[] vector2_X = readFloats(), float[] Vector2_X = readFloats(),
vector2_Y = readFloats(); Vector2_Y = readFloats();
loadProperties(i => loadProperties(i =>
{ {
float x = vector2_X[i], float x = Vector2_X[i],
y = vector2_Y[i]; y = Vector2_Y[i];
return new Vector2(x, y); return new Vector2(x, y);
}); });
break; break;
case PropertyType.Vector3: case PropertyType.Vector3:
float[] vector3_X = readFloats(), float[] Vector3_X = readFloats(),
vector3_Y = readFloats(), Vector3_Y = readFloats(),
vector3_Z = readFloats(); Vector3_Z = readFloats();
loadProperties(i => loadProperties(i =>
{ {
float x = vector3_X[i], float x = Vector3_X[i],
y = vector3_Y[i], y = Vector3_Y[i],
z = vector3_Z[i]; z = Vector3_Z[i];
return new Vector3(x, y, z); return new Vector3(x, y, z);
}); });
@ -268,17 +267,17 @@ namespace RobloxFiles.BinaryFormat.Chunks
} }
}); });
float[] cframe_X = readFloats(), float[] CFrame_X = readFloats(),
cframe_Y = readFloats(), CFrame_Y = readFloats(),
cframe_Z = readFloats(); CFrame_Z = readFloats();
loadProperties(i => loadProperties(i =>
{ {
float[] matrix = props[i].Value as float[]; float[] matrix = props[i].Value as float[];
float x = cframe_X[i], float x = CFrame_X[i],
y = cframe_Y[i], y = CFrame_Y[i],
z = cframe_Z[i]; z = CFrame_Z[i];
float[] position = new float[3] { x, y, z }; float[] position = new float[3] { x, y, z };
float[] components = position.Concat(matrix).ToArray(); float[] components = position.Concat(matrix).ToArray();
@ -409,15 +408,15 @@ namespace RobloxFiles.BinaryFormat.Chunks
break; break;
case PropertyType.Color3uint8: case PropertyType.Color3uint8:
byte[] color3uint8_R = Reader.ReadBytes(instCount), byte[] Color3uint8_R = Reader.ReadBytes(instCount),
color3uint8_G = Reader.ReadBytes(instCount), Color3uint8_G = Reader.ReadBytes(instCount),
color3uint8_B = Reader.ReadBytes(instCount); Color3uint8_B = Reader.ReadBytes(instCount);
loadProperties(i => loadProperties(i =>
{ {
byte r = color3uint8_R[i], byte r = Color3uint8_R[i],
g = color3uint8_G[i], g = Color3uint8_G[i],
b = color3uint8_B[i]; b = Color3uint8_B[i];
return Color3.FromRGB(r, g, b); return Color3.FromRGB(r, g, b);
}); });