Skip to content

Commit

Permalink
#2 #4 moar fixes before demo. Height offset for pointer not working
Browse files Browse the repository at this point in the history
  • Loading branch information
@Yisas @vladimirdlc
Yisas authored and vladimirdlc committed Mar 3, 2017
1 parent af321ca commit d975480
Show file tree
Hide file tree
Showing 5 changed files with 171 additions and 74 deletions.
227 changes: 160 additions & 67 deletions Assets/PATimeRefactor/Assets/_Scenes/ProtoDemo w Overseer & doors & FPCamera.unity
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2581,12 +2581,6 @@ MeshFilter:
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 481006215}
m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
--- !u!114 &487745951 stripped
MonoBehaviour:
m_PrefabParentObject: {fileID: 114453480206080400, guid: 830eaf2f6e360bf428bd57f4ca1780de,
type: 2}
m_PrefabInternal: {fileID: 1765468880}
m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
--- !u!1 &489868668 stripped
GameObject:
m_PrefabParentObject: {fileID: 1649229833953150, guid: 868df6ca073273b46b0d14bf91e88925,
Expand Down Expand Up @@ -3202,6 +3196,28 @@ Transform:
m_Father: {fileID: 1861190822}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!84 &615907694
RenderTexture:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_Name:
m_ImageContentsHash:
serializedVersion: 2
Hash: 00000000000000000000000000000000
m_Width: 340
m_Height: 1067
m_AntiAliasing: 2
m_DepthFormat: 2
m_ColorFormat: 0
m_MipMap: 0
m_GenerateMips: 1
m_SRGB: 0
m_TextureSettings:
m_FilterMode: 1
m_Aniso: 1
m_MipBias: 0
m_WrapMode: 1
--- !u!1 &629278006
GameObject:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -3403,27 +3419,20 @@ Prefab:
propertyPath: m_RootOrder
value: 10
objectReference: {fileID: 0}
- target: {fileID: 20551704322287536, guid: 0537e9a616f190341a12297467c884f9,
type: 2}
propertyPath: m_TargetTexture
value:
objectReference: {fileID: 1149508456}
- target: {fileID: 114630475340081652, guid: 0537e9a616f190341a12297467c884f9,
type: 2}
propertyPath: target
value:
objectReference: {fileID: 1748680021}
- target: {fileID: 4169482997131992, guid: 0537e9a616f190341a12297467c884f9, type: 2}
propertyPath: m_LocalEulerAnglesHint.x
value: 37.571003
objectReference: {fileID: 0}
- target: {fileID: 4169482997131992, guid: 0537e9a616f190341a12297467c884f9, type: 2}
propertyPath: m_LocalEulerAnglesHint.y
value: -290.875
objectReference: {fileID: 0}
- target: {fileID: 4169482997131992, guid: 0537e9a616f190341a12297467c884f9, type: 2}
propertyPath: m_LocalEulerAnglesHint.z
value: -358.5
- target: {fileID: 20551704322287536, guid: 0537e9a616f190341a12297467c884f9,
type: 2}
propertyPath: m_TargetTexture
value:
objectReference: {fileID: 615907694}
- target: {fileID: 114763695715970150, guid: 0537e9a616f190341a12297467c884f9,
type: 2}
propertyPath: pointerInstantiateHeightOffset
value: 50
objectReference: {fileID: 0}
m_RemovedComponents: []
m_ParentPrefab: {fileID: 100100000, guid: 0537e9a616f190341a12297467c884f9, type: 2}
Expand Down Expand Up @@ -3786,6 +3795,112 @@ MeshFilter:
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 684124390}
m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
--- !u!1001 &709686471
Prefab:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 224295921807954936, guid: cb6030357059aed43adc22a45757549d,
type: 2}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 224295921807954936, guid: cb6030357059aed43adc22a45757549d,
type: 2}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 224295921807954936, guid: cb6030357059aed43adc22a45757549d,
type: 2}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 224295921807954936, guid: cb6030357059aed43adc22a45757549d,
type: 2}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 224295921807954936, guid: cb6030357059aed43adc22a45757549d,
type: 2}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 224295921807954936, guid: cb6030357059aed43adc22a45757549d,
type: 2}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 224295921807954936, guid: cb6030357059aed43adc22a45757549d,
type: 2}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 224295921807954936, guid: cb6030357059aed43adc22a45757549d,
type: 2}
propertyPath: m_RootOrder
value: 11
objectReference: {fileID: 0}
- target: {fileID: 224295921807954936, guid: cb6030357059aed43adc22a45757549d,
type: 2}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 224295921807954936, guid: cb6030357059aed43adc22a45757549d,
type: 2}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 224295921807954936, guid: cb6030357059aed43adc22a45757549d,
type: 2}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 224295921807954936, guid: cb6030357059aed43adc22a45757549d,
type: 2}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 224295921807954936, guid: cb6030357059aed43adc22a45757549d,
type: 2}
propertyPath: m_AnchorMin.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 224295921807954936, guid: cb6030357059aed43adc22a45757549d,
type: 2}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 224295921807954936, guid: cb6030357059aed43adc22a45757549d,
type: 2}
propertyPath: m_AnchorMax.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 224295921807954936, guid: cb6030357059aed43adc22a45757549d,
type: 2}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 224295921807954936, guid: cb6030357059aed43adc22a45757549d,
type: 2}
propertyPath: m_Pivot.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 224295921807954936, guid: cb6030357059aed43adc22a45757549d,
type: 2}
propertyPath: m_Pivot.y
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_ParentPrefab: {fileID: 100100000, guid: cb6030357059aed43adc22a45757549d, type: 2}
m_IsPrefabParent: 0
--- !u!114 &709686472 stripped
MonoBehaviour:
m_PrefabParentObject: {fileID: 114439050949252640, guid: cb6030357059aed43adc22a45757549d,
type: 2}
m_PrefabInternal: {fileID: 709686471}
m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
--- !u!1 &717686804
GameObject:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -5100,7 +5215,7 @@ Prefab:
type: 2}
propertyPath: m_Text
value:
objectReference: {fileID: 487745951}
objectReference: {fileID: 709686472}
m_RemovedComponents: []
m_ParentPrefab: {fileID: 100100000, guid: e5a7480f3b45b014b8ea6dc91b24b1ef, type: 2}
m_IsPrefabParent: 0
Expand Down Expand Up @@ -5556,28 +5671,6 @@ MeshFilter:
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1131611211}
m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
--- !u!84 &1139604485
RenderTexture:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_Name:
m_ImageContentsHash:
serializedVersion: 2
Hash: 00000000000000000000000000000000
m_Width: 1185
m_Height: 603
m_AntiAliasing: 2
m_DepthFormat: 2
m_ColorFormat: 0
m_MipMap: 0
m_GenerateMips: 1
m_SRGB: 0
m_TextureSettings:
m_FilterMode: 1
m_Aniso: 1
m_MipBias: 0
m_WrapMode: 1
--- !u!1 &1146710816
GameObject:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -5659,28 +5752,6 @@ MeshFilter:
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1146710816}
m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
--- !u!84 &1149508456
RenderTexture:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_Name:
m_ImageContentsHash:
serializedVersion: 2
Hash: 00000000000000000000000000000000
m_Width: 1185
m_Height: 603
m_AntiAliasing: 2
m_DepthFormat: 2
m_ColorFormat: 0
m_MipMap: 0
m_GenerateMips: 1
m_SRGB: 0
m_TextureSettings:
m_FilterMode: 1
m_Aniso: 1
m_MipBias: 0
m_WrapMode: 1
--- !u!1 &1160770763
GameObject:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -6295,6 +6366,28 @@ MeshFilter:
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1346843008}
m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0}
--- !u!84 &1351568764
RenderTexture:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_Name:
m_ImageContentsHash:
serializedVersion: 2
Hash: 00000000000000000000000000000000
m_Width: 1906
m_Height: 1107
m_AntiAliasing: 2
m_DepthFormat: 2
m_ColorFormat: 0
m_MipMap: 0
m_GenerateMips: 1
m_SRGB: 0
m_TextureSettings:
m_FilterMode: 1
m_Aniso: 1
m_MipBias: 0
m_WrapMode: 1
--- !u!1 &1358908893
GameObject:
m_ObjectHideFlags: 0
Expand Down
7 changes: 4 additions & 3 deletions Assets/Prefabs/Overseer/Overseer Camera.prefab
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,14 +60,14 @@ Transform:
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1743480622849158}
m_LocalRotation: {x: 0.6003833, y: 0.3951368, z: -0.3978797, w: 0.5701742}
m_LocalPosition: {x: 103.93, y: 9.37, z: -20.56}
m_LocalRotation: {x: 0.27219734, y: 0.53356946, z: -0.17246751, w: 0.7819637}
m_LocalPosition: {x: -3.94, y: 11.67, z: 0.5}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 4177683222155914}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 87.54201, y: -140.695, z: -208.928}
m_LocalEulerAnglesHint: {x: 37.571003, y: -290.875, z: -358.5}
--- !u!4 &4177683222155914
Transform:
m_ObjectHideFlags: 1
Expand Down Expand Up @@ -357,6 +357,7 @@ MonoBehaviour:
verticalAxis: Vertical Right Stick Overseer
beaconButton: Overseer Beacon
autoHidePointer: 1
pointerInstantiateHeightOffset: 2.774
beaconContainerPrefab: {fileID: 1166831496739124, guid: 91b3a489d25cb294689da4a02db3e063,
type: 2}
beaconPrefab: {fileID: 1627837743720578, guid: 43877f32af5efef4b84770a02b17302b,
Expand Down
7 changes: 5 additions & 2 deletions Assets/Scripts/Controls/OverSeer/OSPointer.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@ public class OSPointer : MonoBehaviour

public bool autoHidePointer;

[Tooltip("This will be added to the starting position of the arrow")]
public float pointerInstantiateHeightOffset;

public GameObject beaconContainerPrefab;
public GameObject beaconPrefab;
private Transform pointer;
Expand Down Expand Up @@ -50,7 +53,7 @@ void Update()
}

var lookPos = cam.transform.position - pointer.position;
lookPos.y = 0;
lookPos.y = pointerInstantiateHeightOffset;
var rotation = Quaternion.LookRotation(lookPos);
pointer.rotation = rotation;

Expand All @@ -66,7 +69,7 @@ void Update()

if (teleportPointer)
{
pointer.position = new Vector3(cam.followTarget.position.x, pointer.position.y, cam.followTarget.position.z);
pointer.position = new Vector3(cam.followTarget.position.x, cam.followTarget.position.y + pointerInstantiateHeightOffset, cam.followTarget.position.z);
teleportPointer = false;
}

Expand Down
2 changes: 1 addition & 1 deletion ProjectSettings/DynamicsManager.asset
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@ PhysicsManager:
m_QueriesHitTriggers: 0
m_EnableAdaptiveForce: 0
m_EnablePCM: 1
m_LayerCollisionMatrix: ffffffffffffffffffffffffffffffffffffefffffffffffffffffffffffffffffffffffffffffffffffffffffb7fffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffefffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
m_LayerCollisionMatrix: ffffffffffffffffffffffffffffffffffff6fffffff7fffffffffffffffffffffffffffffffffffffff7fffffb7ffffffff7ffffffffffffff77fffffffffffffffffffffff7fffffff7fffffff7fffefff7fffffffffffffff7fffcfaba1ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
2 changes: 1 addition & 1 deletion ProjectSettings/TagManager.asset
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ TagManager:
- Animal
- Door DELETEME
- Puppy AI
-
- OSPointer
-
-
-
Expand Down

0 comments on commit d975480

Please sign in to comment.