diff --git a/Assembly-CSharp-vs.csproj b/Assembly-CSharp-vs.csproj
index 31140ff..1df20d1 100644
--- a/Assembly-CSharp-vs.csproj
+++ b/Assembly-CSharp-vs.csproj
@@ -19,7 +19,7 @@
full
false
Temp\bin\Debug\
- DEBUG;TRACE;UNITY_4_6_1;UNITY_4_6;UNITY_STANDALONE_WIN;ENABLE_MICROPHONE;ENABLE_TEXTUREID_MAP;ENABLE_UNITYEVENTS;ENABLE_NEW_HIERARCHY ;ENABLE_AUDIO_FMOD;UNITY_STANDALONE;ENABLE_MONO;ENABLE_TERRAIN;ENABLE_SUBSTANCE;ENABLE_GENERICS;INCLUDE_WP8SUPPORT;ENABLE_MOVIES;ENABLE_WWW;ENABLE_IMAGEEFFECTS;ENABLE_4_6_FEATURES;INCLUDE_WP_BLUE_SUPPORT;ENABLE_WEBCAM;INCLUDE_METROSUPPORT;RENDER_SOFTWARE_CURSOR;ENABLE_NETWORK;ENABLE_PHYSICS;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_2D_PHYSICS;ENABLE_SHADOWS;ENABLE_AUDIO;ENABLE_NAVMESH_CARVING;ENABLE_DUCK_TYPING;ENABLE_SINGLE_INSTANCE_BUILD_SETTING;ENABLE_PROFILER;UNITY_EDITOR;UNITY_EDITOR_WIN;UNITY_TEAM_LICENSE;UNITY_PRO_LICENSE
+ DEBUG;TRACE;UNITY_5_0_0;UNITY_5_0;UNITY_5;ENABLE_NEW_BUGREPORTER;ENABLE_2D_PHYSICS;ENABLE_4_6_FEATURES;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_DUCK_TYPING;ENABLE_FRAME_DEBUGGER;ENABLE_GENERICS;ENABLE_HOME_SCREEN;ENABLE_IMAGEEFFECTS;ENABLE_LIGHT_PROBES_LEGACY;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_NEW_HIERARCHY;ENABLE_PHYSICS;ENABLE_PHYSICS_PHYSX3;ENABLE_PLUGIN_INSPECTOR;ENABLE_SHADOWS;ENABLE_SINGLE_INSTANCE_BUILD_SETTING;ENABLE_SPRITES;ENABLE_TERRAIN;ENABLE_UNITYEVENTS;ENABLE_WEBCAM;ENABLE_WWW;ENABLE_AUDIOMIXER_SUSPEND;INCLUDE_DYNAMIC_GI;INCLUDE_GI;INCLUDE_IL2CPP;PLATFORM_SUPPORTS_MONO;RENDER_SOFTWARE_CURSOR;UNITY_STANDALONE_OSX;UNITY_STANDALONE;ENABLE_SUBSTANCE;ENABLE_GAMECENTER;ENABLE_TEXTUREID_MAP;ENABLE_RUNTIME_GI;ENABLE_MOVIES;ENABLE_NETWORK;ENABLE_MONO;ENABLE_PROFILER;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_OSX;UNITY_TEAM_LICENSE;UNITY_PRO_LICENSE
prompt
4
0169
@@ -39,10 +39,10 @@
- C:/Program Files (x86)/Unity/Editor/Data/Managed/UnityEngine.dll
+ /Applications/Unity/Unity.app/Contents/Frameworks/Managed/UnityEngine.dll
- C:/Program Files (x86)/Unity/Editor/Data/Managed/UnityEditor.dll
+ /Applications/Unity/Unity.app/Contents/Frameworks/Managed/UnityEditor.dll
@@ -51,7 +51,7 @@
- C:/Program Files (x86)/Unity/Editor/Data/UnityExtensions/Unity/GUISystem/4.6.1/UnityEngine.UI.dll
+ /Applications/Unity/Unity.app/Contents/UnityExtensions/Unity/GUISystem/UnityEngine.UI.dll
diff --git a/Assembly-CSharp.csproj b/Assembly-CSharp.csproj
index 31140ff..1df20d1 100644
--- a/Assembly-CSharp.csproj
+++ b/Assembly-CSharp.csproj
@@ -19,7 +19,7 @@
full
false
Temp\bin\Debug\
- DEBUG;TRACE;UNITY_4_6_1;UNITY_4_6;UNITY_STANDALONE_WIN;ENABLE_MICROPHONE;ENABLE_TEXTUREID_MAP;ENABLE_UNITYEVENTS;ENABLE_NEW_HIERARCHY ;ENABLE_AUDIO_FMOD;UNITY_STANDALONE;ENABLE_MONO;ENABLE_TERRAIN;ENABLE_SUBSTANCE;ENABLE_GENERICS;INCLUDE_WP8SUPPORT;ENABLE_MOVIES;ENABLE_WWW;ENABLE_IMAGEEFFECTS;ENABLE_4_6_FEATURES;INCLUDE_WP_BLUE_SUPPORT;ENABLE_WEBCAM;INCLUDE_METROSUPPORT;RENDER_SOFTWARE_CURSOR;ENABLE_NETWORK;ENABLE_PHYSICS;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_2D_PHYSICS;ENABLE_SHADOWS;ENABLE_AUDIO;ENABLE_NAVMESH_CARVING;ENABLE_DUCK_TYPING;ENABLE_SINGLE_INSTANCE_BUILD_SETTING;ENABLE_PROFILER;UNITY_EDITOR;UNITY_EDITOR_WIN;UNITY_TEAM_LICENSE;UNITY_PRO_LICENSE
+ DEBUG;TRACE;UNITY_5_0_0;UNITY_5_0;UNITY_5;ENABLE_NEW_BUGREPORTER;ENABLE_2D_PHYSICS;ENABLE_4_6_FEATURES;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_DUCK_TYPING;ENABLE_FRAME_DEBUGGER;ENABLE_GENERICS;ENABLE_HOME_SCREEN;ENABLE_IMAGEEFFECTS;ENABLE_LIGHT_PROBES_LEGACY;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_NEW_HIERARCHY;ENABLE_PHYSICS;ENABLE_PHYSICS_PHYSX3;ENABLE_PLUGIN_INSPECTOR;ENABLE_SHADOWS;ENABLE_SINGLE_INSTANCE_BUILD_SETTING;ENABLE_SPRITES;ENABLE_TERRAIN;ENABLE_UNITYEVENTS;ENABLE_WEBCAM;ENABLE_WWW;ENABLE_AUDIOMIXER_SUSPEND;INCLUDE_DYNAMIC_GI;INCLUDE_GI;INCLUDE_IL2CPP;PLATFORM_SUPPORTS_MONO;RENDER_SOFTWARE_CURSOR;UNITY_STANDALONE_OSX;UNITY_STANDALONE;ENABLE_SUBSTANCE;ENABLE_GAMECENTER;ENABLE_TEXTUREID_MAP;ENABLE_RUNTIME_GI;ENABLE_MOVIES;ENABLE_NETWORK;ENABLE_MONO;ENABLE_PROFILER;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_OSX;UNITY_TEAM_LICENSE;UNITY_PRO_LICENSE
prompt
4
0169
@@ -39,10 +39,10 @@
- C:/Program Files (x86)/Unity/Editor/Data/Managed/UnityEngine.dll
+ /Applications/Unity/Unity.app/Contents/Frameworks/Managed/UnityEngine.dll
- C:/Program Files (x86)/Unity/Editor/Data/Managed/UnityEditor.dll
+ /Applications/Unity/Unity.app/Contents/Frameworks/Managed/UnityEditor.dll
@@ -51,7 +51,7 @@
- C:/Program Files (x86)/Unity/Editor/Data/UnityExtensions/Unity/GUISystem/4.6.1/UnityEngine.UI.dll
+ /Applications/Unity/Unity.app/Contents/UnityExtensions/Unity/GUISystem/UnityEngine.UI.dll
diff --git a/Assets/IsoTools/Examples/Scenes/Scene4.unity b/Assets/IsoTools/Examples/Scenes/Scene4.unity
index 5cb3b45..519942a 100644
--- a/Assets/IsoTools/Examples/Scenes/Scene4.unity
+++ b/Assets/IsoTools/Examples/Scenes/Scene4.unity
@@ -12,57 +12,129 @@ SceneSettings:
backfaceThreshold: 100
--- !u!104 &2
RenderSettings:
+ m_ObjectHideFlags: 0
+ serializedVersion: 5
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_AmbientSkyColor: {r: .200000003, g: .200000003, b: .200000003, a: 1}
+ m_AmbientEquatorColor: {r: .200000003, g: .200000003, b: .200000003, a: 1}
+ m_AmbientGroundColor: {r: .200000003, g: .200000003, b: .200000003, a: 1}
+ m_AmbientIntensity: 1
+ m_AmbientProbe:
+ sh[ 0]: 0
+ sh[ 1]: 0
+ sh[ 2]: 0
+ sh[ 3]: 0
+ sh[ 4]: 0
+ sh[ 5]: 0
+ sh[ 6]: 0
+ sh[ 7]: 0
+ sh[ 8]: 0
+ sh[ 9]: 0
+ sh[10]: 0
+ sh[11]: 0
+ sh[12]: 0
+ sh[13]: 0
+ sh[14]: 0
+ sh[15]: 0
+ sh[16]: 0
+ sh[17]: 0
+ sh[18]: 0
+ sh[19]: 0
+ sh[20]: 0
+ sh[21]: 0
+ sh[22]: 0
+ sh[23]: 0
+ sh[24]: 0
+ sh[25]: 0
+ sh[26]: 0
+ m_AmbientProbeInGamma:
+ sh[ 0]: 0
+ sh[ 1]: 0
+ sh[ 2]: 0
+ sh[ 3]: 0
+ sh[ 4]: 0
+ sh[ 5]: 0
+ sh[ 6]: 0
+ sh[ 7]: 0
+ sh[ 8]: 0
+ sh[ 9]: 0
+ sh[10]: 0
+ sh[11]: 0
+ sh[12]: 0
+ sh[13]: 0
+ sh[14]: 0
+ sh[15]: 0
+ sh[16]: 0
+ sh[17]: 0
+ sh[18]: 0
+ sh[19]: 0
+ sh[20]: 0
+ sh[21]: 0
+ sh[22]: 0
+ sh[23]: 0
+ sh[24]: 0
+ sh[25]: 0
+ sh[26]: 0
+ m_AmbientMode: 3
m_SkyboxMaterial: {fileID: 0}
m_HaloStrength: .5
m_FlareStrength: 1
m_FlareFadeSpeed: 3
m_HaloTexture: {fileID: 0}
- m_SpotCookie: {fileID: 0}
- m_ObjectHideFlags: 0
+ m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0}
+ m_DefaultReflectionMode: 0
+ m_DefaultReflectionResolution: 128
+ m_ReflectionBounces: 1
+ m_ReflectionIntensity: 1
+ m_CustomReflection: {fileID: 0}
+ m_GeneratedSkyboxReflection: {fileID: 0}
+ m_Sun: {fileID: 0}
--- !u!127 &3
LevelGameManager:
m_ObjectHideFlags: 0
--- !u!157 &4
LightmapSettings:
m_ObjectHideFlags: 0
- m_LightProbes: {fileID: 0}
- m_Lightmaps: []
+ serializedVersion: 4
+ m_GIWorkflowMode: 1
+ m_LightmapsModeLegacy: 1
m_LightmapsMode: 1
- m_BakedColorSpace: 0
m_UseDualLightmapsInForward: 0
+ m_GISettings:
+ serializedVersion: 2
+ m_BounceScale: 1
+ m_IndirectOutputScale: 1
+ m_AlbedoBoost: 1
+ m_TemporalCoherenceThreshold: 1
+ m_EnvironmentLightingMode: 0
+ m_EnableBakedLightmaps: 0
+ m_EnableRealtimeLightmaps: 0
m_LightmapEditorSettings:
- m_Resolution: 50
- m_LastUsedResolution: 0
+ serializedVersion: 3
+ m_Resolution: 2
+ m_BakeResolution: 50
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_AOMaxDistance: 1
+ m_Padding: 2
+ m_CompAOExponent: 0
+ m_LightmapParameters: {fileID: 0}
m_TextureCompression: 0
- m_LockAtlas: 0
+ m_FinalGather: 0
+ m_FinalGatherRayCount: 1024
+ m_LightmapSnapshot: {fileID: 0}
+ m_RuntimeCPUUsage: 25
--- !u!196 &5
NavMeshSettings:
+ serializedVersion: 2
m_ObjectHideFlags: 0
m_BuildSettings:
+ serializedVersion: 2
agentRadius: .5
agentHeight: 2
agentSlope: 45
@@ -71,9 +143,167 @@ NavMeshSettings:
maxJumpAcrossDistance: 0
accuratePlacement: 0
minRegionArea: 2
- widthInaccuracy: 16.666666
- heightInaccuracy: 10
- m_NavMesh: {fileID: 0}
+ cellSize: .166666657
+ manualCellSize: 0
+ m_NavMeshData: {fileID: 0}
+--- !u!1001 &373824665
+Prefab:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ m_TransformParent: {fileID: 0}
+ m_Modifications:
+ - target: {fileID: 453620, guid: dbd21aa1b9a2cdf4a944f50e64d145a1, type: 2}
+ propertyPath: m_LocalPosition.x
+ value: 96
+ objectReference: {fileID: 0}
+ - target: {fileID: 453620, guid: dbd21aa1b9a2cdf4a944f50e64d145a1, type: 2}
+ propertyPath: m_LocalPosition.y
+ value: 16
+ objectReference: {fileID: 0}
+ - target: {fileID: 453620, guid: dbd21aa1b9a2cdf4a944f50e64d145a1, type: 2}
+ propertyPath: m_LocalPosition.z
+ value: 800
+ objectReference: {fileID: 0}
+ - target: {fileID: 453620, guid: dbd21aa1b9a2cdf4a944f50e64d145a1, type: 2}
+ propertyPath: m_LocalRotation.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 453620, guid: dbd21aa1b9a2cdf4a944f50e64d145a1, type: 2}
+ propertyPath: m_LocalRotation.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 453620, guid: dbd21aa1b9a2cdf4a944f50e64d145a1, type: 2}
+ propertyPath: m_LocalRotation.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 453620, guid: dbd21aa1b9a2cdf4a944f50e64d145a1, type: 2}
+ propertyPath: m_LocalRotation.w
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 453620, guid: dbd21aa1b9a2cdf4a944f50e64d145a1, type: 2}
+ propertyPath: m_RootOrder
+ value: 4
+ objectReference: {fileID: 0}
+ - target: {fileID: 11453620, guid: dbd21aa1b9a2cdf4a944f50e64d145a1, type: 2}
+ propertyPath: _position.x
+ value: 4
+ objectReference: {fileID: 0}
+ - target: {fileID: 11453620, guid: dbd21aa1b9a2cdf4a944f50e64d145a1, type: 2}
+ propertyPath: _position.y
+ value: -2
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_ParentPrefab: {fileID: 100100000, guid: dbd21aa1b9a2cdf4a944f50e64d145a1, type: 2}
+ m_IsPrefabParent: 0
+--- !u!1001 &616856651
+Prefab:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ m_TransformParent: {fileID: 0}
+ m_Modifications:
+ - target: {fileID: 462204, guid: fb3806e9ed7ada045b1b57419ac1ee53, type: 2}
+ propertyPath: m_LocalPosition.x
+ value: 80
+ objectReference: {fileID: 0}
+ - target: {fileID: 462204, guid: fb3806e9ed7ada045b1b57419ac1ee53, type: 2}
+ propertyPath: m_LocalPosition.y
+ value: -8
+ objectReference: {fileID: 0}
+ - target: {fileID: 462204, guid: fb3806e9ed7ada045b1b57419ac1ee53, type: 2}
+ propertyPath: m_LocalPosition.z
+ value: 200
+ objectReference: {fileID: 0}
+ - target: {fileID: 462204, guid: fb3806e9ed7ada045b1b57419ac1ee53, type: 2}
+ propertyPath: m_LocalRotation.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 462204, guid: fb3806e9ed7ada045b1b57419ac1ee53, type: 2}
+ propertyPath: m_LocalRotation.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 462204, guid: fb3806e9ed7ada045b1b57419ac1ee53, type: 2}
+ propertyPath: m_LocalRotation.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 462204, guid: fb3806e9ed7ada045b1b57419ac1ee53, type: 2}
+ propertyPath: m_LocalRotation.w
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 462204, guid: fb3806e9ed7ada045b1b57419ac1ee53, type: 2}
+ propertyPath: m_RootOrder
+ value: 3
+ objectReference: {fileID: 0}
+ - target: {fileID: 11462204, guid: fb3806e9ed7ada045b1b57419ac1ee53, type: 2}
+ propertyPath: _position.x
+ value: 2
+ objectReference: {fileID: 0}
+ - target: {fileID: 11462204, guid: fb3806e9ed7ada045b1b57419ac1ee53, type: 2}
+ propertyPath: _position.y
+ value: -3
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_ParentPrefab: {fileID: 100100000, guid: fb3806e9ed7ada045b1b57419ac1ee53, type: 2}
+ m_IsPrefabParent: 0
+--- !u!1001 &870804156
+Prefab:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ m_TransformParent: {fileID: 0}
+ m_Modifications:
+ - target: {fileID: 462204, guid: fb3806e9ed7ada045b1b57419ac1ee53, type: 2}
+ propertyPath: m_LocalPosition.x
+ value: 80
+ objectReference: {fileID: 0}
+ - target: {fileID: 462204, guid: fb3806e9ed7ada045b1b57419ac1ee53, type: 2}
+ propertyPath: m_LocalPosition.y
+ value: 8
+ objectReference: {fileID: 0}
+ - target: {fileID: 462204, guid: fb3806e9ed7ada045b1b57419ac1ee53, type: 2}
+ propertyPath: m_LocalPosition.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 462204, guid: fb3806e9ed7ada045b1b57419ac1ee53, type: 2}
+ propertyPath: m_LocalRotation.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 462204, guid: fb3806e9ed7ada045b1b57419ac1ee53, type: 2}
+ propertyPath: m_LocalRotation.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 462204, guid: fb3806e9ed7ada045b1b57419ac1ee53, type: 2}
+ propertyPath: m_LocalRotation.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 462204, guid: fb3806e9ed7ada045b1b57419ac1ee53, type: 2}
+ propertyPath: m_LocalRotation.w
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 462204, guid: fb3806e9ed7ada045b1b57419ac1ee53, type: 2}
+ propertyPath: m_RootOrder
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 11462204, guid: fb3806e9ed7ada045b1b57419ac1ee53, type: 2}
+ propertyPath: _position.x
+ value: 2
+ objectReference: {fileID: 0}
+ - target: {fileID: 11462204, guid: fb3806e9ed7ada045b1b57419ac1ee53, type: 2}
+ propertyPath: _position.y
+ value: -3
+ objectReference: {fileID: 0}
+ - target: {fileID: 162204, guid: fb3806e9ed7ada045b1b57419ac1ee53, type: 2}
+ propertyPath: m_Name
+ value: Cube_3x1x4
+ objectReference: {fileID: 0}
+ - target: {fileID: 11462204, guid: fb3806e9ed7ada045b1b57419ac1ee53, type: 2}
+ propertyPath: _position.z
+ value: 1
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_ParentPrefab: {fileID: 100100000, guid: fb3806e9ed7ada045b1b57419ac1ee53, type: 2}
+ m_IsPrefabParent: 0
--- !u!1 &897463912
GameObject:
m_ObjectHideFlags: 0
@@ -146,8 +376,8 @@ Camera:
y: 0
width: 1
height: 1
- near clip plane: .300000012
- far clip plane: 1000
+ near clip plane: -.300000012
+ far clip plane: 500
field of view: 60
orthographic: 1
orthographic size: 150
@@ -173,4 +403,128 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
- m_RootOrder: 0
+ m_RootOrder: 5
+--- !u!1001 &1535022648
+Prefab:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ m_TransformParent: {fileID: 0}
+ m_Modifications:
+ - target: {fileID: 463702, guid: 6dac6372d911f0646a34e2e83f03c30c, type: 2}
+ propertyPath: m_LocalPosition.x
+ value: 64
+ objectReference: {fileID: 0}
+ - target: {fileID: 463702, guid: 6dac6372d911f0646a34e2e83f03c30c, type: 2}
+ propertyPath: m_LocalPosition.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 463702, guid: 6dac6372d911f0646a34e2e83f03c30c, type: 2}
+ propertyPath: m_LocalPosition.z
+ value: 400
+ objectReference: {fileID: 0}
+ - target: {fileID: 463702, guid: 6dac6372d911f0646a34e2e83f03c30c, type: 2}
+ propertyPath: m_LocalRotation.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 463702, guid: 6dac6372d911f0646a34e2e83f03c30c, type: 2}
+ propertyPath: m_LocalRotation.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 463702, guid: 6dac6372d911f0646a34e2e83f03c30c, type: 2}
+ propertyPath: m_LocalRotation.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 463702, guid: 6dac6372d911f0646a34e2e83f03c30c, type: 2}
+ propertyPath: m_LocalRotation.w
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 463702, guid: 6dac6372d911f0646a34e2e83f03c30c, type: 2}
+ propertyPath: m_RootOrder
+ value: 2
+ objectReference: {fileID: 0}
+ - target: {fileID: 11463702, guid: 6dac6372d911f0646a34e2e83f03c30c, type: 2}
+ propertyPath: _position.x
+ value: 2
+ objectReference: {fileID: 0}
+ - target: {fileID: 11463702, guid: 6dac6372d911f0646a34e2e83f03c30c, type: 2}
+ propertyPath: _position.y
+ value: -2
+ objectReference: {fileID: 0}
+ - target: {fileID: 21263702, guid: 6dac6372d911f0646a34e2e83f03c30c, type: 2}
+ propertyPath: m_Color.r
+ value: .53103447
+ objectReference: {fileID: 0}
+ - target: {fileID: 21263702, guid: 6dac6372d911f0646a34e2e83f03c30c, type: 2}
+ propertyPath: m_Color.g
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 21263702, guid: 6dac6372d911f0646a34e2e83f03c30c, type: 2}
+ propertyPath: m_Color.b
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 21263702, guid: 6dac6372d911f0646a34e2e83f03c30c, type: 2}
+ propertyPath: m_Color.a
+ value: 1
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_ParentPrefab: {fileID: 100100000, guid: 6dac6372d911f0646a34e2e83f03c30c, type: 2}
+ m_IsPrefabParent: 0
+--- !u!1001 &1696404621
+Prefab:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ m_TransformParent: {fileID: 0}
+ m_Modifications:
+ - target: {fileID: 453620, guid: dbd21aa1b9a2cdf4a944f50e64d145a1, type: 2}
+ propertyPath: m_LocalPosition.x
+ value: 96
+ objectReference: {fileID: 0}
+ - target: {fileID: 453620, guid: dbd21aa1b9a2cdf4a944f50e64d145a1, type: 2}
+ propertyPath: m_LocalPosition.y
+ value: 32
+ objectReference: {fileID: 0}
+ - target: {fileID: 453620, guid: dbd21aa1b9a2cdf4a944f50e64d145a1, type: 2}
+ propertyPath: m_LocalPosition.z
+ value: 600
+ objectReference: {fileID: 0}
+ - target: {fileID: 453620, guid: dbd21aa1b9a2cdf4a944f50e64d145a1, type: 2}
+ propertyPath: m_LocalRotation.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 453620, guid: dbd21aa1b9a2cdf4a944f50e64d145a1, type: 2}
+ propertyPath: m_LocalRotation.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 453620, guid: dbd21aa1b9a2cdf4a944f50e64d145a1, type: 2}
+ propertyPath: m_LocalRotation.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 453620, guid: dbd21aa1b9a2cdf4a944f50e64d145a1, type: 2}
+ propertyPath: m_LocalRotation.w
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 453620, guid: dbd21aa1b9a2cdf4a944f50e64d145a1, type: 2}
+ propertyPath: m_RootOrder
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 11453620, guid: dbd21aa1b9a2cdf4a944f50e64d145a1, type: 2}
+ propertyPath: _position.x
+ value: 4
+ objectReference: {fileID: 0}
+ - target: {fileID: 11453620, guid: dbd21aa1b9a2cdf4a944f50e64d145a1, type: 2}
+ propertyPath: _position.y
+ value: -2
+ objectReference: {fileID: 0}
+ - target: {fileID: 153620, guid: dbd21aa1b9a2cdf4a944f50e64d145a1, type: 2}
+ propertyPath: m_Name
+ value: Cube_1x3x9
+ objectReference: {fileID: 0}
+ - target: {fileID: 11453620, guid: dbd21aa1b9a2cdf4a944f50e64d145a1, type: 2}
+ propertyPath: _position.z
+ value: 1
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_ParentPrefab: {fileID: 100100000, guid: dbd21aa1b9a2cdf4a944f50e64d145a1, type: 2}
+ m_IsPrefabParent: 0
diff --git a/Assets/IsoTools/Scripts/IsoObject.cs b/Assets/IsoTools/Scripts/IsoObject.cs
index e6786b4..4c5d445 100644
--- a/Assets/IsoTools/Scripts/IsoObject.cs
+++ b/Assets/IsoTools/Scripts/IsoObject.cs
@@ -145,7 +145,6 @@ namespace IsoTools {
if ( !Mathf.Approximately(_lastTransform.x, transform.position.x) ||
!Mathf.Approximately(_lastTransform.y, transform.position.y))
{
- Debug.Log("Change pos: " + gameObject.name);
FixIsoPosition();
}
if ( _lastPosition != _position ) Position = _position;
diff --git a/Assets/IsoTools/Scripts/IsoWorld.cs b/Assets/IsoTools/Scripts/IsoWorld.cs
index 1d28684..97c1a68 100644
--- a/Assets/IsoTools/Scripts/IsoWorld.cs
+++ b/Assets/IsoTools/Scripts/IsoWorld.cs
@@ -1,5 +1,6 @@
using UnityEngine;
using System.Linq;
+using System;
using System.Collections.Generic;
namespace IsoTools {
@@ -98,6 +99,9 @@ namespace IsoTools {
// ------------------------------------------------------------------------
public void MarkDirty(IsoObject obj) {
_dirtyObjects.Add(obj);
+ if ( !_dirty ) {
+ //ManualSort(obj, Scan)
+ }
}
// ------------------------------------------------------------------------
@@ -202,10 +206,16 @@ namespace IsoTools {
}
IList ScanObjects() {
+ return ScanObjects(p => true);
+ }
+
+ IList ScanObjects(Func filter) {
var iso_objects = GameObject.FindObjectsOfType();
var objects = new List(iso_objects.Length);
foreach ( var iso_object in iso_objects ) {
- objects.Add(new ObjectInfo(iso_object));
+ if ( filter(iso_object) ) {
+ objects.Add(new ObjectInfo(iso_object));
+ }
}
return objects;
}
@@ -255,7 +265,7 @@ namespace IsoTools {
}
//TODO: magic number
var min_depth_step = 0.01f;
- if ( Mathf.Abs(max_depth - min_depth) < min_depth_step ) {
+ if ( max_depth < min_depth || Mathf.Abs(max_depth - min_depth) < min_depth_step ) {
MarkDirty();
} else {
PlaceObject(obj, (min_depth + max_depth) / 2.0f);
@@ -280,47 +290,24 @@ 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;
- }
- }
- }
+ 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();
- }
- }*/
-
- 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);
- }
+ Debug.Log("Resort!");
}
}
void Start() {
ChangeSortingProperty();
- ManualSort(ScanObjects());
+ StepSort();
}
void LateUpdate() {
diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset
index cb12d38..d8b32a7 100644
--- a/ProjectSettings/ProjectSettings.asset
+++ b/ProjectSettings/ProjectSettings.asset
@@ -3,15 +3,17 @@
--- !u!129 &1
PlayerSettings:
m_ObjectHideFlags: 0
- serializedVersion: 3
+ serializedVersion: 6
AndroidProfiler: 0
defaultScreenOrientation: 4
targetDevice: 2
targetGlesGraphics: 1
+ targetIOSGraphics: -1
targetResolution: 0
accelerometerFrequency: 60
companyName: DefaultCompany
productName: UnityIso
+ cloudProjectId:
defaultCursor: {fileID: 0}
cursorHotspot: {x: 0, y: 0}
defaultScreenWidth: 1024
@@ -27,6 +29,7 @@ PlayerSettings:
m_Stereoscopic3D: 0
iosShowActivityIndicatorOnLoading: -1
androidShowActivityIndicatorOnLoading: -1
+ iosAppInBackgroundBehavior: 0
displayResolutionDialog: 1
allowedAutorotateToPortrait: 1
allowedAutorotateToPortraitUpsideDown: 1
@@ -34,16 +37,16 @@ PlayerSettings:
allowedAutorotateToLandscapeLeft: 1
useOSAutorotation: 1
use32BitDisplayBuffer: 1
- use24BitDepthBuffer: 1
+ disableDepthAndStencilBuffers: 0
defaultIsFullScreen: 1
defaultIsNativeResolution: 1
runInBackground: 0
captureSingleScreen: 0
Override IPod Music: 0
Prepare IOS For Recording: 0
- enableHWStatistics: 1
+ submitAnalytics: 1
usePlayerLog: 1
- stripPhysics: 0
+ bakeCollisionMeshes: 0
forceSingleInstance: 0
resizableWindow: 0
useMacAppStoreValidation: 0
@@ -56,22 +59,28 @@ PlayerSettings:
visibleInBackground: 0
macFullscreenMode: 2
d3d9FullscreenMode: 1
- d3d11ForceExclusiveMode: 0
+ d3d11FullscreenMode: 1
xboxSpeechDB: 0
xboxEnableHeadOrientation: 0
xboxEnableGuest: 0
+ xboxOneResolution: 0
+ ps3SplashScreen: {fileID: 0}
videoMemoryForVertexBuffers: 0
+ psp2PowerMode: 0
+ psp2AcquireBGM: 1
m_SupportedAspectRatios:
4:3: 1
5:4: 1
16:10: 1
16:9: 1
Others: 1
- iPhoneBundleIdentifier: com.Company.ProductName
+ bundleIdentifier: com.Company.ProductName
+ bundleVersion: 1.0
+ preloadedAssets: []
metroEnableIndependentInputSource: 0
metroEnableLowLatencyPresentationAPI: 0
+ xboxOneDisableKinectGpuReservation: 0
productGUID: 0ae4d8e5611a65d45bd97550aa4471af
- iPhoneBundleVersion: 1.0
AndroidBundleVersionCode: 1
AndroidMinSdkVersion: 9
AndroidPreferredInstallLocation: 1
@@ -83,6 +92,7 @@ PlayerSettings:
ForceSDCardPermission: 0
CreateWallpaper: 0
APKExpansionFiles: 0
+ preloadShaders: 0
StripUnusedMeshComponents: 0
iPhoneSdkVersion: 988
iPhoneTargetOSVersion: 22
@@ -101,15 +111,34 @@ PlayerSettings:
iPadHighResPortraitSplashScreen: {fileID: 0}
iPadLandscapeSplashScreen: {fileID: 0}
iPadHighResLandscapeSplashScreen: {fileID: 0}
+ iOSCustomLaunchScreenType: 0
+ iOSLaunchScreenPortrait: {fileID: 0}
+ iOSLaunchScreenLandscape: {fileID: 0}
+ iOSLaunchScreenBackgroundColor:
+ serializedVersion: 2
+ rgba: 3738751484
+ iOSLaunchScreenFillPct: 1
+ iOSLaunchScreenCustomXibPath:
AndroidTargetDevice: 0
AndroidSplashScreenScale: 0
AndroidKeystoreName:
AndroidKeyaliasName:
+ AndroidTVCompatibility: 1
+ AndroidIsGame: 1
+ androidEnableBanner: 1
+ m_AndroidBanners:
+ - width: 320
+ height: 180
+ banner: {fileID: 0}
resolutionDialogBanner: {fileID: 0}
m_BuildTargetIcons: []
m_BuildTargetBatching: []
webPlayerTemplate: APPLICATION:Default
m_TemplateCustomTags: {}
+ actionOnDotNetUnhandledException: 1
+ enableInternalProfiler: 0
+ logObjCUncaughtExceptions: 1
+ enableCrashReportAPI: 0
locationUsageDescription:
XboxTitleId:
XboxImageXexPath:
@@ -126,6 +155,7 @@ PlayerSettings:
ps3ThumbnailPath:
ps3BackgroundPath:
ps3SoundPath:
+ ps3NPAgeRating: 12
ps3TrophyCommId:
ps3NpCommunicationPassphrase:
ps3TrophyPackagePath:
@@ -133,15 +163,65 @@ PlayerSettings:
ps3TrophyCommSig:
ps3SaveGameSlots: 1
ps3TrialMode: 0
+ ps3VideoMemoryForAudio: 0
+ ps3EnableVerboseMemoryStats: 0
+ ps3UseSPUForUmbra: 0
+ ps3EnableMoveSupport: 1
+ ps3DisableDolbyEncoding: 0
+ ps4NPAgeRating: 12
+ ps4NPTitleSecret:
+ ps4NPTrophyPackPath:
+ ps4ParentalLevel: 1
+ ps4ContentID: ED1633-NPXX51362_00-0000000000000000
+ ps4Category: 0
+ ps4MasterVersion: 01.00
+ ps4AppVersion: 01.00
+ ps4AppType: 0
+ ps4ParamSfxPath:
+ ps4VideoOutPixelFormat: 0
+ ps4VideoOutResolution: 4
+ ps4PronunciationXMLPath:
+ ps4PronunciationSIGPath:
+ ps4BackgroundImagePath:
+ ps4StartupImagePath:
+ ps4SaveDataImagePath:
+ ps4BGMPath:
+ ps4ShareFilePath:
+ ps4NPtitleDatPath:
+ ps4RemotePlayKeyAssignment: -1
+ ps4EnterButtonAssignment: 1
+ ps4ApplicationParam1: 0
+ ps4ApplicationParam2: 0
+ ps4ApplicationParam3: 0
+ ps4ApplicationParam4: 0
+ ps4Passcode: KgSnOxla5PMvVHtMgwLFr7qLEJsRxHBI
+ ps4pnSessions: 1
+ ps4pnPresence: 1
+ ps4pnFriends: 1
+ ps4pnGameCustomData: 1
+ playerPrefsSupport: 0
+ monoEnv:
psp2Splashimage: {fileID: 0}
- psp2LiveAreaGate: {fileID: 0}
- psp2LiveAreaBackround: {fileID: 0}
psp2NPTrophyPackPath:
+ psp2NPSupportGBMorGJP: 0
+ psp2NPAgeRating: 12
psp2NPCommsID:
+ psp2NPCommunicationsID:
psp2NPCommsPassphrase:
psp2NPCommsSig:
psp2ParamSfxPath:
+ psp2ManualPath:
+ psp2LiveAreaGatePath:
+ psp2LiveAreaBackroundPath:
+ psp2LiveAreaPath:
+ psp2LiveAreaTrialPath:
+ psp2PatchChangeInfoPath:
+ psp2PatchOriginalPackage:
psp2PackagePassword:
+ psp2KeystoneFile:
+ psp2DRMType: 0
+ psp2StorageType: 0
+ psp2MediaCapacity: 0
psp2DLCConfigPath:
psp2ThumbnailPath:
psp2BackgroundPath:
@@ -149,7 +229,23 @@ PlayerSettings:
psp2TrophyCommId:
psp2TrophyPackagePath:
psp2PackagedResourcesPath:
- flashStrippingLevel: 2
+ psp2SaveDataQuota: 10240
+ psp2ParentalLevel: 1
+ psp2ShortTitle: Not Set
+ psp2ContentID: IV0000-ABCD12345_00-0123456789ABCDEF
+ psp2Category: 0
+ psp2MasterVersion: 01.00
+ psp2AppVersion: 01.00
+ psp2TVBootMode: 0
+ psp2EnterButtonAssignment: 2
+ psp2TVDisableEmu: 0
+ psp2AllowTwitterDialog: 1
+ psp2Upgradable: 0
+ psp2HealthWarning: 0
+ psp2UseLibLocation: 0
+ psp2InfoBarOnStartup: 0
+ psp2InfoBarColor: 0
+ psmSplashimage: {fileID: 0}
spritePackerPolicy:
scriptingDefineSymbols: {}
metroPackageName: UnityIso
@@ -213,8 +309,10 @@ PlayerSettings:
metroTileBackgroundColor: {r: 0, g: 0, b: 0, a: 1}
metroSplashScreenBackgroundColor: {r: 0, g: 0, b: 0, a: 1}
metroSplashScreenUseBackgroundColor: 0
- metroCapabilities: {}
- metroUnprocessedPlugins: []
+ platformCapabilities: {}
+ metroFTAName:
+ metroFTAFileTypes: []
+ metroProtocolName:
metroCompilationOverrides: 1
blackberryDeviceAddress:
blackberryDevicePassword:
@@ -222,10 +320,8 @@ PlayerSettings:
blackberryTokenExires:
blackberryTokenAuthor:
blackberryTokenAuthorId:
- blackberryAuthorId:
blackberryCskPassword:
blackberrySaveLogPath:
- blackberryAuthorIdOveride: 0
blackberrySharedPermissions: 0
blackberryCameraPermissions: 0
blackberryGPSPermissions: 0
@@ -243,7 +339,47 @@ PlayerSettings:
tizenGPSPermissions: 0
tizenMicrophonePermissions: 0
stvDeviceAddress:
+ stvProductDescription:
+ stvProductAuthor:
+ stvProductAuthorEmail:
+ stvProductLink:
+ stvProductCategory: 0
+ XboxOneProductId:
+ XboxOneUpdateKey:
+ XboxOneSandboxId:
+ XboxOneContentId:
+ XboxOneTitleId:
+ XboxOneSCId:
+ XboxOneGameOsOverridePath:
+ XboxOnePackagingOverridePath:
+ XboxOneAppManifestOverridePath:
+ XboxOnePackageEncryption: 0
+ XboxOneDescription:
+ XboxOneIsContentPackage: 0
+ XboxOneEnableGPUVariability: 0
+ XboxOneSockets: {}
+ XboxOneSplashScreen: {fileID: 0}
+ XboxOneAllowedProductIds: []
+ XboxOnePersistentLocalStorageSize: 0
+ intPropertyNames:
+ - WebGL::ScriptingBackend
+ - WebGL::audioCompressionFormat
+ - WebGL::exceptionSupport
+ - WebGL::memorySize
+ - iOS::Architecture
+ - iOS::ScriptingBackend
+ WebGL::ScriptingBackend: 1
+ WebGL::audioCompressionFormat: 4
+ WebGL::exceptionSupport: 0
+ WebGL::memorySize: 256
+ iOS::Architecture: 2
+ iOS::ScriptingBackend: 0
+ boolPropertyNames:
+ - WebGL::dataCaching
+ WebGL::dataCaching: 0
+ stringPropertyNames:
+ - WebGL::emscriptenArgs
+ - WebGL::template
+ WebGL::emscriptenArgs:
+ WebGL::template: APPLICATION:Default
firstStreamedLevelWithResources: 0
- unityRebuildLibraryVersion: 9
- unityForwardCompatibleVersion: 39
- unityStandardAssetsVersion: 0
diff --git a/UnityIso-csharp.sln b/UnityIso-csharp.sln
index 40a3fa8..c573bba 100644
--- a/UnityIso-csharp.sln
+++ b/UnityIso-csharp.sln
@@ -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
diff --git a/UnityIso.sln b/UnityIso.sln
index 0e007a1..1a86c1f 100644
--- a/UnityIso.sln
+++ b/UnityIso.sln
@@ -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
diff --git a/UnityIso.userprefs b/UnityIso.userprefs
index e76c1ec..61cca82 100644
--- a/UnityIso.userprefs
+++ b/UnityIso.userprefs
@@ -1,13 +1,13 @@
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file