fix multi-cameras problem

This commit is contained in:
2015-08-16 18:20:48 +06:00
parent dbb2ae39a3
commit 3a0d4e3b2f
21 changed files with 1395 additions and 538 deletions

View File

@@ -42,7 +42,7 @@ Transform:
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 124842}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -23.7793617, y: 45.2162933, z: 14.0350876}
m_LocalPosition: {x: -.966036558, y: 1.8369118, z: 14.0350876}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 491986}
@@ -71,17 +71,19 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 9a9c584f9a39449438abc7ba59a68778, type: 3}
m_Name:
m_EditorClassIdentifier:
_mode: 0
_size: {x: .5, y: .5, z: .5}
_position: {x: 1.55291343, y: 3.03912354, z: .529999971}
Internal:
Dirty: 0
Visited: 0
Bounds:
m_Center: {x: -23.7793617, y: 53.2162933, z: 14.0350876}
m_Extent: {x: 8, y: 8, z: 0}
m_Center: {x: -.966036558, y: 2.16191173, z: 14.0350876}
m_Extent: {x: .324999958, y: .324999988, z: 0}
Bounds3d:
m_Center: {x: -23.7793617, y: 45.5232925, z: 14.0350876}
m_Extent: {x: .23500061, y: .23500061, z: .100000381}
m_Center: {x: -.966036558, y: 2.14391184, z: 14.0350876}
m_Extent: {x: .235000014, y: .234999955, z: .100000381}
Offset3d: 0
MinSector: {x: 0, y: 0, z: 0}
MaxSector: {x: 0, y: 0, z: 0}
_isAlignment: 0

View File

@@ -83,7 +83,7 @@ Transform:
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 199876}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 16, y: 56, z: 52.7777863}
m_LocalPosition: {x: .649999976, y: 2.27499986, z: 52.7777863}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 492676}
@@ -126,17 +126,19 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 9a9c584f9a39449438abc7ba59a68778, type: 3}
m_Name:
m_EditorClassIdentifier:
_mode: 0
_size: {x: 1, y: 1, z: 2}
_position: {x: 4, y: 3, z: 0}
Internal:
Dirty: 0
Visited: 0
Bounds:
m_Center: {x: 16, y: 80, z: 52.7777863}
m_Extent: {x: 16, y: 24, z: 0}
m_Center: {x: .649999976, y: 3.25, z: 52.7777863}
m_Extent: {x: .649999976, y: .975000024, z: 0}
Bounds3d:
m_Center: {x: 16, y: 57.375, z: 52.5777855}
m_Extent: {x: .495000362, y: .299999237, z: .0999984741}
m_Center: {x: .649999976, y: 3.64999986, z: 52.5777855}
m_Extent: {x: .495000005, y: .299999952, z: .0999984741}
Offset3d: .200000763
MinSector: {x: 0, y: 0, z: 0}
MaxSector: {x: 0, y: 0, z: 0}
_isAlignment: 1

View File

@@ -51,7 +51,7 @@ Transform:
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 129934}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 8.47999954, z: 0}
m_LocalPosition: {x: 0, y: .344499975, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 403766}
@@ -68,17 +68,19 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 9a9c584f9a39449438abc7ba59a68778, type: 3}
m_Name:
m_EditorClassIdentifier:
_mode: 0
_size: {x: 1, y: .0700000003, z: .430000007}
_position: {x: 0, y: 0, z: .529999971}
Internal:
Dirty: 0
Visited: 0
Bounds:
m_Center: {x: 7.44000006, y: 16.2000008, z: 0}
m_Extent: {x: 8.56000042, y: 7.72000027, z: 0}
m_Center: {x: .302249998, y: .658124983, z: 0}
m_Extent: {x: .347749978, y: .313624978, z: 0}
Bounds3d:
m_Center: {x: .305000007, y: 8.78999996, z: 0}
m_Extent: {x: .354999959, y: .319999695, z: .100000001}
m_Center: {x: .305000007, y: .654500008, z: 0}
m_Extent: {x: .354999959, y: .319999993, z: .100000001}
Offset3d: 0
MinSector: {x: 0, y: 0, z: 0}
MaxSector: {x: 0, y: 0, z: 0}
_isAlignment: 0

View File

@@ -51,7 +51,7 @@ Transform:
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 110900}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -28.8951912, y: 1.42384696, z: 0}
m_LocalPosition: {x: -1.17386711, y: .057843782, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 449742}
@@ -68,17 +68,19 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 9a9c584f9a39449438abc7ba59a68778, type: 3}
m_Name:
m_EditorClassIdentifier:
_mode: 0
_size: {x: .0700000003, y: 1, z: .430000007}
_position: {x: -1.34398425, y: .461965173, z: .529999971}
Internal:
Dirty: 0
Visited: 0
Bounds:
m_Center: {x: -36.3351898, y: 9.14384747, z: 0}
m_Extent: {x: 8.56000042, y: 7.72000027, z: 0}
m_Center: {x: -1.47611713, y: .371468782, z: 0}
m_Extent: {x: .347750008, y: .313624978, z: 0}
Bounds3d:
m_Center: {x: -29.2001915, y: 1.7338469, z: 0}
m_Extent: {x: .354999542, y: .315000057, z: .100000001}
m_Center: {x: -1.47886705, y: .367843807, z: 0}
m_Extent: {x: .355000019, y: .314999998, z: .100000001}
Offset3d: 0
MinSector: {x: 0, y: 0, z: 0}
MaxSector: {x: 0, y: 0, z: 0}
_isAlignment: 0

View File

@@ -43,7 +43,7 @@ Transform:
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 121016}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -39.274662, y: 38.1394615, z: 30.3571491}
m_LocalPosition: {x: -1.59553313, y: 1.54941559, z: 30.3571491}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 442418}
@@ -72,17 +72,19 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 9a9c584f9a39449438abc7ba59a68778, type: 3}
m_Name:
m_EditorClassIdentifier:
_mode: 0
_size: {x: .300000012, y: .300000012, z: .600000024}
_position: {x: .626383245, y: 3.08104968, z: .529999971}
Internal:
Dirty: 0
Visited: 0
Bounds:
m_Center: {x: -39.274662, y: 45.3394623, z: 30.3571491}
m_Extent: {x: 4.79999924, y: 7.20000076, z: 0}
m_Center: {x: -1.59553313, y: 1.84191561, z: 30.3571491}
m_Extent: {x: .194999993, y: .292500019, z: 0}
Bounds3d:
m_Center: {x: -39.274662, y: 38.4364624, z: 30.3571491}
m_Extent: {x: .165000916, y: .229999542, z: .0499992371}
m_Center: {x: -1.59553313, y: 1.84641552, z: 30.3571491}
m_Extent: {x: .164999962, y: .230000019, z: .0499992371}
Offset3d: 0
MinSector: {x: 0, y: 0, z: 0}
MaxSector: {x: 0, y: 0, z: 0}
_isAlignment: 0

View File

@@ -68,17 +68,19 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 9a9c584f9a39449438abc7ba59a68778, type: 3}
m_Name:
m_EditorClassIdentifier:
_mode: 0
_size: {x: 1, y: 1, z: .529999971}
_position: {x: 0, y: 0, z: 0}
Internal:
Dirty: 0
Visited: 0
Bounds:
m_Center: {x: 0, y: 12.2399998, z: 0}
m_Extent: {x: 16, y: 12.2399998, z: 0}
m_Center: {x: 0, y: .497249961, z: 0}
m_Extent: {x: .649999976, y: .497249961, z: 0}
Bounds3d:
m_Center: {x: 0, y: .5, z: 0}
m_Extent: {x: .660000026, y: .504999995, z: .100000001}
Offset3d: 0
MinSector: {x: 0, y: 0, z: 0}
MaxSector: {x: 0, y: 0, z: 0}
_isAlignment: 1

View File

@@ -51,7 +51,7 @@ Transform:
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 128698}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 52.3754539, y: 64.95784, z: 43.75}
m_LocalPosition: {x: 2.12775278, y: 2.6389122, z: 43.75}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 461496}
@@ -68,17 +68,19 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 9a9c584f9a39449438abc7ba59a68778, type: 3}
m_Name:
m_EditorClassIdentifier:
_mode: 0
_size: {x: .300000012, y: .300000012, z: .5}
_position: {x: 5.16659784, y: 1.89313197, z: .529999971}
Internal:
Dirty: 0
Visited: 0
Bounds:
m_Center: {x: 52.3754578, y: 71.3578415, z: 43.75}
m_Extent: {x: 4.80000114, y: 6.40000153, z: 0}
m_Center: {x: 2.12775278, y: 2.89891219, z: 43.75}
m_Extent: {x: .195000112, y: .25999999, z: 0}
Bounds3d:
m_Center: {x: 52.3754539, y: 65.2288437, z: 43.75}
m_Extent: {x: .159999847, y: .224998474, z: .0999984741}
m_Center: {x: 2.12775278, y: 2.90991211, z: 43.75}
m_Extent: {x: .160000026, y: .224999905, z: .0999984741}
Offset3d: 0
MinSector: {x: 0, y: 0, z: 0}
MaxSector: {x: 0, y: 0, z: 0}
_isAlignment: 0

View File

@@ -43,18 +43,6 @@ MonoBehaviour:
_mode: 0
_size: {x: 1, y: 1, z: 1}
_position: {x: 0, y: 0, z: 0}
Internal:
Dirty: 0
Visited: 0
Bounds:
m_Center: {x: 0, y: 16, z: 0}
m_Extent: {x: 16, y: 16, z: 0}
Bounds3d:
m_Center: {x: 0, y: 16.5, z: 0}
m_Extent: {x: 17, y: 16.5, z: .100000001}
Offset3d: 0
MinSector: {x: 0, y: 0, z: 0}
MaxSector: {x: 0, y: 0, z: 0}
_isAlignment: 1
_isShowBounds: 0
--- !u!212 &21217528

View File

@@ -43,18 +43,6 @@ MonoBehaviour:
_mode: 0
_size: {x: 1, y: 1, z: 3}
_position: {x: 0, y: 0, z: 0}
Internal:
Dirty: 0
Visited: 0
Bounds:
m_Center: {x: 0, y: 32, z: 0}
m_Extent: {x: 16, y: 32, z: 0}
Bounds3d:
m_Center: {x: 0, y: 32.5, z: 0}
m_Extent: {x: 17, y: 32.5, z: .100000001}
Offset3d: 0
MinSector: {x: 0, y: 0, z: 0}
MaxSector: {x: 0, y: 0, z: 0}
_isAlignment: 1
_isShowBounds: 0
--- !u!212 &21263702

View File

@@ -43,18 +43,6 @@ MonoBehaviour:
_mode: 0
_size: {x: 1, y: 3, z: 1}
_position: {x: 0, y: 0, z: 0}
Internal:
Dirty: 0
Visited: 0
Bounds:
m_Center: {x: -16, y: 24, z: 0}
m_Extent: {x: 32, y: 24, z: 0}
Bounds3d:
m_Center: {x: -15.9720001, y: 24.5, z: 0}
m_Extent: {x: 33, y: 24.5, z: .100000001}
Offset3d: 0
MinSector: {x: 0, y: 0, z: 0}
MaxSector: {x: 0, y: 0, z: 0}
_isAlignment: 1
_isShowBounds: 0
--- !u!212 &21253620

View File

@@ -43,18 +43,6 @@ MonoBehaviour:
_mode: 0
_size: {x: 3, y: 1, z: 1}
_position: {x: 0, y: 0, z: 0}
Internal:
Dirty: 0
Visited: 0
Bounds:
m_Center: {x: 16, y: 24, z: 0}
m_Extent: {x: 32, y: 24, z: 0}
Bounds3d:
m_Center: {x: 15.9720001, y: 24.5, z: 0}
m_Extent: {x: 33, y: 24.5, z: .100000001}
Offset3d: 0
MinSector: {x: 0, y: 0, z: 0}
MaxSector: {x: 0, y: 0, z: 0}
_isAlignment: 1
_isShowBounds: 0
--- !u!212 &21262204

View File

@@ -47,8 +47,8 @@ MonoBehaviour:
Dirty: 0
Visited: 0
Bounds:
m_Center: {x: 0, y: 8, z: 0}
m_Extent: {x: 16, y: 8, z: 0}
m_Center: {x: 0, y: .324999988, z: 0}
m_Extent: {x: .649999976, y: .324999988, z: 0}
Bounds3d:
m_Center: {x: 0, y: 8.5, z: 0}
m_Extent: {x: 17, y: 8.5, z: .100000001}

View File

@@ -43,18 +43,6 @@ MonoBehaviour:
_mode: 0
_size: {x: 3, y: 3, z: 0}
_position: {x: 0, y: 0, z: 0}
Internal:
Dirty: 0
Visited: 0
Bounds:
m_Center: {x: 0, y: 24, z: 0}
m_Extent: {x: 48, y: 24, z: 0}
Bounds3d:
m_Center: {x: 0, y: 24.5, z: 0}
m_Extent: {x: 49, y: 24.5, z: .100000001}
Offset3d: 0
MinSector: {x: 0, y: 0, z: 0}
MaxSector: {x: 0, y: 0, z: 0}
_isAlignment: 1
_isShowBounds: 0
--- !u!212 &21253404

View File

@@ -140,7 +140,7 @@ Prefab:
objectReference: {fileID: 0}
- target: {fileID: 482272, guid: c1da36e1b472b4195a4780c9d03c52de, type: 2}
propertyPath: m_LocalPosition.z
value: 46.0317535
value: 3.89999843
objectReference: {fileID: 0}
- target: {fileID: 482272, guid: c1da36e1b472b4195a4780c9d03c52de, type: 2}
propertyPath: m_LocalRotation.x
@@ -206,7 +206,7 @@ Prefab:
objectReference: {fileID: 0}
- target: {fileID: 436798, guid: a60889c79802a4d04a26f078003a2a8d, type: 2}
propertyPath: m_LocalPosition.z
value: 39.6825409
value: 3.49999881
objectReference: {fileID: 0}
- target: {fileID: 436798, guid: a60889c79802a4d04a26f078003a2a8d, type: 2}
propertyPath: m_LocalRotation.x
@@ -268,7 +268,7 @@ Prefab:
objectReference: {fileID: 0}
- target: {fileID: 414844, guid: 04fdbaa6703674aa59a45e7b9fa9fff6, type: 2}
propertyPath: m_LocalPosition.z
value: 50.793663
value: 4.19999838
objectReference: {fileID: 0}
- target: {fileID: 414844, guid: 04fdbaa6703674aa59a45e7b9fa9fff6, type: 2}
propertyPath: m_LocalRotation.x
@@ -318,7 +318,7 @@ Prefab:
objectReference: {fileID: 0}
- target: {fileID: 448996, guid: 6b1a35db98b93441a95be70a9ce3a621, type: 2}
propertyPath: m_LocalPosition.z
value: 60.317482
value: 4.79999781
objectReference: {fileID: 0}
- target: {fileID: 448996, guid: 6b1a35db98b93441a95be70a9ce3a621, type: 2}
propertyPath: m_LocalRotation.x
@@ -364,7 +364,7 @@ Prefab:
objectReference: {fileID: 0}
- target: {fileID: 417898, guid: 434e7ad177e254961b75f8d87241b959, type: 2}
propertyPath: m_LocalPosition.z
value: 34.9206314
value: 3.19999909
objectReference: {fileID: 0}
- target: {fileID: 417898, guid: 434e7ad177e254961b75f8d87241b959, type: 2}
propertyPath: m_LocalRotation.x
@@ -422,7 +422,7 @@ Prefab:
objectReference: {fileID: 0}
- target: {fileID: 410592, guid: a0ba843d4881149c5bb673dd40bb062b, type: 2}
propertyPath: m_LocalPosition.z
value: 3.17460322
value: 1.30000007
objectReference: {fileID: 0}
- target: {fileID: 410592, guid: a0ba843d4881149c5bb673dd40bb062b, type: 2}
propertyPath: m_LocalRotation.x
@@ -523,7 +523,7 @@ Prefab:
objectReference: {fileID: 0}
- target: {fileID: 432598, guid: 894bb30aabbe64b798044bee8428bc13, type: 2}
propertyPath: m_LocalPosition.z
value: 98.4127579
value: 7.19999552
objectReference: {fileID: 0}
- target: {fileID: 432598, guid: 894bb30aabbe64b798044bee8428bc13, type: 2}
propertyPath: m_LocalRotation.x
@@ -581,7 +581,7 @@ Prefab:
objectReference: {fileID: 0}
- target: {fileID: 436798, guid: a60889c79802a4d04a26f078003a2a8d, type: 2}
propertyPath: m_LocalPosition.z
value: 42.8571472
value: 3.69999862
objectReference: {fileID: 0}
- target: {fileID: 436798, guid: a60889c79802a4d04a26f078003a2a8d, type: 2}
propertyPath: m_LocalRotation.x
@@ -643,7 +643,7 @@ Prefab:
objectReference: {fileID: 0}
- target: {fileID: 423784, guid: c661fecd10ab043299884339c3ee62c5, type: 2}
propertyPath: m_LocalPosition.z
value: 85.7143326
value: 6.39999628
objectReference: {fileID: 0}
- target: {fileID: 423784, guid: c661fecd10ab043299884339c3ee62c5, type: 2}
propertyPath: m_LocalRotation.x
@@ -701,7 +701,7 @@ Prefab:
objectReference: {fileID: 0}
- target: {fileID: 482272, guid: c1da36e1b472b4195a4780c9d03c52de, type: 2}
propertyPath: m_LocalPosition.z
value: 95.2381516
value: 6.99999571
objectReference: {fileID: 0}
- target: {fileID: 482272, guid: c1da36e1b472b4195a4780c9d03c52de, type: 2}
propertyPath: m_LocalRotation.x
@@ -767,7 +767,7 @@ Prefab:
objectReference: {fileID: 0}
- target: {fileID: 414844, guid: 04fdbaa6703674aa59a45e7b9fa9fff6, type: 2}
propertyPath: m_LocalPosition.z
value: 74.6032104
value: 5.69999695
objectReference: {fileID: 0}
- target: {fileID: 414844, guid: 04fdbaa6703674aa59a45e7b9fa9fff6, type: 2}
propertyPath: m_LocalRotation.x
@@ -829,7 +829,7 @@ Prefab:
objectReference: {fileID: 0}
- target: {fileID: 482272, guid: c1da36e1b472b4195a4780c9d03c52de, type: 2}
propertyPath: m_LocalPosition.z
value: 7.93650818
value: 1.80000019
objectReference: {fileID: 0}
- target: {fileID: 482272, guid: c1da36e1b472b4195a4780c9d03c52de, type: 2}
propertyPath: m_LocalRotation.x
@@ -895,7 +895,7 @@ Prefab:
objectReference: {fileID: 0}
- target: {fileID: 482272, guid: c1da36e1b472b4195a4780c9d03c52de, type: 2}
propertyPath: m_LocalPosition.z
value: 80.9524231
value: 6.09999657
objectReference: {fileID: 0}
- target: {fileID: 482272, guid: c1da36e1b472b4195a4780c9d03c52de, type: 2}
propertyPath: m_LocalRotation.x
@@ -957,7 +957,7 @@ Prefab:
objectReference: {fileID: 0}
- target: {fileID: 482272, guid: c1da36e1b472b4195a4780c9d03c52de, type: 2}
propertyPath: m_LocalPosition.z
value: 61.9047852
value: 4.89999771
objectReference: {fileID: 0}
- target: {fileID: 482272, guid: c1da36e1b472b4195a4780c9d03c52de, type: 2}
propertyPath: m_LocalRotation.x
@@ -1023,7 +1023,7 @@ Prefab:
objectReference: {fileID: 0}
- target: {fileID: 436736, guid: 30a269be2fc864c9ea00c7a65636d543, type: 2}
propertyPath: m_LocalPosition.z
value: 58.7301788
value: 4.6999979
objectReference: {fileID: 0}
- target: {fileID: 436736, guid: 30a269be2fc864c9ea00c7a65636d543, type: 2}
propertyPath: m_LocalRotation.x
@@ -1081,7 +1081,7 @@ Prefab:
objectReference: {fileID: 0}
- target: {fileID: 436736, guid: 30a269be2fc864c9ea00c7a65636d543, type: 2}
propertyPath: m_LocalPosition.z
value: 71.4286041
value: 5.49999714
objectReference: {fileID: 0}
- target: {fileID: 436736, guid: 30a269be2fc864c9ea00c7a65636d543, type: 2}
propertyPath: m_LocalRotation.x
@@ -1139,7 +1139,7 @@ Prefab:
objectReference: {fileID: 0}
- target: {fileID: 460460, guid: d0e2c3af2985847769c6fc2e016c0e4d, type: 2}
propertyPath: m_LocalPosition.z
value: 77.7778168
value: 5.89999676
objectReference: {fileID: 0}
- target: {fileID: 460460, guid: d0e2c3af2985847769c6fc2e016c0e4d, type: 2}
propertyPath: m_LocalRotation.x
@@ -1224,7 +1224,7 @@ Prefab:
objectReference: {fileID: 0}
- target: {fileID: 452232, guid: bdd4e0dbed4fd4ea980de2f39dac8c71, type: 2}
propertyPath: m_LocalPosition.z
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 452232, guid: bdd4e0dbed4fd4ea980de2f39dac8c71, type: 2}
propertyPath: m_LocalRotation.x
@@ -1282,7 +1282,7 @@ Prefab:
objectReference: {fileID: 0}
- target: {fileID: 436798, guid: a60889c79802a4d04a26f078003a2a8d, type: 2}
propertyPath: m_LocalPosition.z
value: 1.58730161
value: 1.10000002
objectReference: {fileID: 0}
- target: {fileID: 436798, guid: a60889c79802a4d04a26f078003a2a8d, type: 2}
propertyPath: m_LocalRotation.x
@@ -1340,7 +1340,7 @@ Prefab:
objectReference: {fileID: 0}
- target: {fileID: 417898, guid: 434e7ad177e254961b75f8d87241b959, type: 2}
propertyPath: m_LocalPosition.z
value: 31.746027
value: 2.99999928
objectReference: {fileID: 0}
- target: {fileID: 417898, guid: 434e7ad177e254961b75f8d87241b959, type: 2}
propertyPath: m_LocalRotation.x
@@ -1398,7 +1398,7 @@ Prefab:
objectReference: {fileID: 0}
- target: {fileID: 482272, guid: c1da36e1b472b4195a4780c9d03c52de, type: 2}
propertyPath: m_LocalPosition.z
value: 23.8095207
value: 2.79999948
objectReference: {fileID: 0}
- target: {fileID: 482272, guid: c1da36e1b472b4195a4780c9d03c52de, type: 2}
propertyPath: m_LocalRotation.x
@@ -1464,7 +1464,7 @@ Prefab:
objectReference: {fileID: 0}
- target: {fileID: 460460, guid: d0e2c3af2985847769c6fc2e016c0e4d, type: 2}
propertyPath: m_LocalPosition.z
value: 76.1905136
value: 5.79999685
objectReference: {fileID: 0}
- target: {fileID: 460460, guid: d0e2c3af2985847769c6fc2e016c0e4d, type: 2}
propertyPath: m_LocalRotation.x
@@ -1522,7 +1522,7 @@ Prefab:
objectReference: {fileID: 0}
- target: {fileID: 414844, guid: 04fdbaa6703674aa59a45e7b9fa9fff6, type: 2}
propertyPath: m_LocalPosition.z
value: 90.4762421
value: 6.69999599
objectReference: {fileID: 0}
- target: {fileID: 414844, guid: 04fdbaa6703674aa59a45e7b9fa9fff6, type: 2}
propertyPath: m_LocalRotation.x
@@ -1584,7 +1584,7 @@ Prefab:
objectReference: {fileID: 0}
- target: {fileID: 482272, guid: c1da36e1b472b4195a4780c9d03c52de, type: 2}
propertyPath: m_LocalPosition.z
value: 17.4603157
value: 2.00000024
objectReference: {fileID: 0}
- target: {fileID: 482272, guid: c1da36e1b472b4195a4780c9d03c52de, type: 2}
propertyPath: m_LocalRotation.x
@@ -1650,7 +1650,7 @@ Prefab:
objectReference: {fileID: 0}
- target: {fileID: 499162, guid: 2adc9fee17dce4fda8f24ef16baf03a6, type: 2}
propertyPath: m_LocalPosition.z
value: 53.9682693
value: 4.39999819
objectReference: {fileID: 0}
- target: {fileID: 499162, guid: 2adc9fee17dce4fda8f24ef16baf03a6, type: 2}
propertyPath: m_LocalRotation.x
@@ -1704,7 +1704,7 @@ Prefab:
objectReference: {fileID: 0}
- target: {fileID: 482272, guid: c1da36e1b472b4195a4780c9d03c52de, type: 2}
propertyPath: m_LocalPosition.z
value: 82.5397263
value: 6.19999647
objectReference: {fileID: 0}
- target: {fileID: 482272, guid: c1da36e1b472b4195a4780c9d03c52de, type: 2}
propertyPath: m_LocalRotation.x
@@ -1770,7 +1770,7 @@ Prefab:
objectReference: {fileID: 0}
- target: {fileID: 417898, guid: 434e7ad177e254961b75f8d87241b959, type: 2}
propertyPath: m_LocalPosition.z
value: 96.8254547
value: 7.09999561
objectReference: {fileID: 0}
- target: {fileID: 417898, guid: 434e7ad177e254961b75f8d87241b959, type: 2}
propertyPath: m_LocalRotation.x
@@ -1868,7 +1868,7 @@ Prefab:
objectReference: {fileID: 0}
- target: {fileID: 491914, guid: a31c6c4f5c7a34524b7fba25b8913970, type: 2}
propertyPath: m_LocalPosition.z
value: 68.2539978
value: 5.29999733
objectReference: {fileID: 0}
- target: {fileID: 491914, guid: a31c6c4f5c7a34524b7fba25b8913970, type: 2}
propertyPath: m_LocalRotation.x
@@ -1926,7 +1926,7 @@ Prefab:
objectReference: {fileID: 0}
- target: {fileID: 483758, guid: 2fcc4079bcf674648a340948820d08bd, type: 2}
propertyPath: m_LocalPosition.z
value: 28.5714245
value: 2.69999957
objectReference: {fileID: 0}
- target: {fileID: 483758, guid: 2fcc4079bcf674648a340948820d08bd, type: 2}
propertyPath: m_LocalRotation.x
@@ -1972,7 +1972,7 @@ Prefab:
objectReference: {fileID: 0}
- target: {fileID: 417898, guid: 434e7ad177e254961b75f8d87241b959, type: 2}
propertyPath: m_LocalPosition.z
value: 87.3016357
value: 6.49999619
objectReference: {fileID: 0}
- target: {fileID: 417898, guid: 434e7ad177e254961b75f8d87241b959, type: 2}
propertyPath: m_LocalRotation.x
@@ -2030,7 +2030,7 @@ Prefab:
objectReference: {fileID: 0}
- target: {fileID: 432598, guid: 894bb30aabbe64b798044bee8428bc13, type: 2}
propertyPath: m_LocalPosition.z
value: 33.3333282
value: 3.09999919
objectReference: {fileID: 0}
- target: {fileID: 432598, guid: 894bb30aabbe64b798044bee8428bc13, type: 2}
propertyPath: m_LocalRotation.x
@@ -2154,7 +2154,7 @@ Prefab:
objectReference: {fileID: 0}
- target: {fileID: 436798, guid: a60889c79802a4d04a26f078003a2a8d, type: 2}
propertyPath: m_LocalPosition.z
value: 44.4444504
value: 3.79999852
objectReference: {fileID: 0}
- target: {fileID: 436798, guid: a60889c79802a4d04a26f078003a2a8d, type: 2}
propertyPath: m_LocalRotation.x
@@ -2216,7 +2216,7 @@ Prefab:
objectReference: {fileID: 0}
- target: {fileID: 448996, guid: 6b1a35db98b93441a95be70a9ce3a621, type: 2}
propertyPath: m_LocalPosition.z
value: 57.1428757
value: 4.599998
objectReference: {fileID: 0}
- target: {fileID: 448996, guid: 6b1a35db98b93441a95be70a9ce3a621, type: 2}
propertyPath: m_LocalRotation.x
@@ -2270,7 +2270,7 @@ Prefab:
objectReference: {fileID: 0}
- target: {fileID: 414844, guid: 04fdbaa6703674aa59a45e7b9fa9fff6, type: 2}
propertyPath: m_LocalPosition.z
value: 55.5555725
value: 4.49999809
objectReference: {fileID: 0}
- target: {fileID: 414844, guid: 04fdbaa6703674aa59a45e7b9fa9fff6, type: 2}
propertyPath: m_LocalRotation.x
@@ -2332,7 +2332,7 @@ Prefab:
objectReference: {fileID: 0}
- target: {fileID: 442828, guid: b8db6246266d74904b7ba9e26a570589, type: 2}
propertyPath: m_LocalPosition.z
value: 11.1111107
value: 2.20000005
objectReference: {fileID: 0}
- target: {fileID: 442828, guid: b8db6246266d74904b7ba9e26a570589, type: 2}
propertyPath: m_LocalRotation.x
@@ -2394,7 +2394,7 @@ Prefab:
objectReference: {fileID: 0}
- target: {fileID: 482272, guid: c1da36e1b472b4195a4780c9d03c52de, type: 2}
propertyPath: m_LocalPosition.z
value: 22.2222195
value: 2.59999967
objectReference: {fileID: 0}
- target: {fileID: 482272, guid: c1da36e1b472b4195a4780c9d03c52de, type: 2}
propertyPath: m_LocalRotation.x
@@ -2460,7 +2460,7 @@ Prefab:
objectReference: {fileID: 0}
- target: {fileID: 482272, guid: c1da36e1b472b4195a4780c9d03c52de, type: 2}
propertyPath: m_LocalPosition.z
value: 47.6190567
value: 3.99999833
objectReference: {fileID: 0}
- target: {fileID: 482272, guid: c1da36e1b472b4195a4780c9d03c52de, type: 2}
propertyPath: m_LocalRotation.x
@@ -2526,7 +2526,7 @@ Prefab:
objectReference: {fileID: 0}
- target: {fileID: 417898, guid: 434e7ad177e254961b75f8d87241b959, type: 2}
propertyPath: m_LocalPosition.z
value: 9.52380943
value: 1.90000021
objectReference: {fileID: 0}
- target: {fileID: 417898, guid: 434e7ad177e254961b75f8d87241b959, type: 2}
propertyPath: m_LocalRotation.x
@@ -2580,7 +2580,7 @@ Prefab:
objectReference: {fileID: 0}
- target: {fileID: 482272, guid: c1da36e1b472b4195a4780c9d03c52de, type: 2}
propertyPath: m_LocalPosition.z
value: 30.1587257
value: 2.89999938
objectReference: {fileID: 0}
- target: {fileID: 482272, guid: c1da36e1b472b4195a4780c9d03c52de, type: 2}
propertyPath: m_LocalRotation.x
@@ -2646,7 +2646,7 @@ Prefab:
objectReference: {fileID: 0}
- target: {fileID: 417898, guid: 434e7ad177e254961b75f8d87241b959, type: 2}
propertyPath: m_LocalPosition.z
value: 69.841301
value: 5.39999723
objectReference: {fileID: 0}
- target: {fileID: 417898, guid: 434e7ad177e254961b75f8d87241b959, type: 2}
propertyPath: m_LocalRotation.x
@@ -2704,7 +2704,7 @@ Prefab:
objectReference: {fileID: 0}
- target: {fileID: 499162, guid: 2adc9fee17dce4fda8f24ef16baf03a6, type: 2}
propertyPath: m_LocalPosition.z
value: 38.0952377
value: 3.3999989
objectReference: {fileID: 0}
- target: {fileID: 499162, guid: 2adc9fee17dce4fda8f24ef16baf03a6, type: 2}
propertyPath: m_LocalRotation.x
@@ -2762,7 +2762,7 @@ Prefab:
objectReference: {fileID: 0}
- target: {fileID: 483758, guid: 2fcc4079bcf674648a340948820d08bd, type: 2}
propertyPath: m_LocalPosition.z
value: 25.396822
value: 2.39999986
objectReference: {fileID: 0}
- target: {fileID: 483758, guid: 2fcc4079bcf674648a340948820d08bd, type: 2}
propertyPath: m_LocalRotation.x
@@ -2820,7 +2820,7 @@ Prefab:
objectReference: {fileID: 0}
- target: {fileID: 436534, guid: bb561b407d37d485387b665a832a6f5e, type: 2}
propertyPath: m_LocalPosition.z
value: 92.0635452
value: 6.7999959
objectReference: {fileID: 0}
- target: {fileID: 436534, guid: bb561b407d37d485387b665a832a6f5e, type: 2}
propertyPath: m_LocalRotation.x
@@ -2874,7 +2874,7 @@ Prefab:
objectReference: {fileID: 0}
- target: {fileID: 410592, guid: a0ba843d4881149c5bb673dd40bb062b, type: 2}
propertyPath: m_LocalPosition.z
value: 14.2857132
value: 1.60000014
objectReference: {fileID: 0}
- target: {fileID: 410592, guid: a0ba843d4881149c5bb673dd40bb062b, type: 2}
propertyPath: m_LocalRotation.x
@@ -2932,7 +2932,7 @@ Prefab:
objectReference: {fileID: 0}
- target: {fileID: 436736, guid: 30a269be2fc864c9ea00c7a65636d543, type: 2}
propertyPath: m_LocalPosition.z
value: 65.0793915
value: 5.19999743
objectReference: {fileID: 0}
- target: {fileID: 436736, guid: 30a269be2fc864c9ea00c7a65636d543, type: 2}
propertyPath: m_LocalRotation.x
@@ -2990,7 +2990,7 @@ Prefab:
objectReference: {fileID: 0}
- target: {fileID: 452232, guid: bdd4e0dbed4fd4ea980de2f39dac8c71, type: 2}
propertyPath: m_LocalPosition.z
value: 4.76190472
value: 1.20000005
objectReference: {fileID: 0}
- target: {fileID: 452232, guid: bdd4e0dbed4fd4ea980de2f39dac8c71, type: 2}
propertyPath: m_LocalRotation.x
@@ -3048,7 +3048,7 @@ Prefab:
objectReference: {fileID: 0}
- target: {fileID: 432598, guid: 894bb30aabbe64b798044bee8428bc13, type: 2}
propertyPath: m_LocalPosition.z
value: 93.6508484
value: 6.8999958
objectReference: {fileID: 0}
- target: {fileID: 432598, guid: 894bb30aabbe64b798044bee8428bc13, type: 2}
propertyPath: m_LocalRotation.x
@@ -3102,7 +3102,7 @@ Prefab:
objectReference: {fileID: 0}
- target: {fileID: 442828, guid: b8db6246266d74904b7ba9e26a570589, type: 2}
propertyPath: m_LocalPosition.z
value: 20.6349182
value: 2.29999995
objectReference: {fileID: 0}
- target: {fileID: 442828, guid: b8db6246266d74904b7ba9e26a570589, type: 2}
propertyPath: m_LocalRotation.x
@@ -3160,7 +3160,7 @@ Prefab:
objectReference: {fileID: 0}
- target: {fileID: 423784, guid: c661fecd10ab043299884339c3ee62c5, type: 2}
propertyPath: m_LocalPosition.z
value: 66.6666946
value: 5.09999752
objectReference: {fileID: 0}
- target: {fileID: 423784, guid: c661fecd10ab043299884339c3ee62c5, type: 2}
propertyPath: m_LocalRotation.x
@@ -3214,7 +3214,7 @@ Prefab:
objectReference: {fileID: 0}
- target: {fileID: 460460, guid: d0e2c3af2985847769c6fc2e016c0e4d, type: 2}
propertyPath: m_LocalPosition.z
value: 79.3651199
value: 5.99999666
objectReference: {fileID: 0}
- target: {fileID: 460460, guid: d0e2c3af2985847769c6fc2e016c0e4d, type: 2}
propertyPath: m_LocalRotation.x
@@ -3353,8 +3353,8 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
_tileSize: .649999976
_minDepth: 0
_maxDepth: 100
_stepDepth: .100000001
_startDepth: 1
--- !u!1001 &1786874107
Prefab:
m_ObjectHideFlags: 0
@@ -3372,7 +3372,7 @@ Prefab:
objectReference: {fileID: 0}
- target: {fileID: 436736, guid: 30a269be2fc864c9ea00c7a65636d543, type: 2}
propertyPath: m_LocalPosition.z
value: 52.3809662
value: 4.29999828
objectReference: {fileID: 0}
- target: {fileID: 436736, guid: 30a269be2fc864c9ea00c7a65636d543, type: 2}
propertyPath: m_LocalRotation.x
@@ -3462,7 +3462,7 @@ Prefab:
objectReference: {fileID: 0}
- target: {fileID: 482272, guid: c1da36e1b472b4195a4780c9d03c52de, type: 2}
propertyPath: m_LocalPosition.z
value: 84.1270294
value: 6.29999638
objectReference: {fileID: 0}
- target: {fileID: 482272, guid: c1da36e1b472b4195a4780c9d03c52de, type: 2}
propertyPath: m_LocalRotation.x
@@ -3528,7 +3528,7 @@ Prefab:
objectReference: {fileID: 0}
- target: {fileID: 417898, guid: 434e7ad177e254961b75f8d87241b959, type: 2}
propertyPath: m_LocalPosition.z
value: 88.8889389
value: 6.59999609
objectReference: {fileID: 0}
- target: {fileID: 417898, guid: 434e7ad177e254961b75f8d87241b959, type: 2}
propertyPath: m_LocalRotation.x
@@ -3586,7 +3586,7 @@ Prefab:
objectReference: {fileID: 0}
- target: {fileID: 417898, guid: 434e7ad177e254961b75f8d87241b959, type: 2}
propertyPath: m_LocalPosition.z
value: 73.0159073
value: 5.59999704
objectReference: {fileID: 0}
- target: {fileID: 417898, guid: 434e7ad177e254961b75f8d87241b959, type: 2}
propertyPath: m_LocalRotation.x
@@ -3644,7 +3644,7 @@ Prefab:
objectReference: {fileID: 0}
- target: {fileID: 410592, guid: a0ba843d4881149c5bb673dd40bb062b, type: 2}
propertyPath: m_LocalPosition.z
value: 15.8730145
value: 1.70000017
objectReference: {fileID: 0}
- target: {fileID: 410592, guid: a0ba843d4881149c5bb673dd40bb062b, type: 2}
propertyPath: m_LocalRotation.x
@@ -3702,7 +3702,7 @@ Prefab:
objectReference: {fileID: 0}
- target: {fileID: 436798, guid: a60889c79802a4d04a26f078003a2a8d, type: 2}
propertyPath: m_LocalPosition.z
value: 12.6984119
value: 1.50000012
objectReference: {fileID: 0}
- target: {fileID: 436798, guid: a60889c79802a4d04a26f078003a2a8d, type: 2}
propertyPath: m_LocalRotation.x
@@ -3764,7 +3764,7 @@ Prefab:
objectReference: {fileID: 0}
- target: {fileID: 452232, guid: bdd4e0dbed4fd4ea980de2f39dac8c71, type: 2}
propertyPath: m_LocalPosition.z
value: 49.2063599
value: 4.09999847
objectReference: {fileID: 0}
- target: {fileID: 452232, guid: bdd4e0dbed4fd4ea980de2f39dac8c71, type: 2}
propertyPath: m_LocalRotation.x
@@ -3818,7 +3818,7 @@ Prefab:
objectReference: {fileID: 0}
- target: {fileID: 410592, guid: a0ba843d4881149c5bb673dd40bb062b, type: 2}
propertyPath: m_LocalPosition.z
value: 6.34920645
value: 1.4000001
objectReference: {fileID: 0}
- target: {fileID: 410592, guid: a0ba843d4881149c5bb673dd40bb062b, type: 2}
propertyPath: m_LocalRotation.x
@@ -3876,7 +3876,7 @@ Prefab:
objectReference: {fileID: 0}
- target: {fileID: 483758, guid: 2fcc4079bcf674648a340948820d08bd, type: 2}
propertyPath: m_LocalPosition.z
value: 26.9841232
value: 2.49999976
objectReference: {fileID: 0}
- target: {fileID: 483758, guid: 2fcc4079bcf674648a340948820d08bd, type: 2}
propertyPath: m_LocalRotation.x
@@ -3934,7 +3934,7 @@ Prefab:
objectReference: {fileID: 0}
- target: {fileID: 452232, guid: bdd4e0dbed4fd4ea980de2f39dac8c71, type: 2}
propertyPath: m_LocalPosition.z
value: 63.4920883
value: 4.99999762
objectReference: {fileID: 0}
- target: {fileID: 452232, guid: bdd4e0dbed4fd4ea980de2f39dac8c71, type: 2}
propertyPath: m_LocalRotation.x
@@ -3992,7 +3992,7 @@ Prefab:
objectReference: {fileID: 0}
- target: {fileID: 491914, guid: a31c6c4f5c7a34524b7fba25b8913970, type: 2}
propertyPath: m_LocalPosition.z
value: 19.047617
value: 2.10000014
objectReference: {fileID: 0}
- target: {fileID: 491914, guid: a31c6c4f5c7a34524b7fba25b8913970, type: 2}
propertyPath: m_LocalRotation.x
@@ -4046,7 +4046,7 @@ Prefab:
objectReference: {fileID: 0}
- target: {fileID: 482272, guid: c1da36e1b472b4195a4780c9d03c52de, type: 2}
propertyPath: m_LocalPosition.z
value: 41.2698441
value: 3.59999871
objectReference: {fileID: 0}
- target: {fileID: 482272, guid: c1da36e1b472b4195a4780c9d03c52de, type: 2}
propertyPath: m_LocalRotation.x
@@ -4112,7 +4112,7 @@ Prefab:
objectReference: {fileID: 0}
- target: {fileID: 484502, guid: d5f51d0853f114c13906cd4c7f8e8663, type: 2}
propertyPath: m_LocalPosition.z
value: 36.5079346
value: 3.299999
objectReference: {fileID: 0}
- target: {fileID: 484502, guid: d5f51d0853f114c13906cd4c7f8e8663, type: 2}
propertyPath: m_LocalRotation.x

File diff suppressed because it is too large Load Diff

View File

@@ -163,11 +163,9 @@ namespace IsoTools {
//
// ------------------------------------------------------------------------
[System.Serializable]
public class InternalState {
public bool Dirty = false;
public bool Visited = false;
public Bounds Bounds = new Bounds();
public Bounds Bounds3d = new Bounds();
public float Offset3d = 0.0f;
public Vector3 MinSector = Vector3.zero;
@@ -227,13 +225,9 @@ namespace IsoTools {
transform.position = IsoUtils.Vec3ChangeZ(
isoWorld.IsoToScreen(position),
transform.position.z);
Internal.Bounds = IsoUtils.IsoObjectScreenBounds(isoWorld, this);
Internal.Bounds3d = IsoUtils.IsoObject3DBounds(this);
Internal.Offset3d = transform.position.z - Internal.Bounds3d.center.z;
}
FixLastProperties();
MartDirtyIsoWorld();
MarkEditorObjectDirty();
}
public void FixIsoPosition() {
@@ -256,9 +250,6 @@ namespace IsoTools {
if ( isoWorld ) {
isoWorld.MarkDirty(this);
}
}
void MarkEditorObjectDirty() {
#if UNITY_EDITOR
EditorUtility.SetDirty(this);
#endif

View File

@@ -385,21 +385,6 @@ namespace IsoTools {
: new Bounds();
}
public static Bounds IsoObjectScreenBounds(IsoWorld iso_world, IsoObject iso_object) {
if ( iso_world ) {
var z = iso_object.transform.position.z;
var b = iso_world.IsoToScreen(iso_object.position);
var t = iso_world.IsoToScreen(iso_object.position + iso_object.size);
var l = iso_world.IsoToScreen(iso_object.position + Vec3FromY(iso_object.sizeY));
var r = iso_world.IsoToScreen(iso_object.position + Vec3FromX(iso_object.sizeX));
return new Bounds(
new Vector3((r.x + l.x) * 0.5f, (t.y + b.y) * 0.5f, z),
new Vector3(r.x - l.x, t.y - b.y, Mathf.Epsilon));
} else {
return new Bounds();
}
}
public static IsoCollider IsoConvertCollider(Collider collider) {
var fake_collider = collider ? collider.GetComponent<IsoFakeCollider>() : null;
return fake_collider ? fake_collider.isoCollider : null;

View File

@@ -91,7 +91,9 @@ namespace IsoTools {
public void MarkDirty() {
if ( !_dirty ) {
_dirty = true;
MarkEditorWorldDirty();
#if UNITY_EDITOR
EditorUtility.SetDirty(this);
#endif
}
}
@@ -116,12 +118,6 @@ namespace IsoTools {
//
// ------------------------------------------------------------------------
void MarkEditorWorldDirty() {
#if UNITY_EDITOR
EditorUtility.SetDirty(this);
#endif
}
void FixAllTransforms() {
var objects_iter = _objects.GetEnumerator();
while ( objects_iter.MoveNext() ) {
@@ -134,10 +130,38 @@ namespace IsoTools {
FixAllTransforms();
}
bool IsIsoObjectVisible(IsoObject iso_object, Plane[] planes) {
return planes != null && planes.Length > 0 && iso_object.isActiveAndEnabled
? GeometryUtility.TestPlanesAABB(planes, iso_object.Internal.Bounds)
: false;
bool CheckIsoObjectChangeBounds3d(IsoObject iso_object) {
if ( iso_object.mode == IsoObject.Mode.Mode3d ) {
var bounds3d = IsoUtils.IsoObject3DBounds(iso_object);
var offset3d = iso_object.transform.position.z - bounds3d.center.z;
if ( iso_object.Internal.Bounds3d.extents != bounds3d.extents ||
!Mathf.Approximately(iso_object.Internal.Offset3d, offset3d) )
{
iso_object.Internal.Bounds3d = bounds3d;
iso_object.Internal.Offset3d = offset3d;
return true;
}
}
return false;
}
bool IsGameObjectVisible(GameObject obj) {
var renderer = obj.GetComponent<Renderer>();
if ( renderer && renderer.isVisible ) {
return true;
}
var obj_transform = obj.transform;
for ( var i = 0; i < obj_transform.childCount; ++i ) {
var child_obj = obj_transform.GetChild(i).gameObject;
if ( IsGameObjectVisible(child_obj) ) {
return true;
}
}
return false;
}
bool IsIsoObjectVisible(IsoObject iso_object) {
return IsGameObjectVisible(iso_object.gameObject);
}
bool IsIsoObjectDepends(Vector3 a_min, Vector3 a_size, Vector3 b_min, Vector3 b_size) {
@@ -347,20 +371,47 @@ namespace IsoTools {
}
void UpdateVisibles() {
Profiler.BeginSample("CalculateNewVisibles");
CalculateNewVisibles();
Profiler.EndSample();
Profiler.BeginSample("CalculateSectors");
SetupSectorSize();
SetupObjectsSectors();
SetupSectors();
Profiler.EndSample();
Profiler.BeginSample("ResolveVisibles");
ResolveVisibles();
Profiler.EndSample();
}
void CalculateNewVisibles() {
_oldVisibles.Clear();
var objects_iter = _objects.GetEnumerator();
while ( objects_iter.MoveNext() ) {
var iso_object = objects_iter.Current;
if ( IsIsoObjectVisible(iso_object) ) {
iso_object.Internal.Visited = false;
_oldVisibles.Add(iso_object);
}
}
var old_visibles = _visibles;
_visibles = _oldVisibles;
_oldVisibles = old_visibles;
}
void ResolveVisibles() {
var visibles_iter = _visibles.GetEnumerator();
while ( visibles_iter.MoveNext() ) {
var iso_object = visibles_iter.Current;
if ( iso_object.Internal.Dirty || !_oldVisibles.Contains(iso_object) ) {
iso_object.Internal.Dirty = true;
} else if ( CheckIsoObjectChangeBounds3d(iso_object) ) {
MarkDirty();
}
}
visibles_iter = _visibles.GetEnumerator();
while ( visibles_iter.MoveNext() ) {
var iso_object = visibles_iter.Current;
@@ -370,7 +421,7 @@ namespace IsoTools {
iso_object.Internal.Dirty = false;
}
}
var old_visibles_iter = _oldVisibles.GetEnumerator();
while ( old_visibles_iter.MoveNext() ) {
var iso_object = old_visibles_iter.Current;
@@ -380,24 +431,6 @@ namespace IsoTools {
}
}
}
void CalculateNewVisibles() {
var planes = Camera.current ? GeometryUtility.CalculateFrustumPlanes(Camera.current) : null;
if ( planes != null && planes.Length > 0 ) {
_oldVisibles.Clear();
var objects_iter = _objects.GetEnumerator();
while ( objects_iter.MoveNext() ) {
var iso_object = objects_iter.Current;
if ( IsIsoObjectVisible(iso_object, planes) ) {
iso_object.Internal.Visited = false;
_oldVisibles.Add(iso_object);
}
}
var old_visibles = _visibles;
_visibles = _oldVisibles;
_oldVisibles = old_visibles;
}
}
void ClearIsoObjectDepends(IsoObject iso_object) {
var their_depends_iter = iso_object.Internal.TheirDepends.GetEnumerator();
@@ -438,10 +471,16 @@ namespace IsoTools {
while ( self_depends_iter.MoveNext() ) {
depth = RecursivePlaceIsoObject(self_depends_iter.Current, depth);
}
var zoffset = iso_object.mode == IsoObject.Mode.Mode3d ? iso_object.Internal.Offset3d : 0.0f;
var extents = iso_object.mode == IsoObject.Mode.Mode3d ? iso_object.Internal.Bounds3d.extents.z : 0.0f;
PlaceIsoObject(iso_object, depth + extents + zoffset);
return depth + extents * 2.0f + stepDepth;
if ( iso_object.mode == IsoObject.Mode.Mode3d ) {
var zoffset = iso_object.Internal.Offset3d;
var extents = iso_object.Internal.Bounds3d.extents.z;
PlaceIsoObject(iso_object, depth + extents + zoffset);
return depth + extents * 2.0f + stepDepth;
} else {
PlaceIsoObject(iso_object, depth);
return depth + stepDepth;
}
}
void PlaceIsoObject(IsoObject iso_object, float depth) {

View File

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

View File

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

View File

@@ -1,9 +1,23 @@
<Properties>
<MonoDevelop.Ide.Workspace ActiveConfiguration="Debug" PreferredExecutionTarget="MonoDevelop.Default" />
<MonoDevelop.Ide.Workbench ActiveDocument="Assets/IsoTools/Examples/Scripts/AlienBallController.cs">
<MonoDevelop.Ide.Workspace ActiveConfiguration="Debug" />
<MonoDevelop.Ide.Workbench ActiveDocument="Assets/IsoTools/Scripts/IsoWorld.cs">
<Files>
<File FileName="Assets/IsoTools/Examples/Scripts/AlienBallController.cs" Line="1" Column="1" />
<File FileName="Assets/IsoTools/Scripts/IsoObject.cs" Line="163" Column="5" />
<File FileName="Assets/IsoTools/Scripts/IsoWorld.cs" Line="158" Column="37" />
</Files>
<Pads>
<Pad Id="ProjectPad">
<State expanded="True">
<Node name="Assembly-CSharp" expanded="True">
<Node name="IsoTools" expanded="True">
<Node name="Scripts" expanded="True">
<Node name="IsoWorld.cs" selected="True" />
</Node>
</Node>
</Node>
</State>
</Pad>
</Pads>
</MonoDevelop.Ide.Workbench>
<MonoDevelop.Ide.DebuggingService.Breakpoints>
<BreakpointStore />