Added renderAardvarkRoot function

This function makes it easier to deal with browser vs. gadget modes and handles waiting for the gadget to connect before creating anything.

packages/aardvark-react/src/aardvark_render.tsx

@@ -0,0 +1,52 @@
+import { Av } from '@aardvarkxr/aardvark-shared';
+import * as React from 'react';
+import * as ReactDOM from 'react-dom';
+import { AvGadget } from './aardvark_gadget';
+import { DefaultLanding } from './default_landing_page';
+
+
+/** Uses ReactDOM to render the appropriate main component. If The gadget is running in Aardvark,
+ * this function will wait for it to connect to the local Aardvark server and then render gadgetMain.
+ * If the gadget is running in another browser this function will render browserMain.
+ * 
+ * @param element the element to render on or the ID of an element
+ * @param gadgetMain The React component to render when running in Aardvark.
+ * @param browserMain The React component to render when running in another browser. If this is undefined
+ * 						an instance of DefaultLanding will be rendered.
+ */
+export async function renderAardvarkRoot( element: HTMLElement | string, 
+	gadgetMain: JSX.Element | ( () => JSX.Element ), browserMain?: JSX.Element | ( () => JSX.Element ) )
+{
+	if( typeof element == "string" )
+	{
+		element = document.getElementById( element );
+	}
+
+	let main: JSX.Element;
+	if( !Av() )
+	{
+		if( !browserMain )
+		{
+			browserMain = <DefaultLanding/>;
+		}	
+		else if( typeof browserMain == "function" )
+		{
+			browserMain = browserMain();
+		}
+
+		main = browserMain;
+	}
+	else
+	{
+		await AvGadget.instance().waitForConnect();
+
+		if( typeof gadgetMain == "function" )
+		{
+			gadgetMain = gadgetMain();
+		}
+		main = gadgetMain;
+	}
+
+	ReactDOM.render( main, element );
+}
+

packages/aardvark-react/src/index.ts

@@ -18,6 +18,7 @@ export * from './aardvark_panel';
 export * from './aardvark_panelanchor';
 export * from './aardvark_parent_transform';
 export * from './aardvark_primitive';
+export * from './aardvark_render';
 export * from './aardvark_standard_grabbable';
 export * from './aardvark_transform';
 export * from './aardvark_utils';

src/avrenderer/vrmanager.cpp

@@ -35,7 +35,10 @@ void CVRManager::init()
 CVRManager::~CVRManager()
 {
 	destroyVargglesOverlay();
-	vr::VR_Shutdown();
+	if ( vr::VRSystem() )
+	{
+		vr::VR_Shutdown();
+	}
 }
 
 

websrc/test_panel/src/test_panel_main.tsx

@@ -1,4 +1,4 @@
-import { AvGadget, AvMessagebox, AvPanel, AvStandardGrabbable, AvTransform, DefaultLanding, GrabbableStyle } from '@aardvarkxr/aardvark-react';
+import { AvGadget, AvMessagebox, AvPanel, AvStandardGrabbable, AvTransform, DefaultLanding, GrabbableStyle, renderAardvarkRoot } from '@aardvarkxr/aardvark-react';
 import { Av, EAction, EHand, g_builtinModelBox, InitialInterfaceLock } from '@aardvarkxr/aardvark-shared';
 import bind from 'bind-decorator';
 import * as React from 'react';
@@ -236,5 +236,5 @@ class TestPanel extends React.Component< {}, TestPanelState >
 
 }
 
-let main = Av() ? <TestPanel/> : <DefaultLanding/>;
-ReactDOM.render( main, document.getElementById( "root" ) );
+
+renderAardvarkRoot( "root", <TestPanel/> );

websrc/whiteboard/src/whiteboard_main.tsx

@@ -1,4 +1,4 @@
-import { ShowGrabbableChildren, NetworkedItemComponent, ActiveInterface, AvComposedEntity, AvGadget, AvInterfaceEntity, AvLine, AvModel, AvPrimitive, AvStandardGrabbable, AvTransform, MoveableComponent, PrimitiveType, PrimitiveYOrigin, PrimitiveZOrigin, DefaultLanding, RemoteItemComponent, MoveableComponentState, k_remoteGrabbableInterface, GrabbableStyle } from '@aardvarkxr/aardvark-react';
+import { ShowGrabbableChildren, NetworkedItemComponent, ActiveInterface, AvComposedEntity, AvGadget, AvInterfaceEntity, AvLine, AvModel, AvPrimitive, AvStandardGrabbable, AvTransform, MoveableComponent, PrimitiveType, PrimitiveYOrigin, PrimitiveZOrigin, DefaultLanding, RemoteItemComponent, MoveableComponentState, k_remoteGrabbableInterface, GrabbableStyle, renderAardvarkRoot } from '@aardvarkxr/aardvark-react';
 import { Av, AvNodeTransform, AvVector, AvVolume, endpointAddrToString, EVolumeType, g_builtinModelBox, InitialInterfaceLock, infiniteVolume } from '@aardvarkxr/aardvark-shared';
 import { vec2 } from '@tlaukkan/tsm';
 import bind from 'bind-decorator';
@@ -516,5 +516,4 @@ class Whiteboard extends React.Component< {}, WhiteboardState >
 }
 
 
-let main = Av() ? <Whiteboard/> : <DefaultLanding/>;
-ReactDOM.render( main, document.getElementById( "root" ) );
+renderAardvarkRoot( document.getElementById( "root" ), () => <Whiteboard/>, () => <DefaultLanding/> );