Skip to content

Commit

Permalink
Merge pull request #1 from burninrubber0/VehicleList-update
Browse files Browse the repository at this point in the history 
Updates to VehicleList and Vehicle Editor forms
  • Loading branch information
@burninrubber0
burninrubber0 authored Sep 6, 2020
2 parents f27857e + fd5b7df commit b468ea4
Show file tree
Hide file tree
Showing 33 changed files with 2,003 additions and 1,062 deletions.
2 changes: 1 addition & 1 deletion BaseHandlers/AptData.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -802,7 +802,7 @@ public bool Write(BundleEntry entry)

public EntryType GetEntryType(BundleEntry entry)
{
return EntryType.AptDataHeaderType;
return EntryType.AptData;
}

public IEntryEditor GetEditor(BundleEntry entry)
Expand Down
18 changes: 9 additions & 9 deletions BaseHandlers/BasePlugin.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,16 @@ public class BasePlugin : Plugin
{
public override void Init()
{
EntryTypeRegistry.Register(EntryType.TriggerResourceType, new TriggerData());
EntryTypeRegistry.Register(EntryType.StreetDataResourceType, new StreetData());
EntryTypeRegistry.Register(EntryType.ProgressionResourceType, new ProgressionData());
EntryTypeRegistry.Register(EntryType.IDList, new IDList());
EntryTypeRegistry.Register(EntryType.TrafficDataResourceType, new Traffic());
EntryTypeRegistry.Register(EntryType.FlaptFileResourceType, new FlaptFile());
EntryTypeRegistry.Register(EntryType.TriggerData, new TriggerData());
EntryTypeRegistry.Register(EntryType.StreetData, new StreetData());
EntryTypeRegistry.Register(EntryType.ProgressionData, new ProgressionData());
EntryTypeRegistry.Register(EntryType.EntryList, new IDList());
EntryTypeRegistry.Register(EntryType.TrafficData, new Traffic());
EntryTypeRegistry.Register(EntryType.FlaptFile, new FlaptFile());
//EntryTypeRegistry.Register(EntryType.AptDataHeaderType, new AptData());
EntryTypeRegistry.Register(EntryType.InstanceListResourceType, new InstanceList());
EntryTypeRegistry.Register(EntryType.GraphicsSpecResourceType, new GraphicsSpec());
EntryTypeRegistry.Register(EntryType.RwRenderableResourceType, new Renderable());
EntryTypeRegistry.Register(EntryType.InstanceList, new InstanceList());
EntryTypeRegistry.Register(EntryType.GraphicsSpec, new GraphicsSpec());
EntryTypeRegistry.Register(EntryType.Renderable, new Renderable());
}

public override string GetID()
Expand Down
2 changes: 1 addition & 1 deletion BaseHandlers/FlaptFile.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -432,7 +432,7 @@ public bool Write(BundleEntry entry)

public EntryType GetEntryType(BundleEntry entry)
{
return EntryType.FlaptFileResourceType;
return EntryType.FlaptFile;
}

public IEntryEditor GetEditor(BundleEntry entry)
Expand Down
2 changes: 1 addition & 1 deletion BaseHandlers/GraphicsSpec.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ public bool Write(BundleEntry entry)

public EntryType GetEntryType(BundleEntry entry)
{
return EntryType.GraphicsSpecResourceType;
return EntryType.GraphicsSpec;
}

public IEntryEditor GetEditor(BundleEntry entry)
Expand Down
2 changes: 1 addition & 1 deletion BaseHandlers/IDList.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ public IEntryEditor GetEditor(BundleEntry entry)

public EntryType GetEntryType(BundleEntry entry)
{
return EntryType.IDList;
return EntryType.EntryList;
}

private void Clear()
Expand Down
2 changes: 1 addition & 1 deletion BaseHandlers/InstanceList.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@ private bool InRange(ModelInstance instance)

public EntryType GetEntryType(BundleEntry entry)
{
return EntryType.InstanceListResourceType;
return EntryType.InstanceList;
}

public IEntryEditor GetEditor(BundleEntry entry)
Expand Down
2 changes: 1 addition & 1 deletion BaseHandlers/MaterialEntry.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ public static MaterialEntry Read(BundleEntry entry)
//t.StopLog();

//DebugTimer t2 = DebugTimer.Start("LoadTextureState");
if (descEntry1 != null && descEntry1.Type == EntryType.RwTextureStateResourceType)
if (descEntry1 != null && descEntry1.Type == EntryType.TextureState)
{
TextureState state = TextureState.Read(descEntry1);

Expand Down
2 changes: 1 addition & 1 deletion BaseHandlers/ProgressionData.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,7 @@ public IEntryEditor GetEditor(BundleEntry entry)

public EntryType GetEntryType(BundleEntry entry)
{
return EntryType.ProgressionResourceType;
return EntryType.ProgressionData;
}

private void Clear()
Expand Down
2 changes: 1 addition & 1 deletion BaseHandlers/Renderable.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -475,7 +475,7 @@ public bool Write(BundleEntry entry)

public EntryType GetEntryType(BundleEntry entry)
{
return EntryType.RwRenderableResourceType;
return EntryType.Renderable;
}

public IEntryEditor GetEditor(BundleEntry entry)
Expand Down
2 changes: 1 addition & 1 deletion BaseHandlers/StreetData.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -397,7 +397,7 @@ public bool Write(BundleEntry entry)

public EntryType GetEntryType(BundleEntry entry)
{
return EntryType.StreetDataResourceType;
return EntryType.StreetData;
}

public IEntryEditor GetEditor(BundleEntry entry)
Expand Down
2 changes: 1 addition & 1 deletion BaseHandlers/TextureState.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ public static TextureState Read(BundleEntry entry)
}
}

if (descEntry1 != null && descEntry1.Type == EntryType.RasterResourceType)
if (descEntry1 != null && descEntry1.Type == EntryType.Texture)
{
if (entry.Console)
result.Texture = GameImage.GetImagePS3(descEntry1.EntryBlocks[0].Data, descEntry1.EntryBlocks[1].Data);
Expand Down
2 changes: 1 addition & 1 deletion BaseHandlers/Traffic.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ public IEntryEditor GetEditor(BundleEntry entry)

public EntryType GetEntryType(BundleEntry entry)
{
return EntryType.TrafficDataResourceType;
return EntryType.TrafficData;
}

private void Clear()
Expand Down
2 changes: 1 addition & 1 deletion BaseHandlers/TriggerData.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -404,7 +404,7 @@ public IEntryEditor GetEditor(BundleEntry entry)

public EntryType GetEntryType(BundleEntry entry)
{
return EntryType.TriggerResourceType;
return EntryType.TriggerData;
}

public bool Write(BundleEntry entry)
Expand Down
2 changes: 1 addition & 1 deletion BundleFormat/BundleDependency.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ public override string ToString()
}
}

if (Entry != null && Entry.Type == EntryType.RwVertexDescResourceType)
if (Entry != null && Entry.Type == EntryType.VertexDescriptor)
{
VertexDesc desc = VertexDesc.Read(Entry);
value = ", Attribute Count: " + desc.AttributeCount.ToString("D2");
Expand Down
164 changes: 82 additions & 82 deletions BundleFormat/BundleEntry.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -349,169 +349,169 @@ public Color GetColor()
{
switch (Type)
{
case EntryType.RasterResourceType:
case EntryType.Texture:
return Color.Orange;
case EntryType.MaterialResourceType:
case EntryType.Material:
return Color.DeepPink;
case EntryType.TextFileResourceType:
case EntryType.TextFile:
break;
case EntryType.RwVertexDescResourceType:
case EntryType.VertexDescriptor:
break;
case EntryType.RwRenderableResourceType:
case EntryType.Renderable:
return Color.Aquamarine;
case EntryType.unknown_file_type_00D:
case EntryType.MaterialTechnique:
break;
case EntryType.RwTextureStateResourceType:
case EntryType.TextureState:
break;
case EntryType.MaterialStateResourceType:
case EntryType.MaterialState:
break;
case EntryType.RwShaderProgramBufferResourceType:
case EntryType.ShaderProgramBuffer:
break;
case EntryType.RwShaderParameterResourceType:
case EntryType.ShaderParameter:
break;
case EntryType.RwDebugResourceType:
case EntryType.Debug:
break;
case EntryType.KdTreeResourceType:
case EntryType.KdTree:
break;
case EntryType.SnrResourceType:
case EntryType.Snr:
break;
case EntryType.AttribSysSchemaResourceType:
case EntryType.AttribSysSchema:
break;
case EntryType.AttribSysVaultResourceType:
case EntryType.AttribSysVault:
break;
case EntryType.AptDataHeaderType:
case EntryType.AptData:
break;
case EntryType.GuiPopupResourceType:
case EntryType.Popup:
break;
case EntryType.FontResourceType:
case EntryType.Font:
break;
case EntryType.LuaCodeResourceType:
case EntryType.LuaCode:
break;
case EntryType.InstanceListResourceType:
case EntryType.InstanceList:
return Color.BlueViolet;
case EntryType.IDList:
case EntryType.EntryList:
return Color.Tomato;
case EntryType.LanguageResourceType:
case EntryType.Language:
break;
case EntryType.SatNavTileResourceType:
case EntryType.SatNavTile:
break;
case EntryType.SatNavTileDirectoryResourceType:
case EntryType.SatNavTileDirectory:
break;
case EntryType.ModelResourceType:
case EntryType.Model:
return Color.Blue;
case EntryType.RwColourCubeResourceType:
case EntryType.ColourCube:
break;
case EntryType.HudMessageResourceType:
case EntryType.HudMessage:
break;
case EntryType.HudMessageListResourceType:
case EntryType.HudMessageList:
break;
case EntryType.unknown_file_type_02E:
case EntryType.HudMessageSequence:
break;
case EntryType.unknown_file_type_02F:
case EntryType.HudMessageSequenceDictionary:
break;
case EntryType.WorldPainter2DResourceType:
case EntryType.WorldPainter2D:
break;
case EntryType.PFXHookBundleResourceType:
case EntryType.PFXHookBundle:
break;
case EntryType.ShaderResourceType:
case EntryType.ShaderTechnique:
break;
case EntryType.ICETakeDictionaryResourceType:
case EntryType.ICETakeDictionary:
break;
case EntryType.VideoDataResourceType:
case EntryType.VideoData:
break;
case EntryType.PolygonSoupListResourceType:
case EntryType.PolygonSoupList:
return Color.Goldenrod;
case EntryType.CommsToolListDefinitionResourceType:
case EntryType.CommsToolListDefinition:
break;
case EntryType.CommsToolListResourceType:
case EntryType.CommsToolList:
break;
case EntryType.AnimationCollectionResourceType:
case EntryType.AnimationCollection:
break;
case EntryType.RegistryResourceType:
case EntryType.Registry:
break;
case EntryType.GenericRwacWaveContentResourceType:
case EntryType.GenericRwacWaveContent:
break;
case EntryType.GinsuWaveContentResourceType:
case EntryType.GinsuWaveContent:
break;
case EntryType.AemsBankResourceType:
case EntryType.AemsBank:
break;
case EntryType.CsisResourceType:
case EntryType.Csis:
break;
case EntryType.NicotineResourceType:
case EntryType.Nicotine:
break;
case EntryType.SplicerResourceType:
case EntryType.Splicer:
break;
case EntryType.GenericRwacReverbIRContentResourceType:
case EntryType.GenericRwacReverbIRContent:
break;
case EntryType.SnapshotDataResourceType:
case EntryType.SnapshotData:
break;
case EntryType.ZoneListResourceType:
case EntryType.ZoneList:
break;
case EntryType.LoopModelResourceType:
case EntryType.LoopModel:
break;
case EntryType.AISectionsResourceType:
case EntryType.AISections:
break;
case EntryType.TrafficDataResourceType:
case EntryType.TrafficData:
break;
case EntryType.TriggerResourceType:
case EntryType.TriggerData:
break;
case EntryType.VehicleListResourceType:
case EntryType.VehicleList:
break;
case EntryType.GraphicsSpecResourceType:
case EntryType.GraphicsSpec:
return Color.SeaGreen;
case EntryType.ParticleDescriptionCollectionResourceType:
case EntryType.ParticleDescriptionCollection:
break;
case EntryType.WheelListResourceType:
case EntryType.WheelList:
break;
case EntryType.WheelGraphicsSpecResourceType:
case EntryType.WheelGraphicsSpec:
break;
case EntryType.TextureNameMapResourceType:
case EntryType.TextureNameMap:
break;
case EntryType.ProgressionResourceType:
case EntryType.ProgressionData:
break;
case EntryType.PropPhysicsResourceType:
case EntryType.PropPhysics:
break;
case EntryType.PropGraphicsListResourceType:
case EntryType.PropGraphicsList:
break;
case EntryType.PropInstanceDataResourceType:
case EntryType.PropInstanceData:
break;
case EntryType.BrnEnvironmentKeyframeResourceType:
case EntryType.BrnEnvironmentKeyframe:
break;
case EntryType.BrnEnvironmentTimeLineResourceType:
case EntryType.BrnEnvironmentTimeLine:
break;
case EntryType.BrnEnvironmentDictionaryResourceType:
case EntryType.BrnEnvironmentDictionary:
break;
case EntryType.GraphicsStubResourceType:
case EntryType.GraphicsStub:
break;
case EntryType.StaticSoundMapResourceType:
case EntryType.StaticSoundMap:
break;
case EntryType.StreetDataResourceType:
case EntryType.StreetData:
break;
case EntryType.BrnVFXMeshCollectionResourceType:
case EntryType.VFXMeshCollection:
break;
case EntryType.MassiveLookupTableResourceType:
case EntryType.MassiveLookupTable:
break;
case EntryType.VFXPropCollectionResourceType:
case EntryType.VFXPropCollection:
break;
case EntryType.StreamedDeformationSpecResourceType:
case EntryType.StreamedDeformation:
break;
case EntryType.ParticleDescriptionResourceType:
case EntryType.ParticleDescription:
break;
case EntryType.PlayerCarColoursResourceType:
case EntryType.PlayerCarColours:
break;
case EntryType.ChallengeListResourceType:
case EntryType.ChallengeList:
break;
case EntryType.FlaptFileResourceType:
case EntryType.FlaptFile:
break;
case EntryType.ProfileUpgradeResourceType:
case EntryType.ProfileUpgrade:
break;
case EntryType.VehicleAnimationResourceType:
case EntryType.VehicleAnimation:
break;
case EntryType.BodypartRemappingResourceType:
case EntryType.BodypartRemapData:
break;
case EntryType.LUAListResourceType:
case EntryType.LUAList:
break;
case EntryType.LUAScriptResourceType:
case EntryType.LUAScript:
break;
}
return Color.Transparent;
Expand Down
Loading

0 comments on commit b468ea4

Please sign in to comment.