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

another varian partial sorting

Browse Source
This commit is contained in:
Matvey Cherevko
2015-02-24 00:24:28 +06:00
parent 71b781d0de
commit b449d7520b
23 changed files with 30482 additions and 61944 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Assets/IsoTools/Examples/Images/Cube_1x1x1.png.meta
View File

@@ -21,7 +21,7 @@ TextureImporter:
grayScaleToAlpha: 0
generateCubemap: 0
seamlessCubemap: 0
textureFormat: -1
textureFormat: -3
maxTextureSize: 1024
textureSettings:
filterMode: 0

2
Assets/IsoTools/Examples/Images/Cube_1x1x3.png.meta
View File

@@ -21,7 +21,7 @@ TextureImporter:
grayScaleToAlpha: 0
generateCubemap: 0
seamlessCubemap: 0
textureFormat: -1
textureFormat: -3
maxTextureSize: 1024
textureSettings:
filterMode: 0

2
Assets/IsoTools/Examples/Images/Cube_1x3x1.png.meta
View File

@@ -21,7 +21,7 @@ TextureImporter:
grayScaleToAlpha: 0
generateCubemap: 0
seamlessCubemap: 0
textureFormat: -1
textureFormat: -3
maxTextureSize: 1024
textureSettings:
filterMode: 0

2
Assets/IsoTools/Examples/Images/Cube_3x1x1.png.meta
View File

@@ -21,7 +21,7 @@ TextureImporter:
grayScaleToAlpha: 0
generateCubemap: 0
seamlessCubemap: 0
textureFormat: -1
textureFormat: -3
maxTextureSize: 1024
textureSettings:
filterMode: 0

2
Assets/IsoTools/Examples/Images/Floor.png.meta
View File

@@ -22,7 +22,7 @@ TextureImporter:
grayScaleToAlpha: 0
generateCubemap: 0
seamlessCubemap: 0
textureFormat: -1
textureFormat: -3
maxTextureSize: 1024
textureSettings:
filterMode: 0

2
Assets/IsoTools/Examples/Images/Floor3x3.png.meta
View File

@@ -21,7 +21,7 @@ TextureImporter:
grayScaleToAlpha: 0
generateCubemap: 0
seamlessCubemap: 0
textureFormat: -1
textureFormat: -3
maxTextureSize: 1024
textureSettings:
filterMode: 0

2
Assets/IsoTools/Examples/Images/Wall_l.png.meta
View File

@@ -22,7 +22,7 @@ TextureImporter:
grayScaleToAlpha: 0
generateCubemap: 0
seamlessCubemap: 0
textureFormat: -1
textureFormat: -3
maxTextureSize: 1024
textureSettings:
filterMode: 0

2
Assets/IsoTools/Examples/Images/Wall_r.png.meta
View File

@@ -22,7 +22,7 @@ TextureImporter:
grayScaleToAlpha: 0
generateCubemap: 0
seamlessCubemap: 0
textureFormat: -1
textureFormat: -3
maxTextureSize: 1024
textureSettings:
filterMode: 0

2
Assets/IsoTools/Examples/Images/Wallx3_l.png.meta
View File

@@ -21,7 +21,7 @@ TextureImporter:
grayScaleToAlpha: 0
generateCubemap: 0
seamlessCubemap: 0
textureFormat: -1
textureFormat: -3
maxTextureSize: 1024
textureSettings:
filterMode: 0

2
Assets/IsoTools/Examples/Images/Wallx3_r.png.meta
View File

@@ -21,7 +21,7 @@ TextureImporter:
grayScaleToAlpha: 0
generateCubemap: 0
seamlessCubemap: 0
textureFormat: -1
textureFormat: -3
maxTextureSize: 1024
textureSettings:
filterMode: 0

5600
Assets/IsoTools/Examples/Scenes/Scene1.unity
View File

File diff suppressed because it is too large Load Diff

8098
Assets/IsoTools/Examples/Scenes/Scene2.unity
View File

File diff suppressed because it is too large Load Diff

78292
Assets/IsoTools/Examples/Scenes/Scene3.unity
View File

File diff suppressed because it is too large Load Diff

176
Assets/IsoTools/Examples/Scenes/Scene4.unity Normal file
View File

@@ -0,0 +1,176 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!29 &1
SceneSettings:
m_ObjectHideFlags: 0
m_PVSData:
m_PVSObjectsArray: []
m_PVSPortalsArray: []
m_OcclusionBakeSettings:
smallestOccluder: 5
smallestHole: .25
backfaceThreshold: 100
--- !u!104 &2
RenderSettings:
m_Fog: 0
m_FogColor: {r: .5, g: .5, b: .5, a: 1}
m_FogMode: 3
m_FogDensity: .00999999978
m_LinearFogStart: 0
m_LinearFogEnd: 300
m_AmbientLight: {r: .200000003, g: .200000003, b: .200000003, a: 1}
m_SkyboxMaterial: {fileID: 0}
m_HaloStrength: .5
m_FlareStrength: 1
m_FlareFadeSpeed: 3
m_HaloTexture: {fileID: 0}
m_SpotCookie: {fileID: 0}
m_ObjectHideFlags: 0
--- !u!127 &3
LevelGameManager:
m_ObjectHideFlags: 0
--- !u!157 &4
LightmapSettings:
m_ObjectHideFlags: 0
m_LightProbes: {fileID: 0}
m_Lightmaps: []
m_LightmapsMode: 1
m_BakedColorSpace: 0
m_UseDualLightmapsInForward: 0
m_LightmapEditorSettings:
m_Resolution: 50
m_LastUsedResolution: 0
m_TextureWidth: 1024
m_TextureHeight: 1024
m_BounceBoost: 1
m_BounceIntensity: 1
m_SkyLightColor: {r: .860000014, g: .930000007, b: 1, a: 1}
m_SkyLightIntensity: 0
m_Quality: 0
m_Bounces: 1
m_FinalGatherRays: 1000
m_FinalGatherContrastThreshold: .0500000007
m_FinalGatherGradientThreshold: 0
m_FinalGatherInterpolationPoints: 15
m_AOAmount: 0
m_AOMaxDistance: .100000001
m_AOContrast: 1
m_LODSurfaceMappingDistance: 1
m_Padding: 0
m_TextureCompression: 0
m_LockAtlas: 0
--- !u!196 &5
NavMeshSettings:
m_ObjectHideFlags: 0
m_BuildSettings:
agentRadius: .5
agentHeight: 2
agentSlope: 45
agentClimb: .400000006
ledgeDropHeight: 0
maxJumpAcrossDistance: 0
accuratePlacement: 0
minRegionArea: 2
widthInaccuracy: 16.666666
heightInaccuracy: 10
m_NavMesh: {fileID: 0}
--- !u!1 &897463912
GameObject:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
serializedVersion: 4
m_Component:
- 4: {fileID: 897463918}
- 20: {fileID: 897463917}
- 92: {fileID: 897463916}
- 124: {fileID: 897463915}
- 81: {fileID: 897463914}
- 114: {fileID: 897463913}
m_Layer: 0
m_Name: Camera
m_TagString: MainCamera
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &897463913
MonoBehaviour:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 897463912}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 3f01619d3802e814f86f9e6bb965349a, type: 3}
m_Name:
m_EditorClassIdentifier:
_tileType: 0
_tileSize: 16
_minDepth: 0
_maxDepth: 1000
--- !u!81 &897463914
AudioListener:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 897463912}
m_Enabled: 1
--- !u!124 &897463915
Behaviour:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 897463912}
m_Enabled: 1
--- !u!92 &897463916
Behaviour:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 897463912}
m_Enabled: 1
--- !u!20 &897463917
Camera:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 897463912}
m_Enabled: 1
serializedVersion: 2
m_ClearFlags: 1
m_BackGroundColor: {r: .192156866, g: .301960796, b: .474509805, a: .0196078438}
m_NormalizedViewPortRect:
serializedVersion: 2
x: 0
y: 0
width: 1
height: 1
near clip plane: .300000012
far clip plane: 1000
field of view: 60
orthographic: 1
orthographic size: 150
m_Depth: -1
m_CullingMask:
serializedVersion: 2
m_Bits: 4294967295
m_RenderingPath: -1
m_TargetTexture: {fileID: 0}
m_TargetDisplay: 0
m_HDR: 0
m_OcclusionCulling: 1
m_StereoConvergence: 10
m_StereoSeparation: .0219999999
--- !u!4 &897463918
Transform:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 897463912}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: -10}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 0

4
Assets/IsoTools/Examples/Scenes/Scene4.unity.meta Normal file
View File

@@ -0,0 +1,4 @@
fileFormatVersion: 2
guid: dad63fc3eab72c244a16f49a54235d36
DefaultImporter:
userData:

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

@@ -143,8 +143,9 @@ namespace IsoTools {
void Update() {
if ( Application.isEditor ) {
if ( !Mathf.Approximately(_lastTransform.x, transform.position.x) ||
!Mathf.Approximately(_lastTransform.y, transform.position.y) )
!Mathf.Approximately(_lastTransform.y, transform.position.y))
{
Debug.Log("Change pos: " + gameObject.name);
FixIsoPosition();
}
if ( _lastPosition != _position ) Position = _position;

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

@@ -280,16 +280,19 @@ namespace IsoTools {
}
}
/*
void StepSort() {
if ( _dirty || _dirtyObjects.Count > 0 ) {
var objects = ScanObjects().Where(p => p.IsoObject.Sorting).ToList();
if ( _dirty ) {
ManualSort(objects);
Debug.Log("Resort!");
} else {
foreach ( var obj in _dirtyObjects ) {
ManualSort(obj, objects);
if ( _dirty ) {
ManualSort(objects);
Debug.Log("Need Resort!");
break;
}
}
@@ -297,6 +300,22 @@ namespace IsoTools {
_dirty = false;
_dirtyObjects.Clear();
}
}*/
void StepSort() {
while ( _dirty || _dirtyObjects.Count > 0 ) {
if ( _dirty ) {
var objects = ScanObjects().Where(p => p.IsoObject.Sorting).ToList();
ManualSort(objects);
_dirty = false;
Debug.Log("Resort!");
} else {
var objects = ScanObjects().Where(p => p.IsoObject.Sorting).ToList();
var obj = _dirtyObjects.First();
ManualSort(obj, objects);
_dirtyObjects.Remove(obj);
}
}
}
void Start() {