Merge pull request #44 from De-Panther/webxrmanager_singleton

De-Panther · web-flow · commit 3156232ee756 · 2020-06-09T20:41:45.000+03:00
WebXRManager Singleton
diff --git a/Assets/WebXR/Scripts/WebXRManager.cs b/Assets/WebXR/Scripts/WebXRManager.cs
@@ -94,7 +94,12 @@ public static WebXRManager Instance
     private void Awake()
     {
       Debug.Log("Active Graphics Tier: " + Graphics.activeTier);
-      instance = this;
+      if (null == instance) {
+        instance = this;
+      } else if (instance != this) {
+        Destroy(gameObject);
+      }
+
       if (instance.dontDestroyOnLoad)
       {
         DontDestroyOnLoad(instance);

Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,12 @@ public static WebXRManager Instance`
`94`	`94`	`private void Awake()`
`95`	`95`	`{`
`96`	`96`	`Debug.Log("Active Graphics Tier: " + Graphics.activeTier);`
`97`		`- instance = this;`
	`97`	`+ if (null == instance) {`
	`98`	`+ instance = this;`
	`99`	`+ } else if (instance != this) {`
	`100`	`+ Destroy(gameObject);`
	`101`	`+ }`
	`102`	`+`
`98`	`103`	`if (instance.dontDestroyOnLoad)`
`99`	`104`	`{`
`100`	`105`	`DontDestroyOnLoad(instance);`