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

physics wip

Browse Source
This commit is contained in:
Matvey Cherevko
2015-07-05 20:05:18 +06:00
parent 569efe5e82
commit ba3448a39b
9 changed files with 48 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Assets/IsoTools/Examples/Prefabs/Cube_1x1x1.prefab
View File

@@ -42,6 +42,8 @@ MonoBehaviour:
m_EditorClassIdentifier:
_size: {x: 1, y: 1, z: 1}
_position: {x: 0, y: 0, z: 0}
_alignment: 1
_showBounds: 0
--- !u!212 &21217528
SpriteRenderer:
m_ObjectHideFlags: 1

2
Assets/IsoTools/Examples/Prefabs/Cube_1x1x3.prefab
View File

@@ -42,6 +42,8 @@ MonoBehaviour:
m_EditorClassIdentifier:
_size: {x: 1, y: 1, z: 3}
_position: {x: 0, y: 0, z: 0}
_alignment: 1
_showBounds: 0
--- !u!212 &21263702
SpriteRenderer:
m_ObjectHideFlags: 1

2
Assets/IsoTools/Examples/Prefabs/Cube_1x3x1.prefab
View File

@@ -42,6 +42,8 @@ MonoBehaviour:
m_EditorClassIdentifier:
_size: {x: 1, y: 3, z: 1}
_position: {x: 0, y: 0, z: 0}
_alignment: 1
_showBounds: 0
--- !u!212 &21253620
SpriteRenderer:
m_ObjectHideFlags: 1

2
Assets/IsoTools/Examples/Prefabs/Cube_3x1x1.prefab
View File

@@ -42,6 +42,8 @@ MonoBehaviour:
m_EditorClassIdentifier:
_size: {x: 3, y: 1, z: 1}
_position: {x: 0, y: 0, z: 0}
_alignment: 1
_showBounds: 0
--- !u!212 &21262204
SpriteRenderer:
m_ObjectHideFlags: 1

2
Assets/IsoTools/Examples/Prefabs/Floor_3x3.prefab
View File

@@ -42,6 +42,8 @@ MonoBehaviour:
m_EditorClassIdentifier:
_size: {x: 3, y: 3, z: 0}
_position: {x: 0, y: 0, z: 0}
_alignment: 1
_showBounds: 0
--- !u!212 &21253404
SpriteRenderer:
m_ObjectHideFlags: 1

20
Assets/IsoTools/Examples/Scenes/Scene5.unity
View File

@@ -279,11 +279,11 @@ Prefab:
m_Modifications:
- target: {fileID: 417528, guid: c1b9b2ad3a021c549aa9190df3101248, type: 2}
propertyPath: m_LocalPosition.x
value: 0
value: -3.59999847
objectReference: {fileID: 0}
- target: {fileID: 417528, guid: c1b9b2ad3a021c549aa9190df3101248, type: 2}
propertyPath: m_LocalPosition.y
value: 48
value: 75.8300018
objectReference: {fileID: 0}
- target: {fileID: 417528, guid: c1b9b2ad3a021c549aa9190df3101248, type: 2}
propertyPath: m_LocalPosition.z
@@ -307,19 +307,27 @@ Prefab:
objectReference: {fileID: 0}
- target: {fileID: 417528, guid: c1b9b2ad3a021c549aa9190df3101248, type: 2}
propertyPath: m_RootOrder
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 11417528, guid: c1b9b2ad3a021c549aa9190df3101248, type: 2}
propertyPath: _position.x
value: 1
value: .626875162
objectReference: {fileID: 0}
- target: {fileID: 11417528, guid: c1b9b2ad3a021c549aa9190df3101248, type: 2}
propertyPath: _position.y
value: 1
value: .851875067
objectReference: {fileID: 0}
- target: {fileID: 11417528, guid: c1b9b2ad3a021c549aa9190df3101248, type: 2}
propertyPath: _position.z
value: 2
value: 4
objectReference: {fileID: 0}
- target: {fileID: 11417528, guid: c1b9b2ad3a021c549aa9190df3101248, type: 2}
propertyPath: _alignment
value: 0
objectReference: {fileID: 0}
- target: {fileID: 11417528, guid: c1b9b2ad3a021c549aa9190df3101248, type: 2}
propertyPath: _showBounds
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_ParentPrefab: {fileID: 100100000, guid: c1b9b2ad3a021c549aa9190df3101248, type: 2}

1
Assets/IsoTools/Scripts/IsoFakeObject.cs
View File

@@ -1,5 +1,4 @@
using UnityEngine;
using System.Collections.Generic;
namespace IsoTools {
public class IsoFakeObject : MonoBehaviour {

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

@@ -251,6 +251,16 @@ namespace IsoTools {
}
#if UNITY_EDITOR
void Reset() {
Size = Vector3.one;
Position = Vector3.zero;
}
void OnValidate() {
Size = _size;
Position = _position;
}
void OnDrawGizmos() {
if ( ShowBounds && IsoWorld ) {
IsoUtils.DrawCube(IsoWorld, Position + Size * 0.5f, Size, Color.red);

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

@@ -39,10 +39,6 @@ namespace IsoTools {
}
bool _dirty = true;
float _lastTileSize = 0.0f;
float _lastMinDepth = 0.0f;
float _lastMaxDepth = 0.0f;
List<SectorInfo> _sectors = new List<SectorInfo>();
List<ObjectInfo> _objects = new List<ObjectInfo>();
List<int> _depends = new List<int>();
@@ -155,10 +151,6 @@ namespace IsoTools {
// ------------------------------------------------------------------------
bool IsIsoObjectVisible(IsoObject iso_object) {
var renderer = iso_object.GetComponent<Renderer>();
if ( renderer && renderer.isVisible ) {
return true;
}
var renderers = iso_object.GetComponentsInChildren<Renderer>();
return renderers.Any(r => r.isVisible);
}
@@ -189,9 +181,6 @@ namespace IsoTools {
void ChangeSortingProperty() {
MarkDirty();
FixAllTransforms();
_lastTileSize = TileSize;
_lastMinDepth = MinDepth;
_lastMaxDepth = MaxDepth;
}
int SectorIndex(Vector3 num_pos) {
@@ -386,11 +375,6 @@ namespace IsoTools {
}
void LateUpdate() {
if ( Application.isEditor ) {
if ( !Mathf.Approximately(_lastTileSize, _tileSize) ) TileSize = _tileSize;
if ( !Mathf.Approximately(_lastMinDepth, _minDepth) ) MinDepth = _minDepth;
if ( !Mathf.Approximately(_lastMaxDepth, _maxDepth) ) MaxDepth = _maxDepth;
}
StepSort();
}
@@ -401,5 +385,19 @@ namespace IsoTools {
void OnDisable() {
ResetAllIsoWorld();
}
#if UNITY_EDITOR
void Reset() {
TileSize = 32.0f;
MinDepth = 0.0f;
MaxDepth = 100.0f;
}
void OnValidate() {
TileSize = _tileSize;
MinDepth = _minDepth;
MaxDepth = _maxDepth;
}
#endif
}
} // namespace IsoTools