Skip to content

Commit

Permalink
Merge branch 'develop' of https://github.com/fielddaylab/pennycookvr …
Browse files Browse the repository at this point in the history 
…into develop
  • Loading branch information
@Marebears
Marebears committed Oct 10, 2024
2 parents e28f5b9 + 87d3af7 commit 9416c18
Show file tree
Hide file tree
Showing 29 changed files with 1,308 additions and 435 deletions.
6 changes: 3 additions & 3 deletions Assets/Code/Tablet/Highlight/TabletHighlightSystem.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,17 @@ namespace Pennycook.Tablet {
public class TabletHighlightSystem : SharedStateSystemBehaviour<TabletHighlightState, TabletToolState, TabletControlState> {
public override void ProcessWork(float deltaTime) {
bool isGripping = !m_StateC.GrippedHandMask.IsEmpty;

LayerMask searchMask = m_StateB.CurrentToolDef.RaycastMask;

if (!ReferenceEquals(m_StateA.HighlightedObject, null)) {
if (!m_StateA.HighlightedObject || !m_StateA.HighlightedObject.isActiveAndEnabled || !isGripping || m_StateB.CurrentTool == TabletTool.None) {
if (!m_StateA.HighlightedObject || !m_StateA.HighlightedObject.isActiveAndEnabled || !isGripping || m_StateB.CurrentTool == TabletTool.None || searchMask == 0) {
ClearSelection(m_StateA);
return;
}
}

if (GameLoop.IsPhase(GameLoopPhase.LateFixedUpdate)) {
if (Frame.Interval(3) && isGripping && m_StateB.CurrentTool != TabletTool.None && !m_StateA.RaycastJob.IsValid()) {
LayerMask searchMask = m_StateB.CurrentToolDef.RaycastMask;
if (searchMask != 0) {
TabletZoomState zoomState = Find.State<TabletZoomState>();
float coneRadius = zoomState.ZoomMultiplier;
Expand Down
19 changes: 12 additions & 7 deletions Assets/Code/UI/ModeLabelDisplay.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,22 +4,27 @@

namespace Pennycook {
public class ModeLabelDisplay : MonoBehaviour {
public ColorPaletteTarget2 Targets;
public LayoutOffset Offset;
public RectTransform BG;

[Header("Selected State")]
public GameObject ExpandedContent;
public ColorPalette2 SelectedColors;
public Vector2 SelectedOffset;
public Vector4 SelectedBGSize;

[Header("Unselected State")]
public ColorPalette2 UnselectedColors;
public Vector2 UnselectedOffset;
public Vector4 UnselectedBGSize;

public void SetState(bool selected) {
ExpandedContent.SetActive(selected);
Offset.Offset2 = selected ? SelectedOffset : UnselectedOffset;
ColorPalette.Apply(selected ? SelectedColors : UnselectedColors, Targets);

Vector2 offsetMin, offsetMax;
Vector4 offsets = selected ? SelectedBGSize : UnselectedBGSize;

offsetMin = new Vector2(offsets.x, offsets.y);
offsetMax = new Vector2(offsets.z, offsets.w);

BG.offsetMin = offsetMin;
BG.offsetMax = offsetMax;
}
}
}
572 changes: 248 additions & 324 deletions Assets/Scenes/ExteriorScene/OcclusionCullingData.asset
View file

Large diffs are not rendered by default.

260 changes: 248 additions & 12 deletions Assets/Scenes/ExteriorScene_Logic.unity
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ OcclusionCullingSettings:
m_ObjectHideFlags: 0
serializedVersion: 2
m_OcclusionBakeSettings:
smallestOccluder: 5
smallestHole: 0.25
smallestOccluder: 4
smallestHole: 0.2
backfaceThreshold: 100
m_SceneGUID: 00000000000000000000000000000000
m_OcclusionCullingData: {fileID: 0}
m_SceneGUID: 0b74a3f6a6729a844be64612f2069143
m_OcclusionCullingData: {fileID: 36300000, guid: 462ad48aa1325594286cbcb103a68fc1, type: 2}
--- !u!104 &2
RenderSettings:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -426,6 +426,106 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 190723705942249936, guid: 6c11317d292faae45b59be04e75893d2, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 190723705942249936, guid: 6c11317d292faae45b59be04e75893d2, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 190723705942249936, guid: 6c11317d292faae45b59be04e75893d2, type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 190723705942249936, guid: 6c11317d292faae45b59be04e75893d2, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 190723705942249936, guid: 6c11317d292faae45b59be04e75893d2, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 588913201531041362, guid: 6c11317d292faae45b59be04e75893d2, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 588913201531041362, guid: 6c11317d292faae45b59be04e75893d2, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 588913201531041362, guid: 6c11317d292faae45b59be04e75893d2, type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 588913201531041362, guid: 6c11317d292faae45b59be04e75893d2, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 588913201531041362, guid: 6c11317d292faae45b59be04e75893d2, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1371866284396770231, guid: 6c11317d292faae45b59be04e75893d2, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1371866284396770231, guid: 6c11317d292faae45b59be04e75893d2, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1371866284396770231, guid: 6c11317d292faae45b59be04e75893d2, type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1371866284396770231, guid: 6c11317d292faae45b59be04e75893d2, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1371866284396770231, guid: 6c11317d292faae45b59be04e75893d2, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1441560921163515570, guid: 6c11317d292faae45b59be04e75893d2, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1441560921163515570, guid: 6c11317d292faae45b59be04e75893d2, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1441560921163515570, guid: 6c11317d292faae45b59be04e75893d2, type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1441560921163515570, guid: 6c11317d292faae45b59be04e75893d2, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1441560921163515570, guid: 6c11317d292faae45b59be04e75893d2, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4445719356462076340, guid: 6c11317d292faae45b59be04e75893d2, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4445719356462076340, guid: 6c11317d292faae45b59be04e75893d2, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4445719356462076340, guid: 6c11317d292faae45b59be04e75893d2, type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4445719356462076340, guid: 6c11317d292faae45b59be04e75893d2, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4445719356462076340, guid: 6c11317d292faae45b59be04e75893d2, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5116901402317863713, guid: 6c11317d292faae45b59be04e75893d2, type: 3}
propertyPath: m_AnchorMax.y
value: 1
Expand All @@ -436,11 +536,11 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 5116901402317863713, guid: 6c11317d292faae45b59be04e75893d2, type: 3}
propertyPath: m_SizeDelta.x
value: 36
value: 38
objectReference: {fileID: 0}
- target: {fileID: 5116901402317863713, guid: 6c11317d292faae45b59be04e75893d2, type: 3}
propertyPath: m_AnchoredPosition.x
value: 218
value: 219
objectReference: {fileID: 0}
- target: {fileID: 5116901402317863713, guid: 6c11317d292faae45b59be04e75893d2, type: 3}
propertyPath: m_AnchoredPosition.y
Expand All @@ -460,16 +560,60 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 5833352525619962568, guid: 6c11317d292faae45b59be04e75893d2, type: 3}
propertyPath: m_SizeDelta.x
value: 36
value: 38
objectReference: {fileID: 0}
- target: {fileID: 5833352525619962568, guid: 6c11317d292faae45b59be04e75893d2, type: 3}
propertyPath: m_AnchoredPosition.x
value: 146
value: 143
objectReference: {fileID: 0}
- target: {fileID: 5833352525619962568, guid: 6c11317d292faae45b59be04e75893d2, type: 3}
propertyPath: m_AnchoredPosition.y
value: -20
objectReference: {fileID: 0}
- target: {fileID: 6735257620482698504, guid: 6c11317d292faae45b59be04e75893d2, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6735257620482698504, guid: 6c11317d292faae45b59be04e75893d2, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6735257620482698504, guid: 6c11317d292faae45b59be04e75893d2, type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6735257620482698504, guid: 6c11317d292faae45b59be04e75893d2, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6735257620482698504, guid: 6c11317d292faae45b59be04e75893d2, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6822178145441617610, guid: 6c11317d292faae45b59be04e75893d2, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6822178145441617610, guid: 6c11317d292faae45b59be04e75893d2, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6822178145441617610, guid: 6c11317d292faae45b59be04e75893d2, type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6822178145441617610, guid: 6c11317d292faae45b59be04e75893d2, type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6822178145441617610, guid: 6c11317d292faae45b59be04e75893d2, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6822178145441617610, guid: 6c11317d292faae45b59be04e75893d2, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6914522443418238170, guid: 6c11317d292faae45b59be04e75893d2, type: 3}
propertyPath: m_AnchorMax.y
value: 1
Expand All @@ -480,16 +624,40 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 6914522443418238170, guid: 6c11317d292faae45b59be04e75893d2, type: 3}
propertyPath: m_SizeDelta.x
value: 36
value: 38
objectReference: {fileID: 0}
- target: {fileID: 6914522443418238170, guid: 6c11317d292faae45b59be04e75893d2, type: 3}
propertyPath: m_AnchoredPosition.x
value: 254
value: 257
objectReference: {fileID: 0}
- target: {fileID: 6914522443418238170, guid: 6c11317d292faae45b59be04e75893d2, type: 3}
propertyPath: m_AnchoredPosition.y
value: -20
objectReference: {fileID: 0}
- target: {fileID: 7778605944740610312, guid: 6c11317d292faae45b59be04e75893d2, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7778605944740610312, guid: 6c11317d292faae45b59be04e75893d2, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7778605944740610312, guid: 6c11317d292faae45b59be04e75893d2, type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7778605944740610312, guid: 6c11317d292faae45b59be04e75893d2, type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7778605944740610312, guid: 6c11317d292faae45b59be04e75893d2, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7778605944740610312, guid: 6c11317d292faae45b59be04e75893d2, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7856060652681733249, guid: 6c11317d292faae45b59be04e75893d2, type: 3}
propertyPath: m_LocalPosition.x
value: 61.10553
Expand Down Expand Up @@ -540,16 +708,84 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 8240730469472152803, guid: 6c11317d292faae45b59be04e75893d2, type: 3}
propertyPath: m_SizeDelta.x
value: 36
value: 38
objectReference: {fileID: 0}
- target: {fileID: 8240730469472152803, guid: 6c11317d292faae45b59be04e75893d2, type: 3}
propertyPath: m_AnchoredPosition.x
value: 182
value: 181
objectReference: {fileID: 0}
- target: {fileID: 8240730469472152803, guid: 6c11317d292faae45b59be04e75893d2, type: 3}
propertyPath: m_AnchoredPosition.y
value: -20
objectReference: {fileID: 0}
- target: {fileID: 8287920552672478963, guid: 6c11317d292faae45b59be04e75893d2, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8287920552672478963, guid: 6c11317d292faae45b59be04e75893d2, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8287920552672478963, guid: 6c11317d292faae45b59be04e75893d2, type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8287920552672478963, guid: 6c11317d292faae45b59be04e75893d2, type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8287920552672478963, guid: 6c11317d292faae45b59be04e75893d2, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8287920552672478963, guid: 6c11317d292faae45b59be04e75893d2, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8599231225536740155, guid: 6c11317d292faae45b59be04e75893d2, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8599231225536740155, guid: 6c11317d292faae45b59be04e75893d2, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8599231225536740155, guid: 6c11317d292faae45b59be04e75893d2, type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8599231225536740155, guid: 6c11317d292faae45b59be04e75893d2, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8599231225536740155, guid: 6c11317d292faae45b59be04e75893d2, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8936814451293657313, guid: 6c11317d292faae45b59be04e75893d2, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8936814451293657313, guid: 6c11317d292faae45b59be04e75893d2, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8936814451293657313, guid: 6c11317d292faae45b59be04e75893d2, type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8936814451293657313, guid: 6c11317d292faae45b59be04e75893d2, type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8936814451293657313, guid: 6c11317d292faae45b59be04e75893d2, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8936814451293657313, guid: 6c11317d292faae45b59be04e75893d2, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
Expand Down
469 changes: 469 additions & 0 deletions Assets/Scenes/ExteriorScene_Logic/OcclusionCullingData.asset
View file

Large diffs are not rendered by default.

8 changes: 8 additions & 0 deletions Assets/Scenes/ExteriorScene_Logic/OcclusionCullingData.asset.meta
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 9416c18

Please sign in to comment.