dynamic world tile size

This commit is contained in:
2015-01-05 16:45:37 +06:00
parent 4051641dab
commit e11032ef56
7 changed files with 514 additions and 1167 deletions

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@@ -6,6 +6,7 @@ using System.Collections;
public class IsoObject : MonoBehaviour { public class IsoObject : MonoBehaviour {
IsoWorld _iso_world = null; IsoWorld _iso_world = null;
Transform _transform = null;
Vector3 _lastPosition = Vector3.zero; Vector3 _lastPosition = Vector3.zero;
Vector3 _lastTransform = Vector3.zero; Vector3 _lastTransform = Vector3.zero;
@@ -14,56 +15,98 @@ public class IsoObject : MonoBehaviour {
public Vector3 Position { public Vector3 Position {
get { return _position; } get { return _position; }
set { set {
if ( Alignment ) {
_position.Set(Mathf.Round(value.x), Mathf.Round(value.y), Mathf.Round(value.z));
} else {
_position = value; _position = value;
if ( Alignment ) {
FixAlignment();
} else {
FixTransform();
} }
GetIsoWorld().MarkDirty(); _iso_world.MarkDirty();
if ( Application.isEditor ) { if ( Application.isEditor ) {
EditorUtility.SetDirty(this); EditorUtility.SetDirty(this);
} }
} }
} }
public Vector3 Size = Vector3.one; [SerializeField]
public bool Alignment = true; Vector3 _size = Vector3.one;
public Vector3 Size {
void Start() { get { return _size; }
GetIsoWorld().MarkDirty(); set {
} _size = value;
if ( Alignment ) {
void Update() { FixAlignment();
if ( _lastPosition != _position ) { } else {
FixTransform(); FixTransform();
} }
if ( _lastTransform != gameObject.transform.position ) { _iso_world.MarkDirty();
FixIsoPosition(); if ( Application.isEditor ) {
EditorUtility.SetDirty(this);
}
} }
} }
IsoWorld GetIsoWorld() { [SerializeField]
if ( !_iso_world ) { bool _alignment = true;
_iso_world = GameObject.FindObjectOfType<IsoWorld>(); public bool Alignment {
get { return _alignment; }
set {
_alignment = value;
if ( Alignment ) {
FixAlignment();
} else {
FixTransform();
}
_iso_world.MarkDirty();
if ( Application.isEditor ) {
EditorUtility.SetDirty(this);
} }
if ( !_iso_world ) {
throw new UnityException("IsoObject. IsoWorld not found!");
} }
return _iso_world;
} }
void FixTransform() { public void FixAlignment() {
var pos = GetIsoWorld().IsoToScreen(Position); _position.Set(
var depth = gameObject.transform.position.z; Mathf.Round(_position.x),
var trans = new Vector3(pos.x, pos.y, depth); Mathf.Round(_position.y),
gameObject.transform.position = trans; Mathf.Round(_position.z));
FixTransform();
_iso_world.MarkDirty();
if ( Application.isEditor ) {
EditorUtility.SetDirty(this);
}
}
public void FixTransform() {
Vector3 trans = _iso_world.IsoToScreen(Position);
trans.z = _transform.position.z;
_transform.position = trans;
_lastPosition = Position; _lastPosition = Position;
_lastTransform = trans; _lastTransform = trans;
} }
void FixIsoPosition() { public void FixIsoPosition() {
var trans = gameObject.transform.position; Vector2 trans = _transform.position;
Position = GetIsoWorld().ScreenToIso(new Vector2(trans.x, trans.y), Position.z); Position = _iso_world.ScreenToIso(trans, Position.z);
FixTransform(); FixTransform();
} }
void Start() {
_iso_world = GameObject.FindObjectOfType<IsoWorld>();
if ( !_iso_world ) {
throw new UnityException("IsoObject. IsoWorld not found!");
}
_transform = gameObject.transform;
_lastPosition = Position;
_lastTransform = _transform.position;
_iso_world.MarkDirty();
}
void Update() {
if ( _lastPosition != _position ) {
Position = _position;
}
if ( _lastTransform != _transform.position ) {
FixIsoPosition();
}
}
} }

View File

@@ -27,6 +27,7 @@ public class IsoWorld : MonoBehaviour {
bool _dirty = true; bool _dirty = true;
List<int> _depends = new List<int>(); List<int> _depends = new List<int>();
List<ObjectInfo> _objects = new List<ObjectInfo>(); List<ObjectInfo> _objects = new List<ObjectInfo>();
float _lastTileSize = 0.0f;
public void MarkDirty() { public void MarkDirty() {
_dirty = true; _dirty = true;
@@ -87,6 +88,8 @@ public class IsoWorld : MonoBehaviour {
foreach ( ObjectInfo info in _objects ) { foreach ( ObjectInfo info in _objects ) {
_placeObject(info, ref depth); _placeObject(info, ref depth);
} }
_objects.Clear();
_depends.Clear();
} }
void _placeObject(IsoObject obj, float depth) { void _placeObject(IsoObject obj, float depth) {
@@ -107,7 +110,18 @@ public class IsoWorld : MonoBehaviour {
} }
} }
void Start() {
_lastTileSize = TileSize;
}
void LateUpdate() { void LateUpdate() {
if ( _lastTileSize != TileSize ) {
_scanObjects();
foreach ( var obj in _objects ) {
obj.IsoObject.FixTransform();
}
_objects.Clear();
}
if ( _dirty ) { if ( _dirty ) {
_scanObjects(); _scanObjects();
_scanDepends(); _scanDepends();

View File

@@ -1,9 +1,9 @@
<Properties> <Properties>
<MonoDevelop.Ide.Workspace ActiveConfiguration="Debug" /> <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug" PreferredExecutionTarget="MonoDevelop.Default" />
<MonoDevelop.Ide.Workbench ActiveDocument="Assets/Scripts/IsoObject.cs"> <MonoDevelop.Ide.Workbench ActiveDocument="Assets/Scripts/IsoController.cs">
<Files> <Files>
<File FileName="Assets/Scripts/IsoWorld.cs" Line="73" Column="12" /> <File FileName="Assets/Scripts/IsoWorld.cs" Line="29" Column="53" />
<File FileName="Assets/Scripts/IsoObject.cs" Line="58" Column="26" /> <File FileName="Assets/Scripts/IsoObject.cs" Line="23" Column="27" />
<File FileName="Assets/Scripts/IsoAutoController.cs" Line="33" Column="1" /> <File FileName="Assets/Scripts/IsoAutoController.cs" Line="33" Column="1" />
<File FileName="Assets/Scripts/IsoController.cs" Line="28" Column="2" /> <File FileName="Assets/Scripts/IsoController.cs" Line="28" Column="2" />
</Files> </Files>