Skip to content

Commit

Permalink
plat editor
Browse files Browse the repository at this point in the history
  • Loading branch information
@igorseabra4
igorseabra4 committed May 9, 2019
1 parent 78f5ff3 commit 5805f2b
Show file tree
Hide file tree
Showing 39 changed files with 2,092 additions and 1,540 deletions.
11 changes: 6 additions & 5 deletions IndustrialPark/ArchiveEditor/ArchiveEditorFunctions.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -283,12 +283,13 @@ public void DisposeOfAsset(uint assetID, bool fast = false)

if (assetDictionary[assetID] is AssetJSP jsp)
jsp.GetRenderWareModelFile().Dispose();
if (assetDictionary[assetID] is AssetMODL modl)
if (modl.HasRenderWareModelFile())
modl.GetRenderWareModelFile().Dispose();
if (assetDictionary[assetID] is IAssetWithModel iawm)
else if (assetDictionary[assetID] is AssetMODL modl && modl.HasRenderWareModelFile())
modl.GetRenderWareModelFile().Dispose();
else if (assetDictionary[assetID] is IAssetWithModel iawm)
iawm.MovieRemoveFromDictionary();
if (assetDictionary[assetID] is AssetLODT lodt)
else if (assetDictionary[assetID] is AssetPICK pick)
pick.ClearDictionary();
else if (assetDictionary[assetID] is AssetLODT lodt)
lodt.ClearDictionary();
}

Expand Down
3 changes: 3 additions & 0 deletions IndustrialPark/ArchiveEditor/ArchiveEditorFunctions_AssetEditing.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,9 @@ private void OpenInternalEditor(Asset asset)

switch (asset.AHDR.assetType)
{
case AssetType.BUTN:
internalEditors.Add(new InternalButtonEditor((AssetBUTN)asset, this));
break;
case AssetType.CAM:
internalEditors.Add(new InternalCamEditor((AssetCAM)asset, this));
break;
Expand Down
73 changes: 42 additions & 31 deletions IndustrialPark/ArchiveEditor/ArchiveEditorFunctions_AssetTemplates.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -770,7 +770,7 @@ public uint PlaceTemplate(Vector3 position, int layerIndex, out bool success, re
((AssetCAM)asset).Flags2 = 1;
((AssetCAM)asset).Flags3 = 1;
((AssetCAM)asset).Flags4 = 0xC0;
((AssetCAM)asset).CamType = 2;
((AssetCAM)asset).CamType = CamType.Static;
break;
case AssetTemplate.Counter:
((AssetCNTR)asset).AssetType = ObjectAssetType.CNTR;
Expand Down Expand Up @@ -807,7 +807,8 @@ public uint PlaceTemplate(Vector3 position, int layerIndex, out bool success, re
((AssetPLAT)asset).PlatformType = PlatType.Mechanism;
((AssetPLAT)asset).PlatformSubtype = PlatTypeSpecific.Mechanism;
((AssetPLAT)asset).CollisionType = 4;
((AssetPLAT)asset).UnknownByte_90 = 4;
((AssetPLAT)asset).PlatSpecific = new PlatSpecific_Generic();
((AssetPLAT)asset).Motion = new Motion_Mechanism();
break;
case AssetTemplate.Player_Generic:
((AssetPLYR)asset).AssetType = ObjectAssetType.PLYR;
Expand Down Expand Up @@ -1224,14 +1225,16 @@ public uint PlaceTemplate(Vector3 position, int layerIndex, out bool success, re
((AssetBUTN)asset).AssetType = ObjectAssetType.BUTN;
((AssetBUTN)asset).Model_AssetID = "button";
((AssetBUTN)asset).PressedModel_AssetID = "button_grn";
((AssetBUTN)asset).UnknownByte6C = 4;
((AssetBUTN)asset).UnknownByte6F = 4;
((AssetBUTN)asset).UnknownByte70 = 2;
((AssetBUTN)asset).UnknownByte71 = 1;
((AssetBUTN)asset).UnknownByte72 = 1;
((AssetBUTN)asset).PressedOffset = -0.2f;
((AssetBUTN)asset).TransitionTime = 0.5f;
((AssetBUTN)asset).TransitionEaseOut = 0.2f;
((AssetBUTN)asset).Motion = new Motion_Mechanism()
{
Flags = 4,
MovementMode = 2,
MovementLoopMode = 1,
SlideAxis = 1,
SlideDistance = -0.2f,
SlideTime = 0.5f,
SlideDecelTime = 0.2f
};
((AssetBUTN)asset).BubbleSpin = true;
((AssetBUTN)asset).BubbleBowlOrBoulder = true;
((AssetBUTN)asset).CruiseBubble = true;
Expand All @@ -1245,13 +1248,15 @@ public uint PlaceTemplate(Vector3 position, int layerIndex, out bool success, re
((AssetBUTN)asset).ActMethod = AssetBUTN.ButnActMethod.PressurePlate;
((AssetBUTN)asset).Model_AssetID = "plate_pressure";
((AssetBUTN)asset).PressedModel_AssetID = 0xCE7F8131;
((AssetBUTN)asset).UnknownByte6C = 4;
((AssetBUTN)asset).UnknownByte6F = 4;
((AssetBUTN)asset).UnknownByte70 = 2;
((AssetBUTN)asset).UnknownByte71 = 1;
((AssetBUTN)asset).UnknownByte72 = 1;
((AssetBUTN)asset).PressedOffset = -0.15f;
((AssetBUTN)asset).TransitionTime = 0.15f;
((AssetBUTN)asset).Motion = new Motion_Mechanism()
{
Flags = 4,
MovementMode = 2,
MovementLoopMode = 1,
SlideAxis = 1,
SlideDistance = -0.15f,
SlideTime = 0.15f,
};
((AssetBUTN)asset).PlayerOnPressurePlate = true;
((AssetBUTN)asset).AnyThrowableOnPressurePlate = true;
((AssetBUTN)asset).ThrowFruitOnPressurePlate = true;
Expand All @@ -1276,7 +1281,8 @@ public uint PlaceTemplate(Vector3 position, int layerIndex, out bool success, re
case AssetTemplate.Swinger_PLAT:
((AssetPLAT)asset).AssetType = ObjectAssetType.PLAT;
((AssetPLAT)asset).Model_AssetID = "trailer_hitch";
((AssetPLAT)asset).UnknownByte_90 = 4;
((AssetPLAT)asset).PlatSpecific = new PlatSpecific_Generic();
((AssetPLAT)asset).Motion = new Motion_Mechanism();
break;
case AssetTemplate.EnemyAreaMVPT:
((AssetMVPT_Scooby)asset).AssetType = ObjectAssetType.MVPT;
Expand Down Expand Up @@ -1390,14 +1396,11 @@ public uint PlaceTemplate(Vector3 position, int layerIndex, out bool success, re
((AssetCAM)asset).OffsetEndFrames = 45;
((AssetCAM)asset).FieldOfView = 60f;
((AssetCAM)asset).TransitionTime = 0.5f;
((AssetCAM)asset).UnknownFloat64 = -2f;
((AssetCAM)asset).UnknownFloat68 = 1f;
((AssetCAM)asset).UnknownFloat6C = 1f;
((AssetCAM)asset).Flags1 = 00;
((AssetCAM)asset).Flags2 = 01;
((AssetCAM)asset).Flags3 = 01;
((AssetCAM)asset).Flags4 = 0x8F;
((AssetCAM)asset).CamType = 2;
((AssetCAM)asset).CamType = CamType.Static;
break;
case AssetTemplate.BusStop_BusSimp:
((AssetSIMP)asset).AssetType = ObjectAssetType.SIMP;
Expand Down Expand Up @@ -1529,11 +1532,17 @@ public uint PlaceTemplate(Vector3 position, int layerIndex, out bool success, re
((AssetPLAT)asset).PlatformType = PlatType.Springboard;
((AssetPLAT)asset).PlatformSubtype = PlatTypeSpecific.Springboard;
((AssetPLAT)asset).CollisionType = 4;
((AssetPLAT)asset).Float58 = 10;
((AssetPLAT)asset).ANIM_AssetID_1 = 0x6DAE0759;
((AssetPLAT)asset).ANIM_AssetID_2 = 0xBC4A9A5F;
((AssetPLAT)asset).LaunchDirectionY = 1;
((AssetPLAT)asset).UnknownByte_90 = 6;
((AssetPLAT)asset).PlatSpecific = new PlatSpecific_Springboard()
{
Height1 = 10,
Height2 = 10,
Height3 = 10,
HeightBubbleBounce = 10,
Anim1_AssetID = 0x6DAE0759,
Anim2_AssetID = 0xBC4A9A5F,
DirectionY = 1f,
};
((AssetPLAT)asset).Motion = new Motion() { Type = MotionType.Other };
break;
case AssetTemplate.HoveringPlatform:
((AssetPLAT)asset).AssetType = ObjectAssetType.PLAT;
Expand All @@ -1542,10 +1551,12 @@ public uint PlaceTemplate(Vector3 position, int layerIndex, out bool success, re
((AssetPLAT)asset).PlatformType = PlatType.Mechanism;
((AssetPLAT)asset).PlatformSubtype = PlatTypeSpecific.Mechanism;
((AssetPLAT)asset).CollisionType = 4;
((AssetPLAT)asset).UnknownByte_90 = 6;
((AssetPLAT)asset).MovementLoopType = 1;
((AssetPLAT)asset).MovementTranslation_EaseEnd = 0.4f;
((AssetPLAT)asset).MovementTranslation_EaseStart = 0.4f;
((AssetPLAT)asset).Motion = new Motion_Mechanism() {
Type = MotionType.Other,
MovementLoopMode = 1,
SlideAccelTime = 0.4f,
SlideDecelTime = 0.4f
};
break;
case AssetTemplate.BungeeHook:
((AssetDYNA)asset).Version = 13;
Expand Down
4 changes: 2 additions & 2 deletions IndustrialPark/ArchiveEditor/Dialogs/ScrollableMessageBox.Designer.cs
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

30 changes: 14 additions & 16 deletions IndustrialPark/ArchiveEditor/InternalEditors/InternalAssetEditor.Designer.cs
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 5805f2b

Please sign in to comment.