Skip to content

Commit 75ed24d

Browse files
committed
Dont override camera from target scene
1 parent 89b1b85 commit 75ed24d

File tree

4 files changed

+4
-104
lines changed

4 files changed

+4
-104
lines changed

Assets/SharedAssets/Benchmark/Editor/PerformanceTestEditor.cs

Lines changed: 0 additions & 28 deletions
This file was deleted.

Assets/SharedAssets/Benchmark/Editor/PerformanceTestEditor.cs.meta

Lines changed: 0 additions & 11 deletions
This file was deleted.

Assets/SharedAssets/Benchmark/PerformanceTest.cs

Lines changed: 1 addition & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,7 @@ public static PerformanceTest instance
5656

5757
[SerializeField]
5858
private bool _liveRefreshGraph = true;
59-
60-
[SerializeField] private GameObject _cameraPrefab;
61-
59+
6260
[SerializeField]
6361
private EventSystem _eventSystem;
6462
public void RefreshEventSystem()
@@ -70,20 +68,7 @@ public void RefreshEventSystem()
7068

7169
private int _currentStageIndex;
7270
private PerformanceTestStage _currentStage => _stages[_currentStageIndex];
73-
74-
7571

76-
private Camera _testCamera;
77-
public Camera testCamera
78-
{
79-
get
80-
{
81-
if (_testCamera == null)
82-
CreateCamera();
83-
84-
return _testCamera;
85-
}
86-
}
8772

8873
private UIDocument _UIDocument;
8974
private TextElement _currentDataTypeLabel, _currentTimingLabel, _currentTimingUnitLabel;
@@ -251,23 +236,6 @@ static bool SceneExists(string sceneName)
251236
return false;
252237
}
253238

254-
private void CreateCamera()
255-
{
256-
GameObject go = Instantiate(_cameraPrefab);
257-
_testCamera = go.GetComponent<Camera>();
258-
//GameObject go = new GameObject("TestCamera");
259-
//_testCamera = go.AddComponent<Camera>();
260-
//var additionalData = go.AddComponent<UniversalAdditionalCameraData>();
261-
//additionalData.renderPostProcessing = true;
262-
263-
//additionalData.antialiasing = AntialiasingMode.TemporalAntiAliasing;
264-
//additionalData.sett
265-
266-
DontDestroyOnLoad(go);
267-
268-
//go.AddComponent<CinemachineBrain>();
269-
}
270-
271239
private void FinalizeTests()
272240
{
273241
Debug.Log(_sb.ToString());

Assets/SharedAssets/Benchmark/PerformanceTestStage.cs

Lines changed: 3 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
using Unity.Cinemachine;
21
using System;
32
using System.Collections;
43
using System.Collections.Generic;
@@ -18,10 +17,7 @@ public class PerformanceTestStage
1817

1918
[FormerlySerializedAs("SceneName")]
2019
public string sceneName;
21-
22-
// TODO: Remove followings
23-
public Vector3 cameraPosition;
24-
public Quaternion cameraRotation;
20+
2521
public bool useFullTimeline = true;
2622
// ENDTODO
2723

@@ -30,7 +26,6 @@ public class PerformanceTestStage
3026

3127
private int _recordingIndex = 0;
3228

33-
private Camera _testCamera => PerformanceTest.instance.testCamera;
3429
private Action _finishedAction;
3530
private PlayableDirector _playableDirector;
3631
private float _intermediateCaptureTime;
@@ -251,10 +246,6 @@ IEnumerator LoadAndInit()
251246
status = TestStageStatus.Warming;
252247
_cancelButton.text = "Stop";
253248

254-
// Debug.Log($"Start test {sceneName}");
255-
256-
_testCamera.transform.position = cameraPosition;
257-
_testCamera.transform.rotation = cameraRotation;
258249

259250
// Debug.Log($"Load Scene {sceneName}");
260251

@@ -266,9 +257,7 @@ IEnumerator LoadAndInit()
266257

267258
yield return null;
268259
PerformanceTest.instance.RefreshEventSystem();
269-
270-
DisableCamerasInScene();
271-
260+
272261
var directors = Resources.FindObjectsOfTypeAll<PlayableDirector>();
273262

274263
// Debug.Log($"Found {directors.Length} playable director(s) in the scene {SceneManager.GetActiveScene().name}");
@@ -281,13 +270,7 @@ IEnumerator LoadAndInit()
281270
if (_playableDirector != null)
282271
{
283272
_playableDirector.gameObject.SetActive(true);
284-
var playable = _playableDirector.playableAsset;
285-
if (playable.outputs.Any(o => o.outputTargetType == typeof(CinemachineBrain)))
286-
{
287-
var cinemachineTrack = playable.outputs.Single(o => o.outputTargetType == typeof(CinemachineBrain)).sourceObject;
288-
_playableDirector.SetGenericBinding(cinemachineTrack, _testCamera.GetComponent<CinemachineBrain>());
289-
}
290-
273+
291274
var duration = (float)_playableDirector.duration;
292275
_intermediateCaptureTime = duration / (PerformanceTest.instance._framesToCapture + 1);
293276

@@ -431,18 +414,6 @@ void Cancel()
431414
_cancelButton.clicked -= Cancel;
432415
}
433416

434-
private void DisableCamerasInScene()
435-
{
436-
foreach (var camera in UnityEngine.Object.FindObjectsByType<Camera>(FindObjectsSortMode.None))
437-
{
438-
// Debug.Log("Found camera: " + camera.gameObject.name);
439-
if (camera.gameObject != _testCamera.gameObject)
440-
{
441-
camera.enabled = false;
442-
}
443-
}
444-
}
445-
446417
public void RefreshDisplayedData()
447418
{
448419
if

0 commit comments

Comments
 (0)