remove snapping

This commit is contained in:
2015-07-30 22:12:04 +06:00
parent 04ea4b75cf
commit 52a96ecf44
4 changed files with 9 additions and 34 deletions

View File

@@ -182,12 +182,8 @@ namespace IsoTools {
public void FixTransform() { public void FixTransform() {
#if UNITY_EDITOR #if UNITY_EDITOR
if ( !Application.isPlaying ) { if ( !Application.isPlaying && isAlignment ) {
if ( isAlignment ) { _position = tilePosition;
_position = tilePosition;
} else if ( Selection.gameObjects.Length == 1 ) {
SnappingProcess();
}
} }
#endif #endif
transform.position = IsoUtils.Vec3ChangeZ( transform.position = IsoUtils.Vec3ChangeZ(
@@ -204,29 +200,6 @@ namespace IsoTools {
positionZ); positionZ);
} }
void SnappingProcess() {
var pos_a = position;
var size_a = size;
var iso_objects = GameObject.FindObjectsOfType<IsoObject>();
foreach ( var iso_object_b in iso_objects ) {
if ( this != iso_object_b ) {
var delta = 0.2f;
var pos_b = iso_object_b.position;
var size_b = iso_object_b.size;
for ( var i = 0; i < 3; ++i ) {
var d0 = Mathf.Abs(pos_a[i] - pos_b[i]);
var d1 = Mathf.Abs(pos_a[i] + size_a[i] - pos_b[i]);
var d2 = Mathf.Abs(pos_a[i] - pos_b[i] - size_b[i]);
var d3 = Mathf.Abs(pos_a[i] + size_a[i] - pos_b[i] - size_b[i]);
if ( d0 > Mathf.Epsilon && d0 < delta ) _position = IsoUtils.Vec3ChangeI(position, i, pos_b[i]);
if ( d1 > Mathf.Epsilon && d1 < delta ) _position = IsoUtils.Vec3ChangeI(position, i, pos_b[i] - size_a[i]);
if ( d2 > Mathf.Epsilon && d2 < delta ) _position = IsoUtils.Vec3ChangeI(position, i, pos_b[i] + size_b[i]);
if ( d3 > Mathf.Epsilon && d3 < delta ) _position = IsoUtils.Vec3ChangeI(position, i, pos_b[i] + size_b[i] - size_a[i]);
}
}
}
}
void FixLastProperties() { void FixLastProperties() {
#if UNITY_EDITOR #if UNITY_EDITOR
_lastSize = size; _lastSize = size;

View File

@@ -23,7 +23,7 @@ Global
GlobalSection(SolutionProperties) = preSolution GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE HideSolutionNode = FALSE
EndGlobalSection EndGlobalSection
GlobalSection(MonoDevelopProperties) = preSolution GlobalSection(MonoDevelopProperties) = preSolution
StartupItem = Assembly-CSharp.csproj StartupItem = Assembly-CSharp.csproj
Policies = $0 Policies = $0
$0.TextStylePolicy = $1 $0.TextStylePolicy = $1

View File

@@ -23,7 +23,7 @@ Global
GlobalSection(SolutionProperties) = preSolution GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE HideSolutionNode = FALSE
EndGlobalSection EndGlobalSection
GlobalSection(MonoDevelopProperties) = preSolution GlobalSection(MonoDevelopProperties) = preSolution
StartupItem = Assembly-CSharp.csproj StartupItem = Assembly-CSharp.csproj
Policies = $0 Policies = $0
$0.TextStylePolicy = $1 $0.TextStylePolicy = $1

View File

@@ -1,9 +1,11 @@
<Properties> <Properties>
<MonoDevelop.Ide.Workspace ActiveConfiguration="Debug" PreferredExecutionTarget="MonoDevelop.Default" /> <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug" />
<MonoDevelop.Ide.Workbench ActiveDocument="Assets/IsoTools/Scripts/IsoObject.cs"> <MonoDevelop.Ide.Workbench ActiveDocument="Assets/IsoTools/Scripts/IsoObject.cs">
<Files> <Files>
<File FileName="Assets/IsoTools/Scripts/IsoObject.cs" Line="197" Column="39" /> <File FileName="Assets/IsoTools/Scripts/IsoBoxCollider.cs" Line="1" Column="1" />
<File FileName="Assets/IsoTools/Scripts/IsoUtils.cs" Line="331" Column="36" /> <File FileName="Assets/IsoTools/Scripts/IsoObject.cs" Line="168" Column="9" />
<File FileName="Assets/IsoTools/Scripts/IsoWorld.cs" Line="1" Column="1" />
<File FileName="Assets/IsoTools/Editor/IsoObjectEditor.cs" Line="1" Column="1" />
</Files> </Files>
</MonoDevelop.Ide.Workbench> </MonoDevelop.Ide.Workbench>
<MonoDevelop.Ide.DebuggingService.Breakpoints> <MonoDevelop.Ide.DebuggingService.Breakpoints>