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 again

Browse Source
This commit is contained in:
Matvey Cherevko
2015-07-11 18:52:36 +06:00
parent 3437fa40ce
commit ff77d077e2
16 changed files with 103 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files

96
Assets/IsoTools/Scripts/IsoObject.cs
View File

@@ -5,8 +5,7 @@ using UnityEditor;
#endif
namespace IsoTools {
[ExecuteInEditMode]
[DisallowMultipleComponent]
[ExecuteInEditMode, DisallowMultipleComponent]
public class IsoObject : MonoBehaviour {
// ------------------------------------------------------------------------
@@ -17,8 +16,7 @@ namespace IsoTools {
[SerializeField]
Vector3 _size = Vector3.one;
/// <summary>Isometric object size.</summary>
public Vector3 size {
get { return _size; }
set {
@@ -26,36 +24,30 @@ namespace IsoTools {
FixTransform();
}
}
/// <summary>Isometric object size X.</summary>
public float sizeX {
get { return size.x; }
set { size = IsoUtils.Vec3ChangeX(size, value); }
}
/// <summary>Isometric object size Y.</summary>
public float sizeY {
get { return size.y; }
set { size = IsoUtils.Vec3ChangeY(size, value); }
}
/// <summary>Isometric object size Z.</summary>
public float sizeZ {
get { return size.z; }
set { size = IsoUtils.Vec3ChangeZ(size, value); }
}
/// <summary>Isometric object size XY.</summary>
public Vector2 sizeXY {
get { return new Vector2(sizeX, sizeY); }
}
/// <summary>Isometric object size YZ.</summary>
public Vector2 sizeYZ {
get { return new Vector2(sizeY, sizeZ); }
}
/// <summary>Isometric object size XZ.</summary>
public Vector2 sizeXZ {
get { return new Vector2(sizeX, sizeZ); }
}
@@ -68,8 +60,7 @@ namespace IsoTools {
[SerializeField]
Vector3 _position = Vector3.zero;
/// <summary>Isometric object position.</summary>
public Vector3 position {
get { return _position; }
set {
@@ -77,36 +68,30 @@ namespace IsoTools {
FixTransform();
}
}
/// <summary>Isometric object position X.</summary>
public float positionX {
get { return position.x; }
set { position = IsoUtils.Vec3ChangeX(position, value); }
}
/// <summary>Isometric object position Y.</summary>
public float positionY {
get { return position.y; }
set { position = IsoUtils.Vec3ChangeY(position, value); }
}
/// <summary>Isometric object position Z.</summary>
public float positionZ {
get { return position.z; }
set { position = IsoUtils.Vec3ChangeZ(position, value); }
}
/// <summary>Isometric object position XY.</summary>
public Vector2 positionXY {
get { return new Vector2(positionX, positionY); }
}
/// <summary>Isometric object position YZ.</summary>
public Vector2 positionYZ {
get { return new Vector2(positionY, positionZ); }
}
/// <summary>Isometric object position XZ.</summary>
public Vector2 positionXZ {
get { return new Vector2(positionX, positionZ); }
}
@@ -117,41 +102,34 @@ namespace IsoTools {
//
// ------------------------------------------------------------------------
/// <summary>Isometric object tile position.</summary>
public Vector3 tilePosition {
get { return IsoUtils.Vec3Round(position); }
set { position = value; }
}
/// <summary>Isometric object tile position X.</summary>
public float tilePositionX {
get { return tilePosition.x; }
set { tilePosition = IsoUtils.Vec3ChangeX(tilePosition, value); }
}
/// <summary>Isometric object tile position Y.</summary>
public float tilePositionY {
get { return tilePosition.y; }
set { tilePosition = IsoUtils.Vec3ChangeY(tilePosition, value); }
}
/// <summary>Isometric object tile position Z.</summary>
public float tilePositionZ {
get { return tilePosition.z; }
set { tilePosition = IsoUtils.Vec3ChangeZ(tilePosition, value); }
}
/// <summary>Isometric object tile position XY.</summary>
public Vector2 tilePositionXY {
get { return new Vector2(tilePositionX, tilePositionY); }
}
/// <summary>Isometric object tile position YZ.</summary>
public Vector2 tilePositionYZ {
get { return new Vector2(tilePositionY, tilePositionZ); }
}
/// <summary>Isometric object tile position XZ.</summary>
public Vector2 tilePositionXZ {
get { return new Vector2(tilePositionX, tilePositionZ); }
}
@@ -163,9 +141,9 @@ namespace IsoTools {
// ------------------------------------------------------------------------
#if UNITY_EDITOR
Vector3 _lastSize = Vector3.zero;
Vector3 _lastPosition = Vector3.zero;
Vector2 _lastTransform = Vector2.zero;
Vector3 _lastSize = Vector3.zero;
Vector3 _lastPosition = Vector3.zero;
Vector2 _lastTransPos = Vector2.zero;
[SerializeField] bool _isAlignment = true;
[SerializeField] bool _isShowBounds = false;
@@ -204,7 +182,7 @@ namespace IsoTools {
public void FixTransform() {
#if UNITY_EDITOR
if ( Application.isEditor && !Application.isPlaying && isAlignment ) {
if ( !Application.isPlaying && isAlignment ) {
_position = tilePosition;
}
#endif
@@ -224,9 +202,9 @@ namespace IsoTools {
void FixLastProperties() {
#if UNITY_EDITOR
_lastSize = size;
_lastPosition = position;
_lastTransform = transform.position;
_lastSize = size;
_lastPosition = position;
_lastTransPos = transform.position;
#endif
}
@@ -236,12 +214,16 @@ namespace IsoTools {
void MarkEditorObjectDirty() {
#if UNITY_EDITOR
if ( Application.isEditor ) {
EditorUtility.SetDirty(this);
}
EditorUtility.SetDirty(this);
#endif
}
// ------------------------------------------------------------------------
//
// Messages
//
// ------------------------------------------------------------------------
void Awake() {
FixLastProperties();
FixIsoPosition();
@@ -263,22 +245,20 @@ namespace IsoTools {
}
void OnDrawGizmos() {
if ( isShowBounds && isoWorld ) {
if ( isShowBounds ) {
IsoUtils.DrawCube(isoWorld, position + size * 0.5f, size, Color.red);
}
}
void Update() {
if ( Application.isEditor ) {
if ( !IsoUtils.Vec3Approximately(_lastSize, _size) ) {
size = _size;
}
if ( !IsoUtils.Vec3Approximately(_lastPosition, _position) ) {
position = _position;
}
if ( !IsoUtils.Vec2Approximately(_lastTransform, transform.position) ) {
FixIsoPosition();
}
if ( !IsoUtils.Vec3Approximately(_lastSize, _size) ) {
size = _size;
}
if ( !IsoUtils.Vec3Approximately(_lastPosition, _position) ) {
position = _position;
}
if ( !IsoUtils.Vec2Approximately(_lastTransPos, transform.position) ) {
FixIsoPosition();
}
}
#endif