Skip to content

Commit d1ad990

Browse files
authored
Merge pull request #6 from ExtendRealityLtd/fix/passthrough-subprocessing
fix(PassthroughProcessor): ensure source manager logic is called
2 parents f7fb7b8 + 268409e commit d1ad990

File tree

10 files changed

+38
-28
lines changed

10 files changed

+38
-28
lines changed

Documentation/API/BasePassthroughManager.md

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ The base class for a Passthrough Manager
77
* [Inheritance]
88
* [Namespace]
99
* [Syntax]
10+
* [Properties]
11+
* [SourceManager]
1012
* [Methods]
1113
* [ActivatePassthrough()]
1214
* [DeactivatePassthrough()]
@@ -30,6 +32,18 @@ The base class for a Passthrough Manager
3032
public abstract class BasePassthroughManager : MonoBehaviour
3133
```
3234

35+
### Properties
36+
37+
#### SourceManager
38+
39+
The source [PassthroughManager] that is controlling this processor.
40+
41+
##### Declaration
42+
43+
```
44+
public PassthroughManager SourceManager { get; set; }
45+
```
46+
3347
### Methods
3448

3549
#### ActivatePassthrough()
@@ -52,12 +66,14 @@ Deactivates the passthrough mode if available.
5266
public abstract void DeactivatePassthrough()
5367
```
5468

55-
[PassthroughManager]: PassthroughManager.md
5669
[PassthroughProcessor]: PassthroughProcessor.md
5770
[Tilia.CameraRigs.OpenXR]: README.md
71+
[PassthroughManager]: PassthroughManager.md
5872
[Inheritance]: #Inheritance
5973
[Namespace]: #Namespace
6074
[Syntax]: #Syntax
75+
[Properties]: #Properties
76+
[SourceManager]: #SourceManager
6177
[Methods]: #Methods
6278
[ActivatePassthrough()]: #ActivatePassthrough
6379
[DeactivatePassthrough()]: #DeactivatePassthrough

Documentation/API/BasePassthroughManager.md.meta

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Documentation/API/OpenXRNodeRecord.md.meta

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Documentation/API/PassthroughManager.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,10 @@ Manages the state of camera passthrough on the device.
3131
* [BasePassthroughManager]
3232
* PassthroughManager
3333

34+
##### Inherited Members
35+
36+
[BasePassthroughManager.SourceManager]
37+
3438
##### Namespace
3539

3640
* [Tilia.CameraRigs.OpenXR]
@@ -183,6 +187,7 @@ protected virtual void ToggleARFoundationPassthrough(bool state)
183187
| --- | --- | --- |
184188
| System.Boolean | state | n/a |
185189

190+
[BasePassthroughManager.SourceManager]: BasePassthroughManager.md#Tilia_CameraRigs_OpenXR_BasePassthroughManager_SourceManager
186191
[Tilia.CameraRigs.OpenXR]: README.md
187192
[PassthroughManager]: PassthroughManager.md
188193
[BasePassthroughManager]: BasePassthroughManager.md

Documentation/API/PassthroughManager.md.meta

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Documentation/API/PassthroughProcessor.md

Lines changed: 5 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@ A base class to provide custom processors for vendor OpenXR extensions.
77
* [Inheritance]
88
* [Namespace]
99
* [Syntax]
10-
* [Properties]
11-
* [SourceManager]
1210
* [Methods]
1311
* [ActivatePassthrough()]
1412
* [ActivatePassthroughLogic()]
@@ -25,6 +23,10 @@ A base class to provide custom processors for vendor OpenXR extensions.
2523
* [BasePassthroughManager]
2624
* PassthroughProcessor
2725

26+
##### Inherited Members
27+
28+
[BasePassthroughManager.SourceManager]
29+
2830
##### Namespace
2931

3032
* [Tilia.CameraRigs.OpenXR]
@@ -35,18 +37,6 @@ A base class to provide custom processors for vendor OpenXR extensions.
3537
public abstract class PassthroughProcessor : BasePassthroughManager
3638
```
3739

38-
### Properties
39-
40-
#### SourceManager
41-
42-
The source [PassthroughManager] that is controlling this processor.
43-
44-
##### Declaration
45-
46-
```
47-
public PassthroughManager SourceManager { get; set; }
48-
```
49-
5040
### Methods
5141

5242
#### ActivatePassthrough()
@@ -122,15 +112,13 @@ protected virtual void SetSourceManagerState(bool state)
122112
| System.Boolean | state | n/a |
123113

124114
[BasePassthroughManager]: BasePassthroughManager.md
115+
[BasePassthroughManager.SourceManager]: BasePassthroughManager.md#Tilia_CameraRigs_OpenXR_BasePassthroughManager_SourceManager
125116
[Tilia.CameraRigs.OpenXR]: README.md
126-
[PassthroughManager]: PassthroughManager.md
127117
[BasePassthroughManager.ActivatePassthrough()]: BasePassthroughManager.md#Tilia_CameraRigs_OpenXR_BasePassthroughManager_ActivatePassthrough
128118
[BasePassthroughManager.DeactivatePassthrough()]: BasePassthroughManager.md#Tilia_CameraRigs_OpenXR_BasePassthroughManager_DeactivatePassthrough
129119
[Inheritance]: #Inheritance
130120
[Namespace]: #Namespace
131121
[Syntax]: #Syntax
132-
[Properties]: #Properties
133-
[SourceManager]: #SourceManager
134122
[Methods]: #Methods
135123
[ActivatePassthrough()]: #ActivatePassthrough
136124
[ActivatePassthroughLogic()]: #ActivatePassthroughLogic

Documentation/API/PassthroughProcessor.md.meta

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Documentation/API/README.md.meta

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Runtime/SharedResources/Scripts/PassthroughManager.cs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@ namespace Tilia.CameraRigs.OpenXR
99
/// </summary>
1010
public abstract class BasePassthroughManager : MonoBehaviour
1111
{
12+
/// <summary>
13+
/// The source <see cref="PassthroughManager"/> that is controlling this processor.
14+
/// </summary>
15+
public PassthroughManager SourceManager { get; set; }
1216
/// <summary>
1317
/// Activates the passthrough mode if available.
1418
/// </summary>
@@ -85,6 +89,7 @@ public override void ActivatePassthrough()
8589
ApplyCameraSettings();
8690
foreach (BasePassthroughManager processor in passthroughManagers)
8791
{
92+
processor.SourceManager = this;
8893
processor.ActivatePassthrough();
8994
}
9095
ToggleARFoundationPassthrough(true);
@@ -98,6 +103,7 @@ public override void DeactivatePassthrough()
98103
cachedProcessPassthroughState = ProcessCameraManager;
99104
foreach (BasePassthroughManager processor in passthroughManagers)
100105
{
106+
processor.SourceManager = this;
101107
processor.DeactivatePassthrough();
102108
}
103109
ToggleARFoundationPassthrough(false);

Runtime/SharedResources/Scripts/PassthroughProcessor.cs

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,6 @@ namespace Tilia.CameraRigs.OpenXR
55
/// </summary>
66
public abstract class PassthroughProcessor : BasePassthroughManager
77
{
8-
/// <summary>
9-
/// The source <see cref="PassthroughManager"/> that is controlling this processor.
10-
/// </summary>
11-
public PassthroughManager SourceManager { get; set; }
12-
138
/// <inheritdoc/>
149
public override void ActivatePassthrough()
1510
{

0 commit comments

Comments
 (0)