BlackMATov/unity-iso-tools
1
0
Fork 0
mirror of https://github.com/BlackMATov/unity-iso-tools.git synced 2025-12-15 01:12:05 +07:00
Code Issues Packages Projects Releases Wiki Activity

style fixes

Browse Source
This commit is contained in:
Matvey Cherevko
2016-11-27 12:32:51 +07:00
parent b3922d5cfe
commit 26b4f8e7a6
1 changed files with 17 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
Assets/IsoTools/Addons/Physics/IsoRigidbody.cs
View File

@@ -185,26 +185,10 @@ namespace IsoTools.Physics {
get { return realRigidbody ? realRigidbody.worldCenterOfMass : Vector3.zero; } get { return realRigidbody ? realRigidbody.worldCenterOfMass : Vector3.zero; }
} }
public void AddExplosionForce(
float explosion_force, Vector3 explosion_position, float explosion_radius)
{
AddExplosionForce(
explosion_force, explosion_position, explosion_radius,
0.0f, ForceMode.Force);
}
public void AddExplosionForce( public void AddExplosionForce(
float explosion_force, Vector3 explosion_position, float explosion_radius, float explosion_force, Vector3 explosion_position, float explosion_radius,
float upwards_modifier) float upwards_modifier = 0.0f,
{ ForceMode mode = ForceMode.Force)
AddExplosionForce(
explosion_force, explosion_position, explosion_radius,
upwards_modifier, ForceMode.Force);
}
public void AddExplosionForce(
float explosion_force, Vector3 explosion_position, float explosion_radius,
float upwards_modifier, ForceMode mode)
{ {
if ( realRigidbody ) { if ( realRigidbody ) {
realRigidbody.AddExplosionForce( realRigidbody.AddExplosionForce(
@@ -213,31 +197,25 @@ namespace IsoTools.Physics {
} }
} }
public void AddForce(Vector3 force) { public void AddForce(Vector3 force,
AddForce(force, ForceMode.Force); ForceMode mode = ForceMode.Force)
} {
public void AddForce(Vector3 force, ForceMode mode) {
if ( realRigidbody ) { if ( realRigidbody ) {
realRigidbody.AddForce(force, mode); realRigidbody.AddForce(force, mode);
} }
} }
public void AddForceAtPosition(Vector3 force, Vector3 position) { public void AddForceAtPosition(Vector3 force, Vector3 position,
AddForceAtPosition(force, position, ForceMode.Force); ForceMode mode = ForceMode.Force)
} {
public void AddForceAtPosition(Vector3 force, Vector3 position, ForceMode mode) {
if ( realRigidbody ) { if ( realRigidbody ) {
realRigidbody.AddForceAtPosition(force, position, mode); realRigidbody.AddForceAtPosition(force, position, mode);
} }
} }
public void AddRelativeForce(Vector3 force) {
AddRelativeForce(force, ForceMode.Force);
}
public void AddRelativeForce(Vector3 force, ForceMode mode) { public void AddRelativeForce(Vector3 force,
ForceMode mode = ForceMode.Force)
{
if ( realRigidbody ) { if ( realRigidbody ) {
realRigidbody.AddRelativeForce(force, mode); realRigidbody.AddRelativeForce(force, mode);
} }
@@ -297,17 +275,9 @@ namespace IsoTools.Physics {
} }
} }
public bool SweepTest(Vector3 direction, out IsoRaycastHit iso_hit_info) { public bool SweepTest(Vector3 direction, out IsoRaycastHit iso_hit_info,
return SweepTest(direction, out iso_hit_info, Mathf.Infinity, QueryTriggerInteraction.UseGlobal); float max_distance = Mathf.Infinity,
} QueryTriggerInteraction query_trigger_interaction = QueryTriggerInteraction.UseGlobal)
public bool SweepTest(Vector3 direction, out IsoRaycastHit iso_hit_info, float max_distance) {
return SweepTest(direction, out iso_hit_info, max_distance, QueryTriggerInteraction.UseGlobal);
}
public bool SweepTest(
Vector3 direction, out IsoRaycastHit iso_hit_info,
float max_distance, QueryTriggerInteraction query_trigger_interaction)
{ {
var hit_info = new RaycastHit(); var hit_info = new RaycastHit();
var result = realRigidbody var result = realRigidbody
@@ -317,17 +287,9 @@ namespace IsoTools.Physics {
return result; return result;
} }
public IsoRaycastHit[] SweepTestAll(Vector3 direction) { public IsoRaycastHit[] SweepTestAll(Vector3 direction,
return SweepTestAll(direction, Mathf.Infinity, QueryTriggerInteraction.UseGlobal); float max_distance = Mathf.Infinity,
} QueryTriggerInteraction query_trigger_interaction = QueryTriggerInteraction.UseGlobal)
public IsoRaycastHit[] SweepTestAll(Vector3 direction, float max_distance) {
return SweepTestAll(direction, max_distance, QueryTriggerInteraction.UseGlobal);
}
public IsoRaycastHit[] SweepTestAll(
Vector3 direction,
float max_distance, QueryTriggerInteraction query_trigger_interaction)
{ {
return realRigidbody return realRigidbody
? IsoPhysicsUtils.IsoConvertRaycastHits( ? IsoPhysicsUtils.IsoConvertRaycastHits(