diff --git a/Assembly-CSharp-Editor-vs.csproj b/Assembly-CSharp-Editor-vs.csproj new file mode 100644 index 0000000..635ce51 --- /dev/null +++ b/Assembly-CSharp-Editor-vs.csproj @@ -0,0 +1,97 @@ + + + + Debug + AnyCPU + 10.0.20506 + 2.0 + {9DD045DD-22BE-903A-2049-EB7A7F7A784D} + Library + Properties + + Assembly-CSharp-Editor + v3.5 + 512 + Assets + + + true + full + false + Temp\bin\Debug\ + DEBUG;TRACE;UNITY_5_0_1;UNITY_5_0;UNITY_5;ENABLE_LICENSE_RENAME;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;ENABLE_NONPRO;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 + prompt + 4 + 0169 + + + pdbonly + true + Temp\bin\Release\ + TRACE + prompt + 4 + 0169 + + + + + + + + /Applications/Unity/Unity.app/Contents/Frameworks/Managed/UnityEngine.dll + + + /Applications/Unity/Unity.app/Contents/Frameworks/Managed/UnityEditor.dll + + + + + + /Applications/Unity/Unity.app/Contents/UnityExtensions/Unity/GUISystem/UnityEngine.UI.dll + + + /Applications/Unity/Unity.app/Contents/UnityExtensions/Unity/GUISystem/Editor/UnityEditor.UI.dll + + + /Applications/Unity/Unity.app/Contents/Frameworks/Managed/UnityEditor.Graphs.dll + + + /Applications/Unity/Unity.app/Contents/PlaybackEngines/AndroidPlayer/UnityEditor.Android.Extensions.dll + + + /Applications/Unity/Unity.app/Contents/PlaybackEngines/iossupport/UnityEditor.iOS.Extensions.dll + + + /Applications/Unity/Unity.app/Contents/PlaybackEngines/BlackBerryPlayer/UnityEditor.BB10.Extensions.dll + + + /Applications/Unity/Unity.app/Contents/PlaybackEngines/WebGLSupport/UnityEditor.WebGL.Extensions.dll + + + /Applications/Unity/Unity.app/Contents/PlaybackEngines/LinuxStandaloneSupport/UnityEditor.LinuxStandalone.Extensions.dll + + + /Applications/Unity/Unity.app/Contents/PlaybackEngines/WindowsStandaloneSupport/UnityEditor.WindowsStandalone.Extensions.dll + + + /Applications/Unity/Unity.app/Contents/PlaybackEngines/MacStandaloneSupport/UnityEditor.OSXStandalone.Extensions.dll + + + /Applications/Unity/Unity.app/Contents/PlaybackEngines/iossupport/UnityEditor.iOS.Extensions.Xcode.dll + + + + + {7D717A69-578D-258F-954A-2360437723EF} Assembly-CSharp-vs + + + + + diff --git a/Assembly-CSharp-Editor.csproj b/Assembly-CSharp-Editor.csproj new file mode 100644 index 0000000..91a83c4 --- /dev/null +++ b/Assembly-CSharp-Editor.csproj @@ -0,0 +1,97 @@ + + + + Debug + AnyCPU + 10.0.20506 + 2.0 + {9DD045DD-22BE-903A-2049-EB7A7F7A784D} + Library + Properties + + Assembly-CSharp-Editor + v3.5 + 512 + Assets + + + true + full + false + Temp\bin\Debug\ + DEBUG;TRACE;UNITY_5_0_1;UNITY_5_0;UNITY_5;ENABLE_LICENSE_RENAME;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;ENABLE_NONPRO;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 + prompt + 4 + 0169 + + + pdbonly + true + Temp\bin\Release\ + TRACE + prompt + 4 + 0169 + + + + + + + + /Applications/Unity/Unity.app/Contents/Frameworks/Managed/UnityEngine.dll + + + /Applications/Unity/Unity.app/Contents/Frameworks/Managed/UnityEditor.dll + + + + + + /Applications/Unity/Unity.app/Contents/UnityExtensions/Unity/GUISystem/UnityEngine.UI.dll + + + /Applications/Unity/Unity.app/Contents/UnityExtensions/Unity/GUISystem/Editor/UnityEditor.UI.dll + + + /Applications/Unity/Unity.app/Contents/Frameworks/Managed/UnityEditor.Graphs.dll + + + /Applications/Unity/Unity.app/Contents/PlaybackEngines/AndroidPlayer/UnityEditor.Android.Extensions.dll + + + /Applications/Unity/Unity.app/Contents/PlaybackEngines/iossupport/UnityEditor.iOS.Extensions.dll + + + /Applications/Unity/Unity.app/Contents/PlaybackEngines/BlackBerryPlayer/UnityEditor.BB10.Extensions.dll + + + /Applications/Unity/Unity.app/Contents/PlaybackEngines/WebGLSupport/UnityEditor.WebGL.Extensions.dll + + + /Applications/Unity/Unity.app/Contents/PlaybackEngines/LinuxStandaloneSupport/UnityEditor.LinuxStandalone.Extensions.dll + + + /Applications/Unity/Unity.app/Contents/PlaybackEngines/WindowsStandaloneSupport/UnityEditor.WindowsStandalone.Extensions.dll + + + /Applications/Unity/Unity.app/Contents/PlaybackEngines/MacStandaloneSupport/UnityEditor.OSXStandalone.Extensions.dll + + + /Applications/Unity/Unity.app/Contents/PlaybackEngines/iossupport/UnityEditor.iOS.Extensions.Xcode.dll + + + + + {7D717A69-578D-258F-954A-2360437723EF} Assembly-CSharp + + + + + diff --git a/Assembly-CSharp-vs.csproj b/Assembly-CSharp-vs.csproj index 7dbceb6..b29d7eb 100644 --- a/Assembly-CSharp-vs.csproj +++ b/Assembly-CSharp-vs.csproj @@ -19,7 +19,7 @@ full false Temp\bin\Debug\ - DEBUG;TRACE;UNITY_5_0_0;UNITY_5_0;UNITY_5;ENABLE_LICENSE_RENAME;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;ENABLE_NONPRO;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 + DEBUG;TRACE;UNITY_5_0_1;UNITY_5_0;UNITY_5;ENABLE_LICENSE_RENAME;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;ENABLE_NONPRO;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 prompt 4 0169 @@ -54,6 +54,9 @@ /Applications/Unity/Unity.app/Contents/UnityExtensions/Unity/GUISystem/UnityEngine.UI.dll + + + /Applications/Unity/Unity.app/Contents/PlaybackEngines/iossupport/UnityEditor.iOS.Extensions.Xcode.dll diff --git a/Assembly-CSharp.csproj b/Assembly-CSharp.csproj index 7dbceb6..b29d7eb 100644 --- a/Assembly-CSharp.csproj +++ b/Assembly-CSharp.csproj @@ -19,7 +19,7 @@ full false Temp\bin\Debug\ - DEBUG;TRACE;UNITY_5_0_0;UNITY_5_0;UNITY_5;ENABLE_LICENSE_RENAME;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;ENABLE_NONPRO;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 + DEBUG;TRACE;UNITY_5_0_1;UNITY_5_0;UNITY_5;ENABLE_LICENSE_RENAME;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;ENABLE_NONPRO;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 prompt 4 0169 @@ -54,6 +54,9 @@ /Applications/Unity/Unity.app/Contents/UnityExtensions/Unity/GUISystem/UnityEngine.UI.dll + + + /Applications/Unity/Unity.app/Contents/PlaybackEngines/iossupport/UnityEditor.iOS.Extensions.Xcode.dll diff --git a/Assets/IsoTools/Editor.meta b/Assets/IsoTools/Editor.meta new file mode 100644 index 0000000..3510b67 --- /dev/null +++ b/Assets/IsoTools/Editor.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 3d4745a878e7c46538d7c43719ad23da +folderAsset: yes +timeCreated: 1431270070 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/IsoTools/Editor/IsoObjectEditor.cs b/Assets/IsoTools/Editor/IsoObjectEditor.cs new file mode 100644 index 0000000..50cec7a --- /dev/null +++ b/Assets/IsoTools/Editor/IsoObjectEditor.cs @@ -0,0 +1,109 @@ +using UnityEngine; +using UnityEditor; +using System.Linq; +using System.Collections.Generic; + +namespace IsoTools { + [CustomEditor(typeof(IsoObject)), CanEditMultipleObjects] + class IsoObjectEditor : Editor { + + IDictionary _positions = new Dictionary(); + IDictionary _iso_zpositions = new Dictionary(); + Vector3 _center = Vector3.zero; + Vector3 _viewCenter = Vector3.zero; + + void GrabPositions() { + _positions = targets + .Where(p => p as IsoObject) + .Select(p => p as IsoObject) + .ToDictionary(p => p, p => p.transform.position); + _iso_zpositions = targets + .Where(p => p as IsoObject) + .Select(p => p as IsoObject) + .ToDictionary(p => p, p => p.Position.z); + _center = _viewCenter = _positions.Aggregate(Vector3.zero, (AccIn, p) => { + return AccIn + p.Value; + }) / _positions.Count; + } + + Vector3 XYMoveIsoObjects(Vector3 delta) { + Undo.RecordObjects(_positions.Keys.ToArray(), "Move"); + return _positions.Aggregate(Vector3.zero, (AccIn, pair) => { + var iso_object = pair.Key; + var iso_orig_pos = pair.Value; + iso_object.transform.position = iso_orig_pos + delta; + iso_object.FixIsoPosition(); + var pos_delta = iso_object.transform.position - iso_orig_pos; + return pos_delta.magnitude > AccIn.magnitude ? pos_delta : AccIn; + }); + } + + float ZMoveIsoObjects(float delta) { + Undo.RecordObjects(_iso_zpositions.Keys.ToArray(), "Move"); + return _iso_zpositions.Aggregate(0.0f, (AccIn, pair) => { + var iso_object = pair.Key; + var iso_orig_z = pair.Value; + iso_object.PositionZ = iso_orig_z + delta; + iso_object.FixTransform(); + var z_delta = iso_object.Position.z - iso_orig_z; + return Mathf.Abs(z_delta) > Mathf.Abs(AccIn) ? z_delta : AccIn; + }); + } + + void XYMoveRectangle() { + Handles.color = IsoUtils.ColorChangeA(Handles.zAxisColor, 0.3f); + Handles.DotCap( + 0, + _viewCenter, + Quaternion.identity, + HandleUtility.GetHandleSize(_viewCenter) * 0.15f); + Handles.color = Handles.zAxisColor; + Handles.ArrowCap( + 0, + _viewCenter, + Quaternion.identity, + HandleUtility.GetHandleSize(_viewCenter)); + Handles.color = Handles.zAxisColor; + var delta = Handles.FreeMoveHandle( + _viewCenter, + Quaternion.identity, + HandleUtility.GetHandleSize(_viewCenter) * 0.15f, + Vector3.zero, + Handles.RectangleCap) - _viewCenter; + if ( delta.magnitude > Mathf.Epsilon ) { + _viewCenter = _center + XYMoveIsoObjects(_viewCenter - _center + delta); + } + } + + void ZMoveSlider() { + var iso_world = GameObject.FindObjectOfType(); + if ( iso_world ) { + Handles.color = Handles.yAxisColor; + var delta = Handles.Slider(_viewCenter, IsoUtils.Vec3OneY) - _viewCenter; + if ( Mathf.Abs(delta.y) > Mathf.Epsilon ) { + float tmp_y = ZMoveIsoObjects((_viewCenter.y - _center.y + delta.y) / iso_world.TileSize); + _viewCenter = _center + IsoUtils.Vec3FromY(tmp_y * iso_world.TileSize); + } + } + } + + void OnEnable() { + Tools.hidden = true; + GrabPositions(); + } + + void OnDisable() { + Tools.hidden = false; + } + + void OnSceneGUI() { + ZMoveSlider(); + XYMoveRectangle(); + } + + public override void OnInspectorGUI() { + DrawDefaultInspector(); + GrabPositions(); + } + } +} // namespace IsoTools \ No newline at end of file diff --git a/Assets/IsoTools/Editor/IsoObjectEditor.cs.meta b/Assets/IsoTools/Editor/IsoObjectEditor.cs.meta new file mode 100644 index 0000000..fb42ffd --- /dev/null +++ b/Assets/IsoTools/Editor/IsoObjectEditor.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: 93330da42c0724b428b514e561f34e3f +timeCreated: 1431270083 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/IsoTools/Examples/Scenes/Scene5.unity b/Assets/IsoTools/Examples/Scenes/Scene5.unity new file mode 100644 index 0000000..243ed60 --- /dev/null +++ b/Assets/IsoTools/Examples/Scenes/Scene5.unity @@ -0,0 +1,467 @@ +%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_ObjectHideFlags: 0 + serializedVersion: 6 + 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_AmbientSkyColor: {r: .211999997, g: .226999998, b: .259000003, a: 1} + m_AmbientEquatorColor: {r: .114, g: .125, b: .133000001, a: 1} + m_AmbientGroundColor: {r: .0469999984, g: .0430000015, b: .0350000001, a: 1} + m_AmbientIntensity: 1 + m_AmbientMode: 3 + m_SkyboxMaterial: {fileID: 0} + m_HaloStrength: .5 + m_FlareStrength: 1 + m_FlareFadeSpeed: 3 + m_HaloTexture: {fileID: 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_Sun: {fileID: 0} +--- !u!127 &3 +LevelGameManager: + m_ObjectHideFlags: 0 +--- !u!157 &4 +LightmapSettings: + m_ObjectHideFlags: 0 + serializedVersion: 5 + m_GIWorkflowMode: 0 + m_LightmapsMode: 1 + 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: + serializedVersion: 3 + m_Resolution: 2 + m_BakeResolution: 40 + m_TextureWidth: 1024 + m_TextureHeight: 1024 + m_AOMaxDistance: 1 + m_Padding: 2 + m_CompAOExponent: 0 + m_LightmapParameters: {fileID: 0} + m_TextureCompression: 1 + 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 + agentClimb: .400000006 + ledgeDropHeight: 0 + maxJumpAcrossDistance: 0 + accuratePlacement: 0 + minRegionArea: 2 + cellSize: .166666672 + manualCellSize: 0 + m_NavMeshData: {fileID: 0} +--- !u!1 &318480492 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 4: {fileID: 318480497} + - 20: {fileID: 318480496} + - 92: {fileID: 318480495} + - 124: {fileID: 318480494} + - 81: {fileID: 318480493} + - 114: {fileID: 318480498} + m_Layer: 0 + m_Name: Camera + m_TagString: MainCamera + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!81 &318480493 +AudioListener: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 318480492} + m_Enabled: 1 +--- !u!124 &318480494 +Behaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 318480492} + m_Enabled: 1 +--- !u!92 &318480495 +Behaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 318480492} + m_Enabled: 1 +--- !u!20 &318480496 +Camera: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 318480492} + 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: 75 + 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 &318480497 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 318480492} + 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: 5 +--- !u!114 &318480498 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 318480492} + 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: 100 +--- !u!1001 &375090642 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 417528, guid: c1b9b2ad3a021c549aa9190df3101248, type: 2} + propertyPath: m_LocalPosition.x + value: -16 + objectReference: {fileID: 0} + - target: {fileID: 417528, guid: c1b9b2ad3a021c549aa9190df3101248, type: 2} + propertyPath: m_LocalPosition.y + value: 24 + objectReference: {fileID: 0} + - target: {fileID: 417528, guid: c1b9b2ad3a021c549aa9190df3101248, type: 2} + propertyPath: m_LocalPosition.z + value: 20 + objectReference: {fileID: 0} + - target: {fileID: 417528, guid: c1b9b2ad3a021c549aa9190df3101248, type: 2} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 417528, guid: c1b9b2ad3a021c549aa9190df3101248, type: 2} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 417528, guid: c1b9b2ad3a021c549aa9190df3101248, type: 2} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 417528, guid: c1b9b2ad3a021c549aa9190df3101248, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 417528, guid: c1b9b2ad3a021c549aa9190df3101248, type: 2} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 11417528, guid: c1b9b2ad3a021c549aa9190df3101248, type: 2} + propertyPath: _position.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 11417528, guid: c1b9b2ad3a021c549aa9190df3101248, type: 2} + propertyPath: _position.y + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 117528, guid: c1b9b2ad3a021c549aa9190df3101248, type: 2} + propertyPath: m_Name + value: Cube_1x1x3 + objectReference: {fileID: 0} + - target: {fileID: 11417528, guid: c1b9b2ad3a021c549aa9190df3101248, type: 2} + propertyPath: _alignment + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 11417528, guid: c1b9b2ad3a021c549aa9190df3101248, type: 2} + propertyPath: _position.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: c1b9b2ad3a021c549aa9190df3101248, type: 2} + m_IsPrefabParent: 0 +--- !u!1001 &409886624 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 417528, guid: c1b9b2ad3a021c549aa9190df3101248, type: 2} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 417528, guid: c1b9b2ad3a021c549aa9190df3101248, type: 2} + propertyPath: m_LocalPosition.y + value: 16 + objectReference: {fileID: 0} + - target: {fileID: 417528, guid: c1b9b2ad3a021c549aa9190df3101248, type: 2} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 417528, guid: c1b9b2ad3a021c549aa9190df3101248, type: 2} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 417528, guid: c1b9b2ad3a021c549aa9190df3101248, type: 2} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 417528, guid: c1b9b2ad3a021c549aa9190df3101248, type: 2} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 417528, guid: c1b9b2ad3a021c549aa9190df3101248, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 417528, guid: c1b9b2ad3a021c549aa9190df3101248, type: 2} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 11417528, guid: c1b9b2ad3a021c549aa9190df3101248, type: 2} + propertyPath: _position.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 11417528, guid: c1b9b2ad3a021c549aa9190df3101248, type: 2} + propertyPath: _position.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 11417528, guid: c1b9b2ad3a021c549aa9190df3101248, type: 2} + propertyPath: _alignment + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 117528, guid: c1b9b2ad3a021c549aa9190df3101248, type: 2} + propertyPath: m_Name + value: Cube_1x1x4 + objectReference: {fileID: 0} + - target: {fileID: 11417528, guid: c1b9b2ad3a021c549aa9190df3101248, type: 2} + propertyPath: _position.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: c1b9b2ad3a021c549aa9190df3101248, type: 2} + m_IsPrefabParent: 0 +--- !u!1001 &940832437 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 453404, guid: d10e5320df9f84d4186bda0ba98db9ff, type: 2} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 453404, guid: d10e5320df9f84d4186bda0ba98db9ff, type: 2} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 453404, guid: d10e5320df9f84d4186bda0ba98db9ff, type: 2} + propertyPath: m_LocalPosition.z + value: 80 + objectReference: {fileID: 0} + - target: {fileID: 453404, guid: d10e5320df9f84d4186bda0ba98db9ff, type: 2} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 453404, guid: d10e5320df9f84d4186bda0ba98db9ff, type: 2} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 453404, guid: d10e5320df9f84d4186bda0ba98db9ff, type: 2} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 453404, guid: d10e5320df9f84d4186bda0ba98db9ff, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 453404, guid: d10e5320df9f84d4186bda0ba98db9ff, type: 2} + propertyPath: m_RootOrder + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 11453404, guid: d10e5320df9f84d4186bda0ba98db9ff, type: 2} + propertyPath: _position.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 11453404, guid: d10e5320df9f84d4186bda0ba98db9ff, type: 2} + propertyPath: _position.y + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: d10e5320df9f84d4186bda0ba98db9ff, type: 2} + m_IsPrefabParent: 0 +--- !u!1001 &1454547313 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 417528, guid: c1b9b2ad3a021c549aa9190df3101248, type: 2} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 417528, guid: c1b9b2ad3a021c549aa9190df3101248, type: 2} + propertyPath: m_LocalPosition.y + value: 32 + objectReference: {fileID: 0} + - target: {fileID: 417528, guid: c1b9b2ad3a021c549aa9190df3101248, type: 2} + propertyPath: m_LocalPosition.z + value: 60 + objectReference: {fileID: 0} + - target: {fileID: 417528, guid: c1b9b2ad3a021c549aa9190df3101248, type: 2} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 417528, guid: c1b9b2ad3a021c549aa9190df3101248, type: 2} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 417528, guid: c1b9b2ad3a021c549aa9190df3101248, type: 2} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 417528, guid: c1b9b2ad3a021c549aa9190df3101248, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 417528, guid: c1b9b2ad3a021c549aa9190df3101248, type: 2} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 117528, guid: c1b9b2ad3a021c549aa9190df3101248, type: 2} + propertyPath: m_Name + value: Cube_1x1x2 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: c1b9b2ad3a021c549aa9190df3101248, type: 2} + m_IsPrefabParent: 0 +--- !u!1001 &1818595414 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 417528, guid: c1b9b2ad3a021c549aa9190df3101248, type: 2} + propertyPath: m_LocalPosition.x + value: 16 + objectReference: {fileID: 0} + - target: {fileID: 417528, guid: c1b9b2ad3a021c549aa9190df3101248, type: 2} + propertyPath: m_LocalPosition.y + value: 24 + objectReference: {fileID: 0} + - target: {fileID: 417528, guid: c1b9b2ad3a021c549aa9190df3101248, type: 2} + propertyPath: m_LocalPosition.z + value: 40 + objectReference: {fileID: 0} + - target: {fileID: 417528, guid: c1b9b2ad3a021c549aa9190df3101248, type: 2} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 417528, guid: c1b9b2ad3a021c549aa9190df3101248, type: 2} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 417528, guid: c1b9b2ad3a021c549aa9190df3101248, type: 2} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 417528, guid: c1b9b2ad3a021c549aa9190df3101248, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 417528, guid: c1b9b2ad3a021c549aa9190df3101248, type: 2} + propertyPath: m_RootOrder + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 11417528, guid: c1b9b2ad3a021c549aa9190df3101248, type: 2} + propertyPath: _position.x + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 11417528, guid: c1b9b2ad3a021c549aa9190df3101248, type: 2} + propertyPath: _position.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 11417528, guid: c1b9b2ad3a021c549aa9190df3101248, type: 2} + propertyPath: _alignment + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 11417528, guid: c1b9b2ad3a021c549aa9190df3101248, type: 2} + propertyPath: _position.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: c1b9b2ad3a021c549aa9190df3101248, type: 2} + m_IsPrefabParent: 0 diff --git a/Assets/IsoTools/Examples/Scenes/Scene5.unity.meta b/Assets/IsoTools/Examples/Scenes/Scene5.unity.meta new file mode 100644 index 0000000..1c93fbe --- /dev/null +++ b/Assets/IsoTools/Examples/Scenes/Scene5.unity.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 4e3a5e1f68632445fa5b690650da332e +timeCreated: 1431269840 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/IsoTools/Scripts/IsoObject.cs b/Assets/IsoTools/Scripts/IsoObject.cs index af7366b..4997960 100644 --- a/Assets/IsoTools/Scripts/IsoObject.cs +++ b/Assets/IsoTools/Scripts/IsoObject.cs @@ -18,6 +18,25 @@ namespace IsoTools { [SerializeField] Vector3 _position = Vector3.zero; + + /// Isometric object position X. + public float PositionX { + get { return Position.x; } + set { Position = IsoUtils.Vec3ChangeX(Position, value); } + } + + /// Isometric object position Y. + public float PositionY { + get { return Position.y; } + set { Position = IsoUtils.Vec3ChangeY(Position, value); } + } + + /// Isometric object position Z. + public float PositionZ { + get { return Position.z; } + set { Position = IsoUtils.Vec3ChangeZ(Position, value); } + } + /// Isometric object position. public Vector3 Position { get { return _position; } @@ -29,6 +48,25 @@ namespace IsoTools { [SerializeField] Vector3 _size = Vector3.one; + + /// Isometric object size X. + public float SizeX { + get { return Size.x; } + set { Size = IsoUtils.Vec3ChangeX(Size, value); } + } + + /// Isometric object size Y. + public float SizeY { + get { return Size.y; } + set { Size = IsoUtils.Vec3ChangeY(Size, value); } + } + + /// Isometric object size Z. + public float SizeZ { + get { return Size.z; } + set { Size = IsoUtils.Vec3ChangeZ(Size, value); } + } + /// Isometric object size. public Vector3 Size { get { return _size; } diff --git a/Assets/IsoTools/Scripts/IsoUtils.cs b/Assets/IsoTools/Scripts/IsoUtils.cs index 4fc1915..be6cb5c 100644 --- a/Assets/IsoTools/Scripts/IsoUtils.cs +++ b/Assets/IsoTools/Scripts/IsoUtils.cs @@ -3,6 +3,50 @@ using System; namespace IsoTools { public class IsoUtils { + public static Vector3 Vec2OneX { + get { return new Vector2(1.0f, 0.0f); } + } + + public static Vector3 Vec2OneY { + get { return new Vector2(0.0f, 1.0f); } + } + + public static Vector3 Vec3OneX { + get { return new Vector3(1.0f, 0.0f, 0.0f); } + } + + public static Vector3 Vec3OneY { + get { return new Vector3(0.0f, 1.0f, 0.0f); } + } + + public static Vector3 Vec3OneZ { + get { return new Vector3(0.0f, 0.0f, 1.0f); } + } + + public static Vector2 Vec2FromX(float x) { + return new Vector2(x, 0.0f); + } + + public static Vector2 Vec2FromY(float y) { + return new Vector2(0.0f, y); + } + + public static Vector3 Vec3FromX(float x) { + return new Vector3(x, 0.0f, 0.0f); + } + + public static Vector3 Vec3FromY(float y) { + return new Vector3(0.0f, y, 0.0f); + } + + public static Vector3 Vec3FromZ(float z) { + return new Vector3(0.0f, 0.0f, z); + } + + public static int Sign(float v) { + return v > 0.0f ? 1 : (v == 0.0f ? 0 : -1); + } + public static void LookUpCube(Vector3 min, Vector3 max, Action act) { for ( var z = min.z; z < max.z; ++z ) { for ( var y = min.y; y < max.y; ++y ) { @@ -99,5 +143,33 @@ namespace IsoTools { Mathf.Max(a.y, b.y), Mathf.Max(a.z, b.z)); } + + public static Vector3 Vec3ChangeX(Vector3 v, float x) { + return new Vector3(x, v.y, v.z); + } + + public static Vector3 Vec3ChangeY(Vector3 v, float y) { + return new Vector3(v.x, y, v.z); + } + + public static Vector3 Vec3ChangeZ(Vector3 v, float z) { + return new Vector3(v.x, v.y, z); + } + + public static Color ColorChangeR(Color c, float r) { + return new Color(r, c.g, c.b, c.a); + } + + public static Color ColorChangeG(Color c, float g) { + return new Color(c.r, g, c.b, c.a); + } + + public static Color ColorChangeB(Color c, float b) { + return new Color(c.r, c.g, b, c.a); + } + + public static Color ColorChangeA(Color c, float a) { + return new Color(c.r, c.g, c.b, a); + } } } \ No newline at end of file diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 517dd83..5b5d2fa 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -16,6 +16,7 @@ PlayerSettings: cloudProjectId: defaultCursor: {fileID: 0} cursorHotspot: {x: 0, y: 0} + m_ShowUnitySplashScreen: 1 defaultScreenWidth: 1024 defaultScreenHeight: 768 defaultScreenWidthWeb: 960 @@ -118,6 +119,7 @@ PlayerSettings: serializedVersion: 2 rgba: 3738751484 iOSLaunchScreenFillPct: 1 + iOSLaunchScreenSize: 100 iOSLaunchScreenCustomXibPath: AndroidTargetDevice: 0 AndroidSplashScreenScale: 0 @@ -130,6 +132,7 @@ PlayerSettings: - width: 320 height: 180 banner: {fileID: 0} + androidGamepadSupportLevel: 0 resolutionDialogBanner: {fileID: 0} m_BuildTargetIcons: [] m_BuildTargetBatching: [] diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index b0ac510..de77f25 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 5.0.0f4 +m_EditorVersion: 5.0.1f1 m_StandardAssetsVersion: 0 diff --git a/UnityIso-csharp.sln b/UnityIso-csharp.sln index 68bf7e5..19e353f 100644 --- a/UnityIso-csharp.sln +++ b/UnityIso-csharp.sln @@ -3,6 +3,8 @@ Microsoft Visual Studio Solution File, Format Version 11.00 Project("{FC4F6A56-AFEC-B525-6A4B-81854AE4BE94}") = "UnityIso", "Assembly-CSharp-vs.csproj", "{7D717A69-578D-258F-954A-2360437723EF}" EndProject +Project("{FC4F6A56-AFEC-B525-6A4B-81854AE4BE94}") = "UnityIso", "Assembly-CSharp-Editor-vs.csproj", "{9DD045DD-22BE-903A-2049-EB7A7F7A784D}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -13,11 +15,15 @@ Global {7D717A69-578D-258F-954A-2360437723EF}.Debug|Any CPU.Build.0 = Debug|Any CPU {7D717A69-578D-258F-954A-2360437723EF}.Release|Any CPU.ActiveCfg = Release|Any CPU {7D717A69-578D-258F-954A-2360437723EF}.Release|Any CPU.Build.0 = Release|Any CPU + {9DD045DD-22BE-903A-2049-EB7A7F7A784D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {9DD045DD-22BE-903A-2049-EB7A7F7A784D}.Debug|Any CPU.Build.0 = Debug|Any CPU + {9DD045DD-22BE-903A-2049-EB7A7F7A784D}.Release|Any CPU.ActiveCfg = Release|Any CPU + {9DD045DD-22BE-903A-2049-EB7A7F7A784D}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection 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 0d169fe..6725127 100644 --- a/UnityIso.sln +++ b/UnityIso.sln @@ -3,6 +3,8 @@ Microsoft Visual Studio Solution File, Format Version 11.00 Project("{FC4F6A56-AFEC-B525-6A4B-81854AE4BE94}") = "UnityIso", "Assembly-CSharp.csproj", "{7D717A69-578D-258F-954A-2360437723EF}" EndProject +Project("{FC4F6A56-AFEC-B525-6A4B-81854AE4BE94}") = "UnityIso", "Assembly-CSharp-Editor.csproj", "{9DD045DD-22BE-903A-2049-EB7A7F7A784D}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -13,11 +15,15 @@ Global {7D717A69-578D-258F-954A-2360437723EF}.Debug|Any CPU.Build.0 = Debug|Any CPU {7D717A69-578D-258F-954A-2360437723EF}.Release|Any CPU.ActiveCfg = Release|Any CPU {7D717A69-578D-258F-954A-2360437723EF}.Release|Any CPU.Build.0 = Release|Any CPU + {9DD045DD-22BE-903A-2049-EB7A7F7A784D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {9DD045DD-22BE-903A-2049-EB7A7F7A784D}.Debug|Any CPU.Build.0 = Debug|Any CPU + {9DD045DD-22BE-903A-2049-EB7A7F7A784D}.Release|Any CPU.ActiveCfg = Release|Any CPU + {9DD045DD-22BE-903A-2049-EB7A7F7A784D}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection 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 7a057db..687c3df 100644 --- a/UnityIso.userprefs +++ b/UnityIso.userprefs @@ -1,10 +1,11 @@  - + - - - + + + +