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

fix OOM bug

Browse Source
This commit is contained in:
Matvey Cherevko
2016-03-21 20:45:57 +06:00
parent be4ca04e3b
commit 4811872cad
3 changed files with 38 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -457,36 +457,43 @@ namespace IsoTools {
_sectorsSize += IsoUtils.Vec2MaxF(iso_internal.ScreenRect.size); _sectorsSize += IsoUtils.Vec2MaxF(iso_internal.ScreenRect.size);
} }
var min_sector_size = IsoToScreen(IsoUtils.vec3OneX).x - IsoToScreen(Vector3.zero).x; var min_sector_size = IsoToScreen(IsoUtils.vec3OneX).x - IsoToScreen(Vector3.zero).x;
_sectorsSize = Mathf.Round(Mathf.Max(min_sector_size, _sectorsSize / _visibles.Count)); _sectorsSize = _visibles.Count > 0
? Mathf.Round(Mathf.Max(min_sector_size, _sectorsSize / _visibles.Count))
: min_sector_size;
} }
void SetupObjectsSectors() { void SetupObjectsSectors() {
_sectorsMinNumPos = new Vector2(float.MaxValue, float.MaxValue); if ( _visibles.Count > 0 ) {
_sectorsMaxNumPos = new Vector2(float.MinValue, float.MinValue); _sectorsMinNumPos = new Vector2(float.MaxValue, float.MaxValue);
for ( int i = 0, e = _visibles.Count; i < e; ++i ) { _sectorsMaxNumPos = new Vector2(float.MinValue, float.MinValue);
var iso_internal = _visibles[i].Internal; for ( int i = 0, e = _visibles.Count; i < e; ++i ) {
var iso_internal = _visibles[i].Internal;
// high performance tricks // high performance tricks
var min_x = iso_internal.ScreenRect.xMin / _sectorsSize; var min_x = iso_internal.ScreenRect.xMin / _sectorsSize;
var min_y = iso_internal.ScreenRect.yMin / _sectorsSize; var min_y = iso_internal.ScreenRect.yMin / _sectorsSize;
var max_x = iso_internal.ScreenRect.xMax / _sectorsSize; var max_x = iso_internal.ScreenRect.xMax / _sectorsSize;
var max_y = iso_internal.ScreenRect.yMax / _sectorsSize; var max_y = iso_internal.ScreenRect.yMax / _sectorsSize;
iso_internal.MinSector.x = (int)(min_x >= 0.0F ? min_x : min_x - 1.0F); iso_internal.MinSector.x = (int)(min_x >= 0.0F ? min_x : min_x - 1.0F);
iso_internal.MinSector.y = (int)(min_y >= 0.0F ? min_y : min_y - 1.0F); iso_internal.MinSector.y = (int)(min_y >= 0.0F ? min_y : min_y - 1.0F);
iso_internal.MaxSector.x = (int)(max_x >= 0.0F ? max_x + 1.0F : max_x); iso_internal.MaxSector.x = (int)(max_x >= 0.0F ? max_x + 1.0F : max_x);
iso_internal.MaxSector.y = (int)(max_y >= 0.0F ? max_y + 1.0F : max_y); iso_internal.MaxSector.y = (int)(max_y >= 0.0F ? max_y + 1.0F : max_y);
if ( _sectorsMinNumPos.x > iso_internal.MinSector.x ) { if ( _sectorsMinNumPos.x > iso_internal.MinSector.x ) {
_sectorsMinNumPos.x = iso_internal.MinSector.x; _sectorsMinNumPos.x = iso_internal.MinSector.x;
} }
if ( _sectorsMinNumPos.y > iso_internal.MinSector.y ) { if ( _sectorsMinNumPos.y > iso_internal.MinSector.y ) {
_sectorsMinNumPos.y = iso_internal.MinSector.y; _sectorsMinNumPos.y = iso_internal.MinSector.y;
} }
if ( _sectorsMaxNumPos.x < iso_internal.MaxSector.x ) { if ( _sectorsMaxNumPos.x < iso_internal.MaxSector.x ) {
_sectorsMaxNumPos.x = iso_internal.MaxSector.x; _sectorsMaxNumPos.x = iso_internal.MaxSector.x;
} }
if ( _sectorsMaxNumPos.y < iso_internal.MaxSector.y ) { if ( _sectorsMaxNumPos.y < iso_internal.MaxSector.y ) {
_sectorsMaxNumPos.y = iso_internal.MaxSector.y; _sectorsMaxNumPos.y = iso_internal.MaxSector.y;
}
} }
} else {
_sectorsMinNumPos = Vector2.zero;
_sectorsMaxNumPos = new Vector2(_sectorsSize, _sectorsSize);
} }
_sectorsNumPosCount = _sectorsMaxNumPos - _sectorsMinNumPos; _sectorsNumPosCount = _sectorsMaxNumPos - _sectorsMinNumPos;
} }

2
ProjectSettings/ProjectSettings.asset
View File

@@ -436,7 +436,7 @@ PlayerSettings:
WebGL::memorySize: 256 WebGL::memorySize: 256
iOS::Architecture: 0 iOS::Architecture: 0
iOS::EnableIncrementalBuildSupportForIl2cpp: 1 iOS::EnableIncrementalBuildSupportForIl2cpp: 1
iOS::ScriptingBackend: 0 iOS::ScriptingBackend: 1
tvOS::Architecture: 1 tvOS::Architecture: 1
tvOS::EnableIncrementalBuildSupportForIl2cpp: 0 tvOS::EnableIncrementalBuildSupportForIl2cpp: 0
tvOS::ScriptingBackend: 1 tvOS::ScriptingBackend: 1

10
UnityIso.userprefs
View File

@@ -1,14 +1,14 @@
<Properties StartupItem="Assembly-CSharp.csproj"> <Properties StartupItem="Assembly-CSharp.csproj">
<MonoDevelop.Ide.Workspace ActiveConfiguration="Debug" PreferredExecutionTarget="Unity.Instance.Unity Editor" /> <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug" PreferredExecutionTarget="Unity.Instance.Unity Editor" />
<MonoDevelop.Ide.Workbench ActiveDocument="Assets/IsoTools/Tiled/TiledMap.cs"> <MonoDevelop.Ide.Workbench ActiveDocument="Assets/IsoTools/Scripts/IsoWorld.cs">
<Files> <Files>
<File FileName="Assets/IsoTools/Tiled/Internal/Editor/TiledMapPostprocessor.cs" Line="147" Column="38" /> <File FileName="Assets/IsoTools/Scripts/IsoWorld.cs" Line="462" Column="64" />
<File FileName="Assets/IsoTools/Tiled/TiledMapTileset.cs" Line="17" Column="1" />
<File FileName="Assets/IsoTools/Tiled/TiledMap.cs" Line="31" Column="3" />
</Files> </Files>
</MonoDevelop.Ide.Workbench> </MonoDevelop.Ide.Workbench>
<MonoDevelop.Ide.DebuggingService.Breakpoints> <MonoDevelop.Ide.DebuggingService.Breakpoints>
<BreakpointStore /> <BreakpointStore>
<Breakpoint file="/Users/matov/Projects/UnityIso/Assets/IsoTools/Scripts/IsoWorld.cs" line="563" column="1" />
</BreakpointStore>
</MonoDevelop.Ide.DebuggingService.Breakpoints> </MonoDevelop.Ide.DebuggingService.Breakpoints>
<MonoDevelop.Ide.DebuggingService.PinnedWatches /> <MonoDevelop.Ide.DebuggingService.PinnedWatches />
</Properties> </Properties>