Skip to content

Commit fee5310

Browse files
FritzsHeroFritzsHero
committed
Removed FormerlySerializedAs update code
1 parent 1ec007d commit fee5310

21 files changed

+2
-553
lines changed

‎CHANGELOG.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
55
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
66

77

8-
## [Version: x.x.x] - xxxx.xx.xx
8+
## [Version: 3.0.0] - 2023.09.14
99
### Improvements
10+
- Removed FormerlySerializedAs update code
1011

1112

1213
## [Version: 2.5.0] - 2023.09.14

‎Scripts/EdgeObjectMaker.cs

Lines changed: 0 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -12,117 +12,75 @@ namespace RoadArchitect.EdgeObjects
1212
public class EdgeObjectMaker
1313
{
1414
#region "Vars"
15-
[UnityEngine.Serialization.FormerlySerializedAs("bNeedsUpdate")]
1615
public bool isRequiringUpdate = false;
1716
public string UID = "";
18-
[UnityEngine.Serialization.FormerlySerializedAs("tNode")]
1917
public SplineN node = null;
20-
[UnityEngine.Serialization.FormerlySerializedAs("bIsGSD")]
2118
public bool isDefault = false;
22-
[UnityEngine.Serialization.FormerlySerializedAs("EdgeObject")]
2319
public GameObject edgeObject = null;
24-
[UnityEngine.Serialization.FormerlySerializedAs("EdgeObjectString")]
2520
public string edgeObjectString = "";
26-
[UnityEngine.Serialization.FormerlySerializedAs("bMaterialOverride")]
2721
public bool isMaterialOverriden = false;
28-
[UnityEngine.Serialization.FormerlySerializedAs("EdgeMaterial1")]
2922
public Material edgeMaterial1 = null;
30-
[UnityEngine.Serialization.FormerlySerializedAs("EdgeMaterial2")]
3123
public Material edgeMaterial2 = null;
32-
[UnityEngine.Serialization.FormerlySerializedAs("EdgeMaterial1String")]
3324
public string edgeMaterial1String = null;
34-
[UnityEngine.Serialization.FormerlySerializedAs("EdgeMaterial2String")]
3525
public string edgeMaterial2String = null;
36-
[UnityEngine.Serialization.FormerlySerializedAs("bMatchTerrain")]
3726
public bool isMatchingTerrain = true;
3827

39-
[UnityEngine.Serialization.FormerlySerializedAs("bCombineMesh")]
4028
public bool isCombinedMesh = false;
41-
[UnityEngine.Serialization.FormerlySerializedAs("bCombineMeshCollider")]
4229
public bool isCombinedMeshCollider = false;
43-
[UnityEngine.Serialization.FormerlySerializedAs("MasterObj")]
4430
public GameObject masterObject = null;
45-
[UnityEngine.Serialization.FormerlySerializedAs("EdgeObjectLocations")]
4631
public List<Vector3> edgeObjectLocations;
47-
[UnityEngine.Serialization.FormerlySerializedAs("EdgeObjectRotations")]
4832
public List<Vector3> edgeObjectRotations;
49-
[UnityEngine.Serialization.FormerlySerializedAs("EdgeObjects")]
5033
public List<GameObject> edgeObjects;
51-
[UnityEngine.Serialization.FormerlySerializedAs("SubType")]
5234
public SignPlacementSubTypeEnum subType = SignPlacementSubTypeEnum.Right;
53-
[UnityEngine.Serialization.FormerlySerializedAs("MeterSep")]
5435
public float meterSep = 5f;
55-
[UnityEngine.Serialization.FormerlySerializedAs("bToggle")]
5636
public bool isToggled = false;
57-
[UnityEngine.Serialization.FormerlySerializedAs("bIsBridge")]
5837
public bool isBridge = false;
5938

6039

6140
#region "Horizontal offsets"
62-
[UnityEngine.Serialization.FormerlySerializedAs("HorizontalSep")]
6341
public float horizontalSep = 5f;
64-
[UnityEngine.Serialization.FormerlySerializedAs("HorizontalCurve")]
6542
public AnimationCurve horizontalCurve;
6643
#endregion
6744

6845

6946
#region "Vertical offsets"
70-
[UnityEngine.Serialization.FormerlySerializedAs("VerticalRaise")]
7147
public float verticalRaise = 0f;
72-
[UnityEngine.Serialization.FormerlySerializedAs("VerticalCurve")]
7348
public AnimationCurve verticalCurve;
7449
#endregion
7550

7651

7752
// Custom Rotation
78-
[UnityEngine.Serialization.FormerlySerializedAs("CustomRotation")]
7953
public Vector3 customRotation = default(Vector3);
8054
public bool isRotationAligning = true;
8155
public bool isXRotationLocked = true;
8256
public bool isYRotationLocked = false;
8357
public bool isZRotationLocked = false;
84-
[UnityEngine.Serialization.FormerlySerializedAs("bOncomingRotation")]
8558
public bool isOncomingRotation = true;
8659

8760
// EdgeObject is static
88-
[UnityEngine.Serialization.FormerlySerializedAs("bStatic")]
8961
public bool isStatic = true;
9062

9163
// The CustomScale of the EdgeObject
92-
[UnityEngine.Serialization.FormerlySerializedAs("CustomScale")]
9364
public Vector3 customScale = new Vector3(1f, 1f, 1f);
9465

9566
// Start and EndTime
96-
[UnityEngine.Serialization.FormerlySerializedAs("StartTime")]
9767
public float startTime = 0f;
98-
[UnityEngine.Serialization.FormerlySerializedAs("EndTime")]
9968
public float endTime = 1f;
10069

101-
[UnityEngine.Serialization.FormerlySerializedAs("SingleOnlyBridgePercent")]
10270
public float singleOnlyBridgePercent = 0f;
103-
[UnityEngine.Serialization.FormerlySerializedAs("StartPos")]
10471
public Vector3 startPos = default(Vector3);
105-
[UnityEngine.Serialization.FormerlySerializedAs("EndPos")]
10672
public Vector3 endPos = default(Vector3);
107-
[UnityEngine.Serialization.FormerlySerializedAs("bSingle")]
10873
public bool isSingle = false;
10974

11075
// Should it be only on a single position
111-
[UnityEngine.Serialization.FormerlySerializedAs("SinglePosition")]
11276
public float singlePosition;
113-
[UnityEngine.Serialization.FormerlySerializedAs("bStartMatchRoadDefinition")]
11477
public bool isStartMatchRoadDefinition = false;
115-
[UnityEngine.Serialization.FormerlySerializedAs("StartMatchRoadDef")]
11678
public float startMatchRoadDef = 0f;
11779

11880
// EdgeObjectName
119-
[UnityEngine.Serialization.FormerlySerializedAs("tName")]
12081
public string objectName = "EdgeObject";
121-
[UnityEngine.Serialization.FormerlySerializedAs("ThumbString")]
12282
public string thumbString = "";
123-
[UnityEngine.Serialization.FormerlySerializedAs("Desc")]
12483
public string desc = "";
125-
[UnityEngine.Serialization.FormerlySerializedAs("DisplayName")]
12684
public string displayName = "";
12785
#endregion
12886

@@ -376,81 +334,49 @@ private void SaveMesh(Mesh _mesh, bool _isCollider)
376334
public class EdgeObjectLibraryMaker
377335
{
378336
#region "Vars"
379-
[UnityEngine.Serialization.FormerlySerializedAs("EdgeObjectString")]
380337
public string edgeObjectString = "";
381-
[UnityEngine.Serialization.FormerlySerializedAs("bCombineMesh")]
382338
public bool isCombinedMesh = false;
383-
[UnityEngine.Serialization.FormerlySerializedAs("bCombineMeshCollider")]
384339
public bool isCombinedMeshCollider = false;
385-
[UnityEngine.Serialization.FormerlySerializedAs("EdgeObjectLocations")]
386340
public List<Vector3> edgeObjectLocations;
387-
[UnityEngine.Serialization.FormerlySerializedAs("EdgeObjectRotations")]
388341
public List<Vector3> edgeObjectRotations;
389-
[UnityEngine.Serialization.FormerlySerializedAs("SubType")]
390342
public SignPlacementSubTypeEnum subType = SignPlacementSubTypeEnum.Right;
391-
[UnityEngine.Serialization.FormerlySerializedAs("MeterSep")]
392343
public float meterSep = 5f;
393-
[UnityEngine.Serialization.FormerlySerializedAs("bToggle")]
394344
public bool isToggled = false;
395-
[UnityEngine.Serialization.FormerlySerializedAs("bIsBridge")]
396345
public bool isBridge = false;
397-
[UnityEngine.Serialization.FormerlySerializedAs("bIsGSD")]
398346
public bool isDefault = false;
399-
[UnityEngine.Serialization.FormerlySerializedAs("bOncomingRotation")]
400347
public bool isOncomingRotation = true;
401-
[UnityEngine.Serialization.FormerlySerializedAs("bStatic")]
402348
public bool isStatic = true;
403-
[UnityEngine.Serialization.FormerlySerializedAs("bMatchTerrain")]
404349
public bool isMatchingTerrain = true;
405-
[UnityEngine.Serialization.FormerlySerializedAs("bSingle")]
406350
public bool isSingle = false;
407351

408-
[UnityEngine.Serialization.FormerlySerializedAs("bMaterialOverride")]
409352
public bool isMaterialOverriden = false;
410-
[UnityEngine.Serialization.FormerlySerializedAs("EdgeMaterial1String")]
411353
public string edgeMaterial1String = "";
412-
[UnityEngine.Serialization.FormerlySerializedAs("EdgeMaterial2String")]
413354
public string edgeMaterial2String = "";
414355

415356
//Horizontal offsets:
416-
[UnityEngine.Serialization.FormerlySerializedAs("HorizontalSep")]
417357
public float horizontalSep = 5f;
418-
[UnityEngine.Serialization.FormerlySerializedAs("HorizontalCurve")]
419358
public AnimationCurve horizontalCurve;
420359
//Vertical offsets:
421-
[UnityEngine.Serialization.FormerlySerializedAs("VerticalRaise")]
422360
public float verticalRaise = 0f;
423-
[UnityEngine.Serialization.FormerlySerializedAs("VerticalCurve")]
424361
public AnimationCurve verticalCurve;
425362

426-
[UnityEngine.Serialization.FormerlySerializedAs("CustomRotation")]
427363
public Vector3 customRotation = default(Vector3);
428364
public bool isRotationAligning = true;
429365
public bool isXRotationLocked = true;
430366
public bool isYRotationLocked = false;
431367
public bool isZRotationLocked = false;
432368

433-
[UnityEngine.Serialization.FormerlySerializedAs("StartTime")]
434369
public float startTime = 0f;
435-
[UnityEngine.Serialization.FormerlySerializedAs("EndTime")]
436370
public float endTime = 1f;
437-
[UnityEngine.Serialization.FormerlySerializedAs("SingleOnlyBridgePercent")]
438371
public float singleOnlyBridgePercent = 0f;
439-
[UnityEngine.Serialization.FormerlySerializedAs("SinglePosition")]
440372
public float singlePosition;
441373

442-
[UnityEngine.Serialization.FormerlySerializedAs("bStartMatchRoadDefinition")]
443374
public bool isStartMatchingRoadDefinition = false;
444-
[UnityEngine.Serialization.FormerlySerializedAs("StartMatchRoadDef")]
445375
public float startMatchRoadDef = 0f;
446376

447-
[UnityEngine.Serialization.FormerlySerializedAs("tName")]
448377
public string objectName = "EdgeObject";
449-
[UnityEngine.Serialization.FormerlySerializedAs("ThumbString")]
450378
public string thumbString = "";
451-
[UnityEngine.Serialization.FormerlySerializedAs("Desc")]
452379
public string desc = "";
453-
[UnityEngine.Serialization.FormerlySerializedAs("DisplayName")]
454380
public string displayName = "";
455381
#endregion
456382

‎Scripts/RigidBody.cs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,9 @@ namespace RoadArchitect
77
{
88
public class RigidBody : MonoBehaviour
99
{
10-
[UnityEngine.Serialization.FormerlySerializedAsAttribute("MinCollVelocity")]
1110
public float minCollisionVelocity = 2f;
12-
//[UnityEngine.Serialization.FormerlySerializedAsAttribute("bIsForcedSleeping")]
1311
//bool isForcedSleeping = false;
14-
[UnityEngine.Serialization.FormerlySerializedAs("RB")]
1512
private Rigidbody rigidBody;
16-
//[UnityEngine.Serialization.FormerlySerializedAsAttribute("bIgnoreRB")]
1713
//bool isIgnoringRigidBody = false;
1814

1915

‎Scripts/Road.cs

Lines changed: 0 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -35,16 +35,12 @@ public enum RoadMaterialDropdownEnum
3535
[System.NonSerialized]
3636
public string editorTitleString = "";
3737

38-
[UnityEngine.Serialization.FormerlySerializedAs("GSDSpline")]
3938
public SplineC spline;
4039

4140
public int MostRecentNodeCount = -1;
42-
[UnityEngine.Serialization.FormerlySerializedAs("GSDSplineObj")]
4341
public GameObject splineObject;
44-
[UnityEngine.Serialization.FormerlySerializedAs("GSDRS")]
4542
public RoadSystem roadSystem;
4643
public SplineC[] PiggyBacks = null;
47-
[UnityEngine.Serialization.FormerlySerializedAs("bEditorProgressBar")]
4844
public bool isEditorProgressBar = false;
4945
//Unique ID
5046
public string UID;
@@ -55,78 +51,45 @@ public enum RoadMaterialDropdownEnum
5551
public bool isUpdatingSpline = false;
5652

5753
//Road editor options:
58-
[UnityEngine.Serialization.FormerlySerializedAs("opt_LaneWidth")]
5954
public float laneWidth = 5f;
60-
[UnityEngine.Serialization.FormerlySerializedAs("opt_bShouldersEnabled")]
6155
public bool isShouldersEnabled = true;
62-
[UnityEngine.Serialization.FormerlySerializedAs("opt_ShoulderWidth")]
6356
public float shoulderWidth = 3f;
64-
[UnityEngine.Serialization.FormerlySerializedAs("opt_Lanes")]
6557
public int laneAmount = 2;
66-
[UnityEngine.Serialization.FormerlySerializedAs("opt_RoadDefinition")]
6758
public float roadDefinition = 5f;
68-
[UnityEngine.Serialization.FormerlySerializedAs("opt_RoadCornerDefinition")]
6959
public bool roadCornerDefinition = false;
70-
[UnityEngine.Serialization.FormerlySerializedAs("opt_bRoadCuts")]
7160
public bool isRoadCutsEnabled = true;
72-
[UnityEngine.Serialization.FormerlySerializedAs("opt_bShoulderCuts")]
7361
public bool isShoulderCutsEnabled = true;
74-
[UnityEngine.Serialization.FormerlySerializedAs("opt_bDynamicCuts")]
7562
public bool isDynamicCutsEnabled = false;
76-
[UnityEngine.Serialization.FormerlySerializedAs("opt_bMaxGradeEnabled")]
7763
public bool isMaxGradeEnabled = true;
78-
[UnityEngine.Serialization.FormerlySerializedAs("opt_MaxGrade")]
7964
public float maxGrade = 0.08f;
80-
[UnityEngine.Serialization.FormerlySerializedAs("opt_UseDefaultMaterials")]
8165
public bool isUsingDefaultMaterials = true;
82-
[UnityEngine.Serialization.FormerlySerializedAs("opt_AutoUpdateInEditor")]
8366
public bool isAutoUpdatingInEditor = true;
8467

85-
[UnityEngine.Serialization.FormerlySerializedAs("opt_TerrainSubtract_Match")]
8668
public float matchTerrainSubtraction = 0.1f;
87-
[UnityEngine.Serialization.FormerlySerializedAs("opt_bGSDRoadRaise")]
8869
public bool isRaisingRoad = false;
8970

9071
/// <summary> Defines the width of height modification in meters </summary>
91-
[UnityEngine.Serialization.FormerlySerializedAs("opt_MatchHeightsDistance")]
9272
public float matchHeightsDistance = 50f;
93-
[UnityEngine.Serialization.FormerlySerializedAs("opt_ClearDetailsDistance")]
9473
public float clearDetailsDistance = 30f;
95-
[UnityEngine.Serialization.FormerlySerializedAs("opt_ClearDetailsDistanceHeight")]
9674
public float clearDetailsDistanceHeight = 5f;
97-
[UnityEngine.Serialization.FormerlySerializedAs("opt_ClearTreesDistance")]
9875
public float clearTreesDistance = 30f;
99-
[UnityEngine.Serialization.FormerlySerializedAs("opt_ClearTreesDistanceHeight")]
10076
public float clearTreesDistanceHeight = 50f;
10177

102-
[UnityEngine.Serialization.FormerlySerializedAs("opt_HeightModEnabled")]
10378
public bool isHeightModificationEnabled = true;
104-
[UnityEngine.Serialization.FormerlySerializedAs("opt_DetailModEnabled")]
10579
public bool isDetailModificationEnabled = true;
106-
[UnityEngine.Serialization.FormerlySerializedAs("opt_TreeModEnabled")]
10780
public bool isTreeModificationEnabled = true;
10881

109-
[UnityEngine.Serialization.FormerlySerializedAs("opt_SaveTerrainHistoryOnDisk")]
11082
public bool isSavingTerrainHistoryOnDisk = true;
111-
[UnityEngine.Serialization.FormerlySerializedAs("opt_MagnitudeThreshold")]
11283
public float magnitudeThreshold = 300f;
113-
[UnityEngine.Serialization.FormerlySerializedAs("opt_GizmosEnabled")]
11484
public bool isGizmosEnabled = true;
115-
[UnityEngine.Serialization.FormerlySerializedAs("opt_bMultithreading")]
11685
public bool isUsingMultithreading = true;
117-
[UnityEngine.Serialization.FormerlySerializedAs("opt_bSaveMeshes")]
11886
public bool isSavingMeshes = false;
119-
[UnityEngine.Serialization.FormerlySerializedAs("opt_bUseMeshColliders")]
12087
public bool isUsingMeshColliders = true;
121-
[UnityEngine.Serialization.FormerlySerializedAs("opt_bIsStatic")]
12288
public bool isStatic = false;
123-
[UnityEngine.Serialization.FormerlySerializedAs("opt_bIsLightmapped")]
12489
public bool isLightmapped = false;
125-
[UnityEngine.Serialization.FormerlySerializedAs("opt_desiredRampHeight")]
12690
public float desiredRampHeight = 0.35f;
12791

12892

129-
[UnityEngine.Serialization.FormerlySerializedAs("opt_tRoadMaterialDropdown")]
13093
public RoadMaterialDropdownEnum roadMaterialDropdown = RoadMaterialDropdownEnum.Asphalt;
13194
public RoadMaterialDropdownEnum tRoadMaterialDropdownOLD = RoadMaterialDropdownEnum.Asphalt;
13295

@@ -164,17 +127,12 @@ public enum RoadMaterialDropdownEnum
164127
[System.NonSerialized]
165128
public RoadConstructorBufferMaker RCS;
166129

167-
[UnityEngine.Serialization.FormerlySerializedAs("tName")]
168130
public string roadName = "";
169-
[UnityEngine.Serialization.FormerlySerializedAs("bProfiling")]
170131
public bool isProfiling = false;
171-
[UnityEngine.Serialization.FormerlySerializedAs("bSkipStore")]
172132
public bool isSkippingStore = true;
173133
[System.NonSerialized]
174134
public float EditorConstructionStartTime = 0f;
175-
[UnityEngine.Serialization.FormerlySerializedAs("bEditorError")]
176135
public bool isEditorError = false;
177-
[UnityEngine.Serialization.FormerlySerializedAs("tError")]
178136
public System.Exception exceptionError = null;
179137

180138

@@ -184,17 +142,13 @@ public enum RoadMaterialDropdownEnum
184142
private const int editorTimerSplineMax = 2;
185143
[System.NonSerialized]
186144
public int editorProgress = 0;
187-
[UnityEngine.Serialization.FormerlySerializedAs("GizmoNodeTimerMax")]
188145
private const int gizmoNodeTimerMax = 2;
189-
[UnityEngine.Serialization.FormerlySerializedAs("EditorUpdateMe")]
190146
public bool isUpdateRequired = false;
191-
[UnityEngine.Serialization.FormerlySerializedAs("bTriggerGC")]
192147
public bool isTriggeringGC = false;
193148
private bool isTriggeredGCExecuting;
194149
private float triggerGCEnd = 0f;
195150

196151
[System.NonSerialized]
197-
[UnityEngine.Serialization.FormerlySerializedAs("bEditorCameraMoving")]
198152
public bool isEditorCameraMoving = false;
199153
[System.NonSerialized]
200154
public float EditorCameraPos = 0f;
@@ -206,7 +160,6 @@ public enum RoadMaterialDropdownEnum
206160
private float EditorCameraIncrementDistance = 0f;
207161
private float EditorCameraIncrementDistance_Full = 0f;
208162
public float EditorCameraMetersPerSecond = 60f;
209-
[UnityEngine.Serialization.FormerlySerializedAs("bEditorCameraRotate")]
210163
public bool isEditorCameraRotated = false;
211164
private Vector3 EditorCameraV1 = default(Vector3);
212165
private Vector3 EditorCameraV2 = default(Vector3);
@@ -218,17 +171,11 @@ public enum RoadMaterialDropdownEnum
218171

219172
public List<Terraforming.TempTerrainData> EditorTTDList;
220173

221-
[UnityEngine.Serialization.FormerlySerializedAs("Editor_bIsConstructing")]
222174
public bool isEditorConstructing = false;
223-
[UnityEngine.Serialization.FormerlySerializedAs("Editor_bConstructionID")]
224175
public int editorConstructionID = 0;
225-
[UnityEngine.Serialization.FormerlySerializedAs("Editor_bSelected")]
226176
public bool isEditorSelected = false;
227-
[UnityEngine.Serialization.FormerlySerializedAs("Editor_MouseTerrainHit")]
228177
public bool isEditorMouseHittingTerrain = false;
229-
[UnityEngine.Serialization.FormerlySerializedAs("Editor_MousePos")]
230178
public Vector3 editorMousePos = new Vector3(0f, 0f, 0f);
231-
[UnityEngine.Serialization.FormerlySerializedAs("Color_NodeDefaultColor")]
232179
public Color defaultNodeColor = new Color(0f, 1f, 1f, 0.75f);
233180
/// <summary> Connection node color </summary>
234181
public readonly Color Color_NodeConnColor = new Color(0f, 1f, 0f, 0.75f);

0 commit comments

Comments
 (0)