Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adjusted tree positions to eliminate gaps & fix collision with stone #515

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Adjusted tree positions to eliminate gaps & fix collision with stone #515

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
84 changes: 62 additions & 22 deletions UOP1_Project/Assets/Scenes/WIP/TestingGround.unity
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3488,17 +3488,17 @@ PrefabInstance:
- target: {fileID: 6434799244096359547, guid: e0b05914ae8364d8ba7a338e2355dedd,
type: 3}
propertyPath: m_LocalPosition.x
value: 10.6
value: 10.591
objectReference: {fileID: 0}
- target: {fileID: 6434799244096359547, guid: e0b05914ae8364d8ba7a338e2355dedd,
type: 3}
propertyPath: m_LocalPosition.y
value: 1.1
value: 1.001
objectReference: {fileID: 0}
- target: {fileID: 6434799244096359547, guid: e0b05914ae8364d8ba7a338e2355dedd,
type: 3}
propertyPath: m_LocalPosition.z
value: 66.4
value: 66.412
objectReference: {fileID: 0}
- target: {fileID: 6434799244096359547, guid: e0b05914ae8364d8ba7a338e2355dedd,
type: 3}
Expand Down Expand Up @@ -20867,7 +20867,7 @@ Mesh:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: pb_Mesh170068
m_Name: pb_Mesh123468
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are these names auto-generated? I didn't change any particular name during my edits.

serializedVersion: 10
m_SubMeshes:
- serializedVersion: 2
Expand Down Expand Up @@ -29634,7 +29634,7 @@ PrefabInstance:
- target: {fileID: 6434799244096359547, guid: e0b05914ae8364d8ba7a338e2355dedd,
type: 3}
propertyPath: m_LocalPosition.x
value: 32.33416
value: 27.205
objectReference: {fileID: 0}
- target: {fileID: 6434799244096359547, guid: e0b05914ae8364d8ba7a338e2355dedd,
type: 3}
Expand All @@ -29644,7 +29644,7 @@ PrefabInstance:
- target: {fileID: 6434799244096359547, guid: e0b05914ae8364d8ba7a338e2355dedd,
type: 3}
propertyPath: m_LocalPosition.z
value: 7.089737
value: 6.7
objectReference: {fileID: 0}
- target: {fileID: 6434799244096359547, guid: e0b05914ae8364d8ba7a338e2355dedd,
type: 3}
Expand Down Expand Up @@ -32568,17 +32568,17 @@ PrefabInstance:
- target: {fileID: 6434799244096359547, guid: e0b05914ae8364d8ba7a338e2355dedd,
type: 3}
propertyPath: m_LocalPosition.x
value: 99.29086
value: 98.545
objectReference: {fileID: 0}
- target: {fileID: 6434799244096359547, guid: e0b05914ae8364d8ba7a338e2355dedd,
type: 3}
propertyPath: m_LocalPosition.y
value: 7.6592407
value: 7.329
objectReference: {fileID: 0}
- target: {fileID: 6434799244096359547, guid: e0b05914ae8364d8ba7a338e2355dedd,
type: 3}
propertyPath: m_LocalPosition.z
value: 81.9494
value: 81.698
objectReference: {fileID: 0}
- target: {fileID: 6434799244096359547, guid: e0b05914ae8364d8ba7a338e2355dedd,
type: 3}
Expand Down Expand Up @@ -51444,17 +51444,17 @@ PrefabInstance:
- target: {fileID: 6434799244096359547, guid: e0b05914ae8364d8ba7a338e2355dedd,
type: 3}
propertyPath: m_LocalPosition.x
value: 41.815384
value: 41.837
objectReference: {fileID: 0}
- target: {fileID: 6434799244096359547, guid: e0b05914ae8364d8ba7a338e2355dedd,
type: 3}
propertyPath: m_LocalPosition.y
value: 6.840576
value: 6.758
objectReference: {fileID: 0}
- target: {fileID: 6434799244096359547, guid: e0b05914ae8364d8ba7a338e2355dedd,
type: 3}
propertyPath: m_LocalPosition.z
value: 94.39612
value: 94.455
objectReference: {fileID: 0}
- target: {fileID: 6434799244096359547, guid: e0b05914ae8364d8ba7a338e2355dedd,
type: 3}
Expand Down Expand Up @@ -57607,17 +57607,17 @@ PrefabInstance:
- target: {fileID: 6434799244096359547, guid: e0b05914ae8364d8ba7a338e2355dedd,
type: 3}
propertyPath: m_LocalPosition.x
value: 6.3
value: 6.158
objectReference: {fileID: 0}
- target: {fileID: 6434799244096359547, guid: e0b05914ae8364d8ba7a338e2355dedd,
type: 3}
propertyPath: m_LocalPosition.y
value: 3.4
value: 1.624
objectReference: {fileID: 0}
- target: {fileID: 6434799244096359547, guid: e0b05914ae8364d8ba7a338e2355dedd,
type: 3}
propertyPath: m_LocalPosition.z
value: 83.6
value: 83.672
objectReference: {fileID: 0}
- target: {fileID: 6434799244096359547, guid: e0b05914ae8364d8ba7a338e2355dedd,
type: 3}
Expand Down Expand Up @@ -69418,30 +69418,60 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 1657732992883833910, guid: 45632f0a227c860489bcba0eb1f4ec3e,
type: 3}
propertyPath: m_LocalRotation.w
value: 0.99914324
objectReference: {fileID: 0}
- target: {fileID: 1657732992883833910, guid: 45632f0a227c860489bcba0eb1f4ec3e,
type: 3}
propertyPath: m_LocalRotation.x
value: 0.04138582
objectReference: {fileID: 0}
- target: {fileID: 1657732992883833910, guid: 45632f0a227c860489bcba0eb1f4ec3e,
type: 3}
propertyPath: m_LocalRotation.y
value: -0.08864838
value: 0.0000000048271733
objectReference: {fileID: 0}
- target: {fileID: 1657732992883833910, guid: 45632f0a227c860489bcba0eb1f4ec3e,
type: 3}
propertyPath: m_LocalRotation.z
value: 0.026336027
value: -5.3745597e-10
objectReference: {fileID: 0}
- target: {fileID: 2808035858438402709, guid: 45632f0a227c860489bcba0eb1f4ec3e,
type: 3}
propertyPath: m_LocalRotation.x
value: 0.102249905
value: 0.10067279
objectReference: {fileID: 0}
- target: {fileID: 2808035858438402709, guid: 45632f0a227c860489bcba0eb1f4ec3e,
type: 3}
propertyPath: m_LocalRotation.y
value: -0.08917595
value: -0.000000012171336
objectReference: {fileID: 0}
- target: {fileID: 2808035858438402709, guid: 45632f0a227c860489bcba0eb1f4ec3e,
type: 3}
propertyPath: m_LocalRotation.z
value: 0.024490178
value: 0.0000000020894735
objectReference: {fileID: 0}
- target: {fileID: 2955398947125553842, guid: 45632f0a227c860489bcba0eb1f4ec3e,
type: 3}
propertyPath: m_LocalRotation.w
value: 0.99204165
objectReference: {fileID: 0}
- target: {fileID: 2955398947125553842, guid: 45632f0a227c860489bcba0eb1f4ec3e,
type: 3}
propertyPath: m_LocalRotation.x
value: 0.12591039
objectReference: {fileID: 0}
- target: {fileID: 2955398947125553842, guid: 45632f0a227c860489bcba0eb1f4ec3e,
type: 3}
propertyPath: m_LocalRotation.y
value: -0.000000020553632
objectReference: {fileID: 0}
- target: {fileID: 2955398947125553842, guid: 45632f0a227c860489bcba0eb1f4ec3e,
type: 3}
propertyPath: m_LocalRotation.z
value: 0.0000000040692134
objectReference: {fileID: 0}
- target: {fileID: 8745341640208226293, guid: 45632f0a227c860489bcba0eb1f4ec3e,
type: 3}
Expand Down Expand Up @@ -69503,15 +69533,25 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8745341642014614482, guid: 45632f0a227c860489bcba0eb1f4ec3e,
type: 3}
propertyPath: m_LocalRotation.w
value: 0.9971113
objectReference: {fileID: 0}
- target: {fileID: 8745341642014614482, guid: 45632f0a227c860489bcba0eb1f4ec3e,
type: 3}
propertyPath: m_LocalRotation.x
value: 0.07595423
objectReference: {fileID: 0}
- target: {fileID: 8745341642014614482, guid: 45632f0a227c860489bcba0eb1f4ec3e,
type: 3}
propertyPath: m_LocalRotation.y
value: -0.000000034152926
value: 0.000000017157081
objectReference: {fileID: 0}
- target: {fileID: 8745341642014614482, guid: 45632f0a227c860489bcba0eb1f4ec3e,
type: 3}
propertyPath: m_LocalRotation.z
value: 0.0000000071440547
value: -0.0000000013068696
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 45632f0a227c860489bcba0eb1f4ec3e, type: 3}
Expand Down