Refactor

Author: nibsbin

Core/Game/Abilities/Essential/Move.cs

@@ -72,7 +72,7 @@ public bool GetFullCanCollisionStop ()
 public event Action OnStopMove;
 
 
-private LSBody cachedBody { get; set; }
+private LSBody_ cachedBody { get; set; }
 
 private Turn CachedTurn { get; set; }
 
@@ -450,7 +450,7 @@ protected override void OnStopCast ()
 
 static LSAgent tempAgent;
 
-private void HandleCollision (LSBody other)
+private void HandleCollision (LSBody_ other)
 {
 
 if (!CanMove) {

Core/Game/Abilities/Essential/Scan.cs

@@ -143,7 +143,7 @@ public virtual Vector3d[] ProjectileOffsets
 private Move cachedMove;
 private Turn cachedTurn;
 
-protected LSBody cachedBody { get { return Agent.Body; } }
+protected LSBody_ cachedBody { get { return Agent.Body; } }
 
 private int basePriority;
 private Health cachedTargetHealth;

Core/Game/Abilities/Essential/Turn.cs

@@ -10,7 +10,7 @@ public class Turn : Ability
 private Vector2d
 _turnRate = Vector2d.CreateRotation (FixedMath.One / 8);
 #endregion
-private LSBody Agent.Body;
+private LSBody_ Agent.Body;
 private bool targetReached;
 private Vector2d targetRotation;
 private long turnSin;
@@ -131,7 +131,7 @@ protected override void OnStopCast ()
 }
 
 
-private void HandleContact (LSBody other)
+private void HandleContact (LSBody_ other)
 {
 if (targetReached == true && Agent.IsCasting == false && !(Agent.Body.Immovable || Agent.Body.IsTrigger)) {
 Vector2d delta = this.Agent.Body._position - this.Agent.Body.LastPosition;

Core/Game/Agents/LSAgent.cs

@@ -104,7 +104,7 @@ public LSBusStop BusStop
 //[SerializeField]
 private UnityLSBody _unityBody;
 public UnityLSBody UnityBody {get {return _unityBody;}}
-public LSBody Body { get; set;}
+public LSBody_ Body { get; set;}
 //[SerializeField]
 private LSAnimatorBase _animator;
 public LSAnimatorBase Animator { get { return _animator; } }

Core/Game/Projectiles/LSProjectile.cs

@@ -316,7 +316,7 @@ private bool CheckCollision()
 return CheckCollision(Target.Body);
 }
 
-private bool CheckCollision(LSBody target)
+private bool CheckCollision(LSBody_ target)
 {
 return target._position.FastDistance(Position.x, Position.y) <= target.FastRadius;
 }
@@ -453,9 +453,9 @@ public void InitializeTimed(Vector2d forward)
 Direction = forward.ToVector3d();
 }
 
-Func<LSBody, bool> BodyConditional;
+Func<LSBody_, bool> BodyConditional;
 
-public void InitializeFree(Vector3d direction, Func<LSBody, bool> bodyConditional, bool useGravity = false)
+public void InitializeFree(Vector3d direction, Func<LSBody_, bool> bodyConditional, bool useGravity = false)
 {
 this.BodyConditional = bodyConditional;
 this.Direction = direction;
@@ -644,7 +644,7 @@ public void Setup(IProjectileData dataItem)
 }
 }
 
-private FastList<LSBody> HitBodies = new FastList<LSBody>();
+private FastList<LSBody_> HitBodies = new FastList<LSBody_>();
 
 public void Simulate()
 {
@@ -738,7 +738,7 @@ public void RaycastMove(Vector3d delta)
 Vector3d nextPosition = this.Position;
 nextPosition.Add(ref delta);
 HitBodies.FastClear();
-foreach (LSBody body in Raycaster.RaycastAll(this.Position, nextPosition))
+foreach (LSBody_ body in Raycaster.RaycastAll(this.Position, nextPosition))
 {
 if (this.BodyConditional(body))
 {

Core/Simulation/Grid/Influence/LSInfluencer.cs

@@ -28,7 +28,7 @@ public class LSInfluencer
 
  public GridNode LocatedNode { get; private set; }
 
- public LSBody Body { get; private set; }
+ public LSBody_ Body { get; private set; }
 
  public LSAgent Agent { get; private set; }
 

Core/Simulation/Grid/Utility/Tools/Blocker/Blocker.cs

@@ -3,7 +3,7 @@
 using Lockstep;
 
 //Blocker for static environment pieces in a scene.
-[RequireComponent (typeof (LSBody))]
+[RequireComponent (typeof (LSBody_))]
 public class Blocker : EnvironmentObject
 {
  static readonly FastList<Vector2d> bufferCoordinates = new FastList<Vector2d>();
@@ -13,13 +13,13 @@ public class Blocker : EnvironmentObject
  public bool BlockPathfinding {get {return _blockPathfinding;}}
 
 
- public LSBody CachedBody {get; private set;}
+ public LSBody_ CachedBody {get; private set;}
 
  protected override void OnLateInitialize()
  {
  base.OnInitialize();
 
- CachedBody = this.GetComponent<LSBody> ();
+ CachedBody = this.GetComponent<LSBody_> ();
 
  if (this.BlockPathfinding) {
  const long gridSpacing = FixedMath.One;

Core/Simulation/Grid/Utility/Tools/Blocker/DynamicBlocker.cs

@@ -9,7 +9,7 @@ public class DynamicBlocker : Ability
  {
  static readonly FastList<Vector2d> bufferCoordinates = new FastList<Vector2d>();
 
- LSBody CachedBody;
+ LSBody_ CachedBody;
 
  protected override void OnInitialize()
  {

Core/Simulation/Physics/Core/CollisionPair.cs

@@ -11,8 +11,8 @@ namespace Lockstep
 {
 public class CollisionPair
 {
-public LSBody Body1;
-public LSBody Body2;
+public LSBody_ Body1;
+public LSBody_ Body2;
 private long CacheSqrDistance;
 private CollisionType LeCollisionType;
 private bool DoPhysics = true;
@@ -41,7 +41,7 @@ public bool IsColliding {
 
 bool IsValid { get; set; }
 
-public void Initialize(LSBody b1, LSBody b2)
+public void Initialize(LSBody_ b1, LSBody_ b2)
 {
 IsValid = true;
 if (!IsValid)
@@ -259,7 +259,7 @@ private void DistributeCollision()
 
 }
 
-void DistributeCircle_Poly(LSBody circle, LSBody poly)
+void DistributeCircle_Poly(LSBody_ circle, LSBody_ poly)
 {
 Vector2d edgeAxis = ClosestAxis.rotatedRight;
 long horProjection = circle._position.Dot(edgeAxis.x, edgeAxis.y);
@@ -469,7 +469,7 @@ public bool CheckBox()
 return false;
 }
 
-public static bool CheckBox_Poly(LSBody box, LSBody poly)
+public static bool CheckBox_Poly(LSBody_ box, LSBody_ poly)
 {
 bool Right = poly._position.x > box._position.x;
 bool Top = poly._position.y > box._position.y;
@@ -525,7 +525,7 @@ public static bool CheckBox_Poly(LSBody box, LSBody poly)
 private static long ClosestAxisProjection;
 
 
-public static bool CheckCircle_Poly(LSBody circle, LSBody poly)
+public static bool CheckCircle_Poly(LSBody_ circle, LSBody_ poly)
 {
 int EdgeCount = poly.EdgeNorms.Length;
 ClosestDist = long.MaxValue;
@@ -577,7 +577,7 @@ public static bool CheckCircle_Poly(LSBody circle, LSBody poly)
 static bool Collided;
 static long xAbs, yAbs;
 
-public void DistributeCircle_Box(LSBody box, LSBody circle)
+public void DistributeCircle_Box(LSBody_ box, LSBody_ circle)
 {
 xMore = circle._position.x > box._position.x;
 yMore = circle._position.y > box._position.y;
@@ -646,7 +646,7 @@ public void DistributeCircle_Box(LSBody box, LSBody circle)
 circle.BuildBounds();
 }
 
-public static bool CheckCircle_Box(LSBody box, LSBody circle)
+public static bool CheckCircle_Box(LSBody_ box, LSBody_ circle)
 {
 Collided = false;
 
@@ -714,7 +714,7 @@ public static bool CheckCircle_Box(LSBody box, LSBody circle)
 return Collided;
 }
 
-public static bool CheckPoly_Poly(LSBody poly1, LSBody poly2)
+public static bool CheckPoly_Poly(LSBody_ poly1, LSBody_ poly2)
 {
 int Poly1EdgeCount = poly1.EdgeNorms.Length;
 int EdgeCount = Poly1EdgeCount + poly2.EdgeNorms.Length;
@@ -743,7 +743,7 @@ public static bool CheckPoly_Poly(LSBody poly1, LSBody poly2)
 return true;
 }
 
-public static void ProjectPolygon(long AxisX, long AxisY, LSBody Poly, out long Min, out long Max)
+public static void ProjectPolygon(long AxisX, long AxisY, LSBody_ Poly, out long Min, out long Max)
 {
 Min = Poly.RealPoints[0].Dot(AxisX, AxisY);
 Max = Min;

Core/Simulation/Physics/Core/Editor/EditorLSBody.cs

@@ -166,7 +166,7 @@ void OnSceneGUI()
  if (shape == ColliderType.None)
  return;
  Handles.color = Color.blue;
-LSBody Body = ((UnityLSBody)target).InternalBody;
+LSBody_ Body = ((UnityLSBody)target).InternalBody;
 Transform transform = ((UnityLSBody)target).transform;
  Vector3 targetPos = transform.position;
  const int ImprecisionLimit = 100000;