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

remove legacy Internal_SetDirtyInEditorMode

Browse Source
This commit is contained in:
BlackMATov
2021-01-04 00:32:30 +07:00
parent cadefb411c
commit 2e2a1d7722
6 changed files with 11 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Assets/IsoTools/Scripts/Internal/IsoBehaviour.cs
View File

@@ -9,18 +9,6 @@ namespace IsoTools.Internal {
public abstract class IsoBehaviour : MonoBehaviour { public abstract class IsoBehaviour : MonoBehaviour {
static List<IsoWorld> _tempWorlds = new List<IsoWorld>(); static List<IsoWorld> _tempWorlds = new List<IsoWorld>();
// ---------------------------------------------------------------------
//
// Internal
//
// ---------------------------------------------------------------------
public void Internal_SetDirtyInEditorMode() {
#if UNITY_EDITOR && !UNITY_2019_1_OR_NEWER
EditorUtility.SetDirty(this);
#endif
}
// --------------------------------------------------------------------- // ---------------------------------------------------------------------
// //
// Protected // Protected

8
Assets/IsoTools/Scripts/Internal/IsoScreenSolver.cs
View File

@@ -208,7 +208,7 @@ namespace IsoTools.Internal {
UnregisterIsoObjectParent(iso_object); UnregisterIsoObjectParent(iso_object);
} }
public bool OnMarkDirtyIsoObject(IsoObject iso_object) { public void OnMarkDirtyIsoObject(IsoObject iso_object) {
if ( iso_object.Internal.QTItem != null ) { if ( iso_object.Internal.QTItem != null ) {
iso_object.Internal.QTItem = _quadTree.MoveItem( iso_object.Internal.QTItem = _quadTree.MoveItem(
iso_object.Internal.QTBounds, iso_object.Internal.QTBounds,
@@ -219,11 +219,7 @@ namespace IsoTools.Internal {
iso_object); iso_object);
} }
_minIsoXY = IsoUtils.Vec2Min(_minIsoXY, iso_object.position); _minIsoXY = IsoUtils.Vec2Min(_minIsoXY, iso_object.position);
if ( !iso_object.Internal.Dirty ) { iso_object.Internal.Dirty = true;
iso_object.Internal.Dirty = true;
return true;
}
return false;
} }
public void OnDrawGizmos(IsoWorld iso_world) { public void OnDrawGizmos(IsoWorld iso_world) {

6
Assets/IsoTools/Scripts/Internal/IsoSortingSolver.cs
View File

@@ -31,8 +31,7 @@ namespace IsoTools.Internal {
} }
} }
public bool OnMarkDirtyIsoObject(IsoObject iso_object) { public void OnMarkDirtyIsoObject(IsoObject iso_object) {
return false;
} }
public void OnDrawGizmos(IsoWorld iso_world) { public void OnDrawGizmos(IsoWorld iso_world) {
@@ -44,7 +43,7 @@ namespace IsoTools.Internal {
// //
// --------------------------------------------------------------------- // ---------------------------------------------------------------------
public bool StepSortingAction(IsoWorld iso_world, IsoScreenSolver screen_solver) { public void StepSortingAction(IsoWorld iso_world, IsoScreenSolver screen_solver) {
Profiler.BeginSample("IsoSortingSolver.ResolveVisibles"); Profiler.BeginSample("IsoSortingSolver.ResolveVisibles");
var dirty = ResolveVisibles(screen_solver); var dirty = ResolveVisibles(screen_solver);
Profiler.EndSample(); Profiler.EndSample();
@@ -53,7 +52,6 @@ namespace IsoTools.Internal {
PlaceVisibles(iso_world, screen_solver); PlaceVisibles(iso_world, screen_solver);
Profiler.EndSample(); Profiler.EndSample();
} }
return dirty;
} }
public void Clear() { public void Clear() {

6
Assets/IsoTools/Scripts/Internal/IsoWarningSolver.cs
View File

@@ -26,8 +26,8 @@ namespace IsoTools.Internal {
_impl.OnRemoveIsoObject(iso_object); _impl.OnRemoveIsoObject(iso_object);
} }
public bool OnMarkDirtyIsoObject(IsoObject iso_object) { public void OnMarkDirtyIsoObject(IsoObject iso_object) {
return _impl.OnMarkDirtyIsoObject(iso_object); _impl.OnMarkDirtyIsoObject(iso_object);
} }
public void OnDrawGizmos(IsoWorld iso_world) { public void OnDrawGizmos(IsoWorld iso_world) {
@@ -46,7 +46,7 @@ namespace IsoTools.Internal {
class IsoWarningSolverImpl { class IsoWarningSolverImpl {
public virtual void OnAddIsoObject(IsoObject iso_object) {} public virtual void OnAddIsoObject(IsoObject iso_object) {}
public virtual void OnRemoveIsoObject(IsoObject iso_object) {} public virtual void OnRemoveIsoObject(IsoObject iso_object) {}
public virtual bool OnMarkDirtyIsoObject(IsoObject iso_object) { return false; } public virtual void OnMarkDirtyIsoObject(IsoObject iso_object) {}
public virtual void OnDrawGizmos(IsoWorld iso_world) {} public virtual void OnDrawGizmos(IsoWorld iso_world) {}
public virtual void StepSortingAction(IsoWorld iso_world) {} public virtual void StepSortingAction(IsoWorld iso_world) {}
public virtual void Clear() {} public virtual void Clear() {}

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

@@ -269,7 +269,6 @@ namespace IsoTools {
if ( iso_world ) { if ( iso_world ) {
iso_world.Internal_MarkDirty(this); iso_world.Internal_MarkDirty(this);
} }
Internal_SetDirtyInEditorMode();
} }
// --------------------------------------------------------------------- // ---------------------------------------------------------------------

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

@@ -432,15 +432,9 @@ namespace IsoTools {
// --------------------------------------------------------------------- // ---------------------------------------------------------------------
public void Internal_MarkDirty(IsoObject iso_object) { public void Internal_MarkDirty(IsoObject iso_object) {
if ( _screenSolver.OnMarkDirtyIsoObject(iso_object) ) { _screenSolver.OnMarkDirtyIsoObject(iso_object);
Internal_SetDirtyInEditorMode(); _sortingSolver.OnMarkDirtyIsoObject(iso_object);
} _warningSolver.OnMarkDirtyIsoObject(iso_object);
if ( _sortingSolver.OnMarkDirtyIsoObject(iso_object) ) {
Internal_SetDirtyInEditorMode();
}
if ( _warningSolver.OnMarkDirtyIsoObject(iso_object) ) {
Internal_SetDirtyInEditorMode();
}
} }
public bool Internal_IsVisible(IsoObject iso_object) { public bool Internal_IsVisible(IsoObject iso_object) {
@@ -474,7 +468,6 @@ namespace IsoTools {
void ChangeSortingProperty() { void ChangeSortingProperty() {
UpdateIsoMatrix(); UpdateIsoMatrix();
FixIsoObjectTransforms(); FixIsoObjectTransforms();
Internal_SetDirtyInEditorMode();
} }
void ChangePhysicsProperty() { void ChangePhysicsProperty() {
@@ -488,9 +481,7 @@ namespace IsoTools {
void StepSortingProcess() { void StepSortingProcess() {
_screenSolver.StepSortingAction(this); _screenSolver.StepSortingAction(this);
if ( _sortingSolver.StepSortingAction(this, _screenSolver) ) { _sortingSolver.StepSortingAction(this, _screenSolver);
Internal_SetDirtyInEditorMode();
}
_warningSolver.StepSortingAction(this); _warningSolver.StepSortingAction(this);
} }
@@ -590,13 +581,6 @@ namespace IsoTools {
isShowQuadTree = _showQuadTree; isShowQuadTree = _showQuadTree;
} }
void OnRenderObject() {
var camera = Camera.current;
if ( camera && camera.name == "SceneCamera" ) {
Internal_SetDirtyInEditorMode();
}
}
void OnDrawGizmos() { void OnDrawGizmos() {
_screenSolver.OnDrawGizmos(this); _screenSolver.OnDrawGizmos(this);
_sortingSolver.OnDrawGizmos(this); _sortingSolver.OnDrawGizmos(this);