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

IsoWorld static instance

Browse Source
This commit is contained in:
Matvey Cherevko
2016-04-17 19:20:43 +06:00
parent 8d5a177eb1
commit 7c22b52489
4 changed files with 24 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Assets/IsoTools/Scripts/Internal/Editor/IsoObjectEditor.cs
View File

@@ -13,7 +13,7 @@ namespace IsoTools.Internal {
Vector3 _viewCenter = Vector3.zero; Vector3 _viewCenter = Vector3.zero;
void GrabPositions() { void GrabPositions() {
var iso_world = GameObject.FindObjectOfType<IsoWorld>(); var iso_world = IsoWorld.Instance;
if ( iso_world ) { if ( iso_world ) {
_positions = targets _positions = targets
.Where(p => p is IsoObject) .Where(p => p is IsoObject)
@@ -97,7 +97,7 @@ namespace IsoTools.Internal {
} }
void ZMoveSlider() { void ZMoveSlider() {
var iso_world = GameObject.FindObjectOfType<IsoWorld>(); var iso_world = IsoWorld.Instance;
if ( iso_world ) { if ( iso_world ) {
Handles.color = Handles.zAxisColor; Handles.color = Handles.zAxisColor;
var delta = Handles.Slider(_viewCenter, IsoUtils.vec3OneY) - _viewCenter; var delta = Handles.Slider(_viewCenter, IsoUtils.vec3OneY) - _viewCenter;
@@ -109,7 +109,7 @@ namespace IsoTools.Internal {
} }
void XYMoveSlider(Color color, Vector3 dir) { void XYMoveSlider(Color color, Vector3 dir) {
var iso_world = GameObject.FindObjectOfType<IsoWorld>(); var iso_world = IsoWorld.Instance;
if ( iso_world ) { if ( iso_world ) {
Handles.color = color; Handles.color = color;
var delta = Handles.Slider(_viewCenter, iso_world.IsoToScreen(dir)) - _viewCenter; var delta = Handles.Slider(_viewCenter, iso_world.IsoToScreen(dir)) - _viewCenter;

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

@@ -238,13 +238,11 @@ namespace IsoTools {
// //
// --------------------------------------------------------------------- // ---------------------------------------------------------------------
IsoWorld _isoWorld = null;
public IsoWorld isoWorld { public IsoWorld isoWorld {
get { get {
if ( !_isoWorld && gameObject.activeInHierarchy ) { return gameObject.activeInHierarchy
_isoWorld = GameObject.FindObjectOfType<IsoWorld>(); ? IsoWorld.Instance
} : null;
return _isoWorld;
} }
} }

17
Assets/IsoTools/Scripts/IsoWorld.cs
View File

@@ -10,6 +10,8 @@ namespace IsoTools {
[ExecuteInEditMode, DisallowMultipleComponent] [ExecuteInEditMode, DisallowMultipleComponent]
public class IsoWorld : MonoBehaviour { public class IsoWorld : MonoBehaviour {
static IsoWorld _instance = null;
bool _dirty = false; bool _dirty = false;
IsoAssocList<IsoObject> _objects = new IsoAssocList<IsoObject>(); IsoAssocList<IsoObject> _objects = new IsoAssocList<IsoObject>();
IsoAssocList<IsoObject> _visibles = new IsoAssocList<IsoObject>(); IsoAssocList<IsoObject> _visibles = new IsoAssocList<IsoObject>();
@@ -129,6 +131,21 @@ namespace IsoTools {
} }
} }
// ---------------------------------------------------------------------
//
// Instance
//
// ---------------------------------------------------------------------
public static IsoWorld Instance {
get {
if ( !_instance ) {
_instance = GameObject.FindObjectOfType<IsoWorld>();
}
return _instance;
}
}
// --------------------------------------------------------------------- // ---------------------------------------------------------------------
// //
// IsoToScreen/ScreenToIso // IsoToScreen/ScreenToIso

2
Assets/IsoTools/Tiled/Internal/Editor/TiledMapAssetEditor.cs
View File

@@ -144,7 +144,7 @@ namespace IsoTools.Tiled.Internal {
} }
IsoWorld GetIsoWorld() { IsoWorld GetIsoWorld() {
var iso_world = GameObject.FindObjectOfType<IsoWorld>(); var iso_world = IsoWorld.Instance;
if ( !iso_world ) { if ( !iso_world ) {
throw new UnityException("not found IsoWorld"); throw new UnityException("not found IsoWorld");
} }