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

temp remove sorting for one object

Browse Source
This commit is contained in:
Matvey Cherevko
2015-02-26 23:55:08 +06:00
parent 980e4a92cf
commit d97e8e1b50
10 changed files with 29673 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Assembly-CSharp-vs.csproj
View File

@@ -46,6 +46,7 @@
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="Assets\IsoTools\Examples\Scripts\CircleFlyCamera.cs" />
<Compile Include="Assets\IsoTools\Examples\Scripts\IsoAutoController.cs" />
<Compile Include="Assets\IsoTools\Examples\Scripts\IsoController.cs" />
<Compile Include="Assets\IsoTools\Scripts\IsoObject.cs" />

1
Assembly-CSharp.csproj
View File

@@ -46,6 +46,7 @@
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="Assets\IsoTools\Examples\Scripts\CircleFlyCamera.cs" />
<Compile Include="Assets\IsoTools\Examples\Scripts\IsoAutoController.cs" />
<Compile Include="Assets\IsoTools\Examples\Scripts\IsoController.cs" />
<Compile Include="Assets\IsoTools\Scripts\IsoObject.cs" />

29661
Assets/IsoTools/Examples/Scenes/Scene4.unity
View File

File diff suppressed because it is too large Load Diff

24
Assets/IsoTools/Examples/Scripts/CircleFlyCamera.cs Normal file
View File

@@ -0,0 +1,24 @@
using UnityEngine;
using System.Collections;
public class CircleFlyCamera : MonoBehaviour {
public float FlyRadius = 150.0f;
public float FlySpeed = 1.0f;
Vector3 _start_pos;
float _fly_timer;
void Start() {
_start_pos = transform.position;
_fly_timer = 0.0f;
}
void Update () {
_fly_timer += FlySpeed * Time.deltaTime;
transform.position = new Vector3(
_start_pos.x + Mathf.Cos(_fly_timer) * FlyRadius,
_start_pos.y + Mathf.Sin(_fly_timer) * FlyRadius,
_start_pos.z);
}
}

12
Assets/IsoTools/Examples/Scripts/CircleFlyCamera.cs.meta Normal file
View File

@@ -0,0 +1,12 @@
fileFormatVersion: 2
guid: 28c0a5afc26a545b0be63d03f8b3d8f3
timeCreated: 1424879906
licenseType: Pro
MonoImporter:
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

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

@@ -9,11 +9,11 @@ namespace IsoTools {
public class IsoObject : MonoBehaviour {
#if UNITY_EDITOR
Vector2 _lastTransform = Vector2.zero;
Vector3 _lastPosition = Vector3.zero;
Vector3 _lastSize = Vector3.zero;
bool _lastSorting = false;
bool _lastAlignment = false;
Vector2 _lastTransform = Vector2.zero;
Vector3 _lastPosition = Vector3.zero;
Vector3 _lastSize = Vector3.zero;
bool _lastSorting = false;
bool _lastAlignment = false;
#endif
[SerializeField]
@@ -117,9 +117,7 @@ namespace IsoTools {
}
void MartDirtyIsoWorld() {
if ( Sorting ) {
IsoWorld.MarkDirty(this);
}
IsoWorld.MarkDirty(this);
}
void MarkEditorObjectDirty() {

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

@@ -30,13 +30,11 @@ namespace IsoTools {
}
}
bool _dirty = true;
HashSet<IsoObject> _dirtyObjects = new HashSet<IsoObject>();
TileTypes _lastTileType = TileTypes.Isometric;
float _lastTileSize = 0.0f;
float _lastMinDepth = 0.0f;
float _lastMaxDepth = 0.0f;
bool _dirty = true;
TileTypes _lastTileType = TileTypes.Isometric;
float _lastTileSize = 0.0f;
float _lastMinDepth = 0.0f;
float _lastMaxDepth = 0.0f;
[SerializeField]
public TileTypes _tileType = TileTypes.Isometric;
@@ -98,9 +96,8 @@ namespace IsoTools {
/// <param name="obj">Isometric object for resorting.</param>
// ------------------------------------------------------------------------
public void MarkDirty(IsoObject obj) {
_dirtyObjects.Add(obj);
if ( !_dirty ) {
//ManualSort(obj, Scan)
if ( obj && obj.Sorting ) {
_dirty = true;
}
}
@@ -244,34 +241,6 @@ namespace IsoTools {
}
}
void ManualSort(IsoObject obj, IList<ObjectInfo> objects) {
var min_depth = float.MinValue;
foreach ( var obj_b in objects ) {
if ( IsDepends(obj, obj_b.IsoObject) ) {
min_depth = Mathf.Max(min_depth, obj_b.IsoObject.transform.position.z);
}
}
var max_depth = float.MaxValue;
foreach ( var obj_a in objects ) {
if ( IsDepends(obj_a.IsoObject, obj) ) {
max_depth = Mathf.Min(max_depth, obj_a.IsoObject.transform.position.z);
}
}
if ( min_depth == float.MinValue ) {
min_depth = MinDepth;
}
if ( max_depth == float.MaxValue ) {
max_depth = MaxDepth;
}
//TODO: magic number
var min_depth_step = 0.01f;
if ( max_depth < min_depth || Mathf.Abs(max_depth - min_depth) < min_depth_step ) {
MarkDirty();
} else {
PlaceObject(obj, (min_depth + max_depth) / 2.0f);
}
}
void PlaceObject(IsoObject obj, float depth) {
var trans = obj.gameObject.transform;
trans.position = new Vector3(trans.position.x, trans.position.y, depth);
@@ -291,17 +260,9 @@ namespace IsoTools {
}
void StepSort() {
while ( !_dirty && _dirtyObjects.Count > 0 ) {
var objects = ScanObjects(p => p.Sorting && !_dirtyObjects.Contains(p));
var obj = _dirtyObjects.First();
ManualSort(obj, objects);
_dirtyObjects.Remove(obj);
}
if ( _dirty ) {
ManualSort(ScanObjects(p => p.Sorting));
_dirty = false;
_dirtyObjects.Clear();
Debug.Log("Resort!");
}
}

2
UnityIso-csharp.sln
View File

@@ -17,7 +17,7 @@ Global
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(MonoDevelopProperties) = preSolution
GlobalSection(MonoDevelopProperties) = preSolution
StartupItem = Assembly-CSharp.csproj
Policies = $0
$0.TextStylePolicy = $1

2
UnityIso.sln
View File

@@ -17,7 +17,7 @@ Global
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(MonoDevelopProperties) = preSolution
GlobalSection(MonoDevelopProperties) = preSolution
StartupItem = Assembly-CSharp.csproj
Policies = $0
$0.TextStylePolicy = $1

6
UnityIso.userprefs
View File

@@ -1,9 +1,9 @@
<Properties>
<MonoDevelop.Ide.Workspace ActiveConfiguration="Debug" />
<MonoDevelop.Ide.Workspace ActiveConfiguration="Debug" PreferredExecutionTarget="MonoDevelop.Default" />
<MonoDevelop.Ide.Workbench ActiveDocument="Assets/IsoTools/Scripts/IsoWorld.cs">
<Files>
<File FileName="Assets/IsoTools/Scripts/IsoWorld.cs" Line="296" Column="34" />
<File FileName="Assets/IsoTools/Scripts/IsoObject.cs" Line="147" Column="6" />
<File FileName="Assets/IsoTools/Scripts/IsoWorld.cs" Line="272" Column="4" />
<File FileName="Assets/IsoTools/Scripts/IsoObject.cs" Line="104" Column="29" />
</Files>
</MonoDevelop.Ide.Workbench>
<MonoDevelop.Ide.DebuggingService.Breakpoints>