Skip to content

Commit f2bdb07

Browse files
arthurnishimotoarthurnishimoto
committed
UPDATE: Cleaned up Visual Studio warnings
1 parent 59f130a commit f2bdb07

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+251
-181
lines changed

‎CAVE2/Examples/CAVESimulator/Scripts/CustomHMDPerspective.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ public class CustomHMDPerspective : GeneralizedPerspectiveProjection {
1616
Vector3 displayOffset = new Vector3(0.0f, 0.0f, 0.734f);
1717

1818
[SerializeField]
19-
Transform vrDisplay;
19+
Transform vrDisplay = null;
2020

2121
protected GameObject vrCamera;
2222

@@ -43,7 +43,7 @@ public class CustomHMDPerspective : GeneralizedPerspectiveProjection {
4343
Vector3 headOriginOffset;
4444

4545
[SerializeField]
46-
Transform headOrigin;
46+
Transform headOrigin = null;
4747

4848
void Start()
4949
{

‎CAVE2/Examples/CAVESimulator/Scripts/ScreenConfigCalc.cs‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ public class ScreenConfigCalc : MonoBehaviour {
99
[SerializeField] bool regenerateDisplayWall;
1010

1111
[Header("Display Parameters")]
12-
[SerializeField] GameObject display;
12+
[SerializeField] GameObject display = null;
1313
[SerializeField] float displayWidthIncBorders = 1027; // mm
1414
[SerializeField] float displayHeightIncBorders = 581; // mm
1515

@@ -27,11 +27,11 @@ public class ScreenConfigCalc : MonoBehaviour {
2727
[SerializeField] int displaysPerColumn = 4;
2828

2929
[Header("Flat Wall Mode")]
30-
[SerializeField] bool flatWall;
31-
[SerializeField] float wallOffset; // mm
32-
[SerializeField] float displayRotation; // mm
30+
[SerializeField] bool flatWall = false;
31+
[SerializeField] float wallOffset = 0; // mm
32+
[SerializeField] float displayRotation = 0; // mm
3333

34-
[SerializeField] Transform trackingOrigin;
34+
[SerializeField] Transform trackingOrigin = null;
3535

3636
float angle;
3737

@@ -43,11 +43,11 @@ public class ScreenConfigCalc : MonoBehaviour {
4343

4444
[Header("Rendering")]
4545
[SerializeField]
46-
bool simulateDisplays;
47-
bool last_simulateDisplaysState;
46+
bool simulateDisplays = false;
47+
bool last_simulateDisplaysState = false;
4848

4949
[SerializeField]
50-
Material floorMaterial;
50+
Material floorMaterial = null;
5151

5252
[SerializeField]
5353
CAVE2ScreenMaskRenderer.RenderMode floorRenderMode = CAVE2ScreenMaskRenderer.RenderMode.Background;

‎CAVE2/Examples/Generalized Perspective Projection/Scripts/GeneralizedPerspectiveProjection.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
/**************************************************************************************************
22
*
33
*-------------------------------------------------------------------------------------------------
4-
* Copyright 2018 Electronic Visualization Laboratory, University of Illinois at Chicago
4+
* Copyright 2018-2022 Electronic Visualization Laboratory, University of Illinois at Chicago
55
* Authors:
66
* Arthur Nishimoto [email protected]
77
*-------------------------------------------------------------------------------------------------
8-
* Copyright (c) 2018, Electronic Visualization Laboratory, University of Illinois at Chicago
8+
* Copyright (c) 2018-2022, Electronic Visualization Laboratory, University of Illinois at Chicago
99
* All rights reserved.
1010
* Redistribution and use in source and binary forms, with or without modification, are permitted
1111
* provided that the following conditions are met:
@@ -58,7 +58,7 @@ public class GeneralizedPerspectiveProjection : MonoBehaviour {
5858
bool showScreenCorners = false;
5959

6060
[SerializeField]
61-
UnityEngine.UI.Text debugGUI;
61+
UnityEngine.UI.Text debugGUI = null;
6262

6363
// Use this for initialization
6464
void Start () {

‎CAVE2/Examples/Generalized Perspective Projection/Scripts/OmicronVRDisplayManager.cs‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -27,81 +27,81 @@ public class OmicronVRDisplayManagerConfig
2727
bool showUI;
2828

2929
[SerializeField]
30-
GameObject panel;
30+
GameObject panel = null;
3131

3232
[SerializeField]
33-
GeneralizedPerspectiveProjection projection;
33+
GeneralizedPerspectiveProjection projection = null;
3434

3535
[SerializeField]
36-
StereoscopicCamera stereoScript;
36+
StereoscopicCamera stereoScript = null;
3737

3838

3939
[Header("Canvas UI")]
4040

4141
[SerializeField]
42-
InputField screenUL_x;
42+
InputField screenUL_x = null;
4343

4444
[SerializeField]
45-
InputField screenUL_y;
45+
InputField screenUL_y = null;
4646

4747
[SerializeField]
48-
InputField screenUL_z;
48+
InputField screenUL_z = null;
4949

5050
Vector3 screenUL;
5151

5252
[SerializeField]
53-
InputField screenLL_x;
53+
InputField screenLL_x = null;
5454

5555
[SerializeField]
56-
InputField screenLL_y;
56+
InputField screenLL_y = null;
5757

5858
[SerializeField]
59-
InputField screenLL_z;
59+
InputField screenLL_z = null;
6060

6161
Vector3 screenLL;
6262

6363
[SerializeField]
64-
InputField screenLR_x;
64+
InputField screenLR_x = null;
6565

6666
[SerializeField]
67-
InputField screenLR_y;
67+
InputField screenLR_y = null;
6868

6969
[SerializeField]
70-
InputField screenLR_z;
70+
InputField screenLR_z = null;
7171

7272
Vector3 screenLR;
7373

7474
[SerializeField]
75-
Dropdown stereoModeMenu;
75+
Dropdown stereoModeMenu = null;
7676

7777
[SerializeField]
78-
Button invertStereo;
78+
Button invertStereo = null;
7979

8080
[SerializeField]
81-
InputField screenScale_x;
81+
InputField screenScale_x = null;
8282

8383
[SerializeField]
84-
InputField screenScale_y;
84+
InputField screenScale_y = null;
8585

8686
[SerializeField]
87-
InputField screenOffset_x;
87+
InputField screenOffset_x = null;
8888

8989
[SerializeField]
90-
InputField screenOffset_y;
90+
InputField screenOffset_y = null;
9191

9292
[SerializeField]
93-
InputField resolution_x;
93+
InputField resolution_x = null;
9494

9595
[SerializeField]
96-
InputField resolution_y;
96+
InputField resolution_y = null;
9797

9898
Vector2 stereoResolution = new Vector2(1366, 768);
9999

100100
[SerializeField]
101-
Button useCurrentResolution;
101+
Button useCurrentResolution = null;
102102

103103
[SerializeField]
104-
InputField eyeSeparation;
104+
InputField eyeSeparation = null;
105105

106106
Vector2 screenScale;
107107
Vector2 screenOffset;

‎CAVE2/Examples/Generalized Perspective Projection/Scripts/StereoscopicCamera.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
*
44
* Generates a stereoscopic camera from a main camera/
55
*-------------------------------------------------------------------------------------------------
6-
* Copyright 2018 Electronic Visualization Laboratory, University of Illinois at Chicago
6+
* Copyright 2018-2022 Electronic Visualization Laboratory, University of Illinois at Chicago
77
* Authors:
88
* Arthur Nishimoto [email protected]
99
*-------------------------------------------------------------------------------------------------
10-
* Copyright (c) 2018, Electronic Visualization Laboratory, University of Illinois at Chicago
10+
* Copyright (c) 2018-2022, Electronic Visualization Laboratory, University of Illinois at Chicago
1111
* All rights reserved.
1212
* Redistribution and use in source and binary forms, with or without modification, are permitted
1313
* provided that the following conditions are met:
@@ -33,7 +33,7 @@
3333
public class StereoscopicCamera : MonoBehaviour {
3434

3535
[SerializeField]
36-
Material stereoscopicMaterial;
36+
Material stereoscopicMaterial = null;
3737

3838
[SerializeField]
3939
bool generateCameras = false;

‎CAVE2/Examples/HoloLens/Scripts/HoloLensCameraCalibrationUI.cs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,19 @@
66
public class HoloLensCameraCalibrationUI : MonoBehaviour {
77

88
[SerializeField]
9-
bool enableKeyboardShortcuts;
9+
bool enableKeyboardShortcuts = false;
1010

1111
[SerializeField]
12-
Text cameraSettingText;
12+
Text cameraSettingText = null;
1313

1414
[SerializeField]
15-
CustomHMDPerspective hololensPerspective;
15+
CustomHMDPerspective hololensPerspective = null;
1616

1717
[SerializeField]
18-
RemoteTerminal commandLineTerminal;
18+
RemoteTerminal commandLineTerminal = null;
1919

2020
[SerializeField]
21-
bool hideCAVE2View;
21+
bool hideCAVE2View = false;
2222

2323
bool lastHideViewState;
2424

‎CAVE2/Examples/HoloLens/Scripts/HoloLensTestBuildManager.cs‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
*
44
* Editor helper script to toggle a scene between HoloLens+CAVE2 simulator mode and HoloLens build
55
*-------------------------------------------------------------------------------------------------
6-
* Copyright 2018 Electronic Visualization Laboratory, University of Illinois at Chicago
6+
* Copyright 2018-2022 Electronic Visualization Laboratory, University of Illinois at Chicago
77
* Authors:
88
* Arthur Nishimoto [email protected]
99
*-------------------------------------------------------------------------------------------------
10-
* Copyright (c) 2018, Electronic Visualization Laboratory, University of Illinois at Chicago
10+
* Copyright (c) 2018-2022, Electronic Visualization Laboratory, University of Illinois at Chicago
1111
* All rights reserved.
1212
* Redistribution and use in source and binary forms, with or without modification, are permitted
1313
* provided that the following conditions are met:
@@ -62,55 +62,55 @@ enum Mode { Simulator, Build, CAVE2Server, Remote, Playback };
6262

6363
[Header("Components")]
6464
[SerializeField]
65-
ScreenConfigCalc cave2Screen;
65+
ScreenConfigCalc cave2Screen = null;
6666

6767
[SerializeField]
68-
Camera holoLensCamera;
68+
Camera holoLensCamera = null;
6969

7070
// [SerializeField]
7171
// int currentHoloLensCameraMask;
7272

7373
[SerializeField]
74-
int VRProjectionCameraMask;
74+
int VRProjectionCameraMask = 0;
7575

7676
[SerializeField]
77-
CAVE2TransformSync headTracking;
77+
CAVE2TransformSync headTracking = null;
7878

7979
[SerializeField]
80-
CAVE2RPCManager cave2RPCManager;
80+
CAVE2RPCManager cave2RPCManager = null;
8181

8282
[SerializeField]
83-
GameObject CAVE2ScreenCover;
83+
GameObject CAVE2ScreenCover = null;
8484

8585
[SerializeField]
86-
CAVE2Manager cave2Manager;
86+
CAVE2Manager cave2Manager = null;
8787

8888
[SerializeField]
89-
CustomHMDPerspective hmdPerspective;
89+
CustomHMDPerspective hmdPerspective = null;
9090

9191
[SerializeField]
92-
getReal3DMocapUpdater serverHeadTracking;
92+
getReal3DMocapUpdater serverHeadTracking = null;
9393

9494
[SerializeField]
95-
Camera cave2SimCamera;
95+
Camera cave2SimCamera = null;
9696

9797
[SerializeField]
98-
GameObject cave2ScreenMask;
98+
GameObject cave2ScreenMask = null;
9999

100100
[SerializeField]
101-
GameObject commandLineTerminal;
101+
GameObject commandLineTerminal = null;
102102

103103
[SerializeField]
104-
RemoteTerminal remoteTerminal;
104+
RemoteTerminal remoteTerminal = null;
105105

106106
[SerializeField]
107-
GameObject hmdTerminalDisplay;
107+
GameObject hmdTerminalDisplay = null;
108108

109109
[SerializeField]
110-
GameObject remoteUIControls;
110+
GameObject remoteUIControls = null;
111111

112112
[SerializeField]
113-
GameObject calibrationObjects;
113+
GameObject calibrationObjects = null;
114114

115115
private void Start()
116116
{

‎CAVE2/Examples/Loading/Scripts/AssetBundleManager.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ struct AssetBundleInfo
88
{
99
public AssetBundle assetBundle;
1010
public bool loaded;
11-
public float loadProgress;
11+
// public float loadProgress;
1212
public AssetBundleCreateRequest request;
1313
public float startTime;
1414
}
@@ -17,7 +17,7 @@ struct AssetBundleInfo
1717
bool loadAssetBundles;
1818

1919
[SerializeField]
20-
string[] assetBundlePath;
20+
string[] assetBundlePath = null;
2121

2222
Hashtable assetBundles = new Hashtable();
2323

‎CAVE2/Examples/ProjectDescriptionUI/ProjectDescriptionCanvasUI.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ public class ProjectDescriptionCanvasUI : MonoBehaviour
55
{
66

77
[SerializeField]
8-
GameObject canvasUIRoot;
8+
GameObject canvasUIRoot = null;
99

1010
[SerializeField]
1111
bool fadeAfterDistance = false;

‎CAVE2/Examples/TrackerSimulator/SimulatedMocapSensor.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,16 @@
66
public class SimulatedMocapSensor : MonoBehaviour
77
{
88
[SerializeField]
9-
int sourceID;
9+
int sourceID = 0;
1010

1111
[SerializeField]
12-
bool addRandomJitter;
12+
bool addRandomJitter = false;
1313

1414
[SerializeField]
15-
Vector3 outputPos;
15+
Vector3 outputPos = Vector3.zero;
1616

1717
[SerializeField]
18-
Vector3 outputRot;
18+
Vector3 outputRot = Vector3.zero;
1919

2020
OmicronManager omicronManager;
2121

0 commit comments

Comments
 (0)