Merge pull request #170 from fuag15/bugfix/auto_launch_smoketest_fixes

had the wrong icons for the wrong states and never hooked up the hand…
aardvarkxr · Nov 18, 2020 · 9a0daff · 9a0daff
2 parents 6703d63 + 1b8a92b
commit 9a0daff
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 39 deletions.
diff --git a/packages/aardvark-shared/src/aardvark_protocol.ts b/packages/aardvark-shared/src/aardvark_protocol.ts
@@ -338,6 +338,11 @@ export interface MsgInstallGadget
 	gadgetUri: string;
 }
 
+export interface MsgSetGadgetToAutoLaunch
+{
+	gadgetUri: string;
+}
+
 
 export interface MsgResourceLoadFailed
 {

diff --git a/websrc/gadget_menu/src/gadget_menu_main.tsx b/websrc/gadget_menu/src/gadget_menu_main.tsx
@@ -1,5 +1,5 @@
 import { ApiInterfaceSender, ActiveInterface, AvGadget, AvGadgetSeed, AvGrabButton, AvHeadFacingTransform, AvHighlightTransmitters, AvInterfaceEntity, AvLine, AvModel, AvOrigin, AvPanel, AvPrimitive, AvStandardGrabbable, AvTransform, GadgetInfoEvent, GadgetSeedHighlight, HiddenChildrenBehavior, k_GadgetInfoInterface, PrimitiveType, PrimitiveYOrigin, renderGadgetIcon, ShowGrabbableChildren, k_GadgetListInterface, GadgetListEventType, AvMessagebox, AvApiInterface, ApiInterfaceHandler, GadgetListResult, AvMenuItem, GrabbableStyle } from '@aardvarkxr/aardvark-react';
-import { Av, WindowInfo, AvStartGadgetResult, AardvarkManifest, AvNodeTransform, AvVector, emptyVolume, EndpointAddr, g_builtinModelFlask, g_builtinModelRocketship, g_builtinModelBarcodeScanner, nodeTransformToMat4, nodeTransformFromMat4, g_builtinModelDropAttract, g_builtinModelNetwork, g_builtinModelHammerAndWrench, g_builtinModelStar, g_builtinModelTrashcan, MessageType, MsgDestroyGadget, rayVolume, MsgInstallGadget, g_builtinModelPanel, AvVolume, EVolumeType, g_builtinModelArrowFlat, g_builtinModelWindowIcon, infiniteVolume, endpointAddrToString, AvGadgetSettings } from '@aardvarkxr/aardvark-shared';
+import { Av, WindowInfo, AvStartGadgetResult, AardvarkManifest, AvNodeTransform, AvVector, emptyVolume, EndpointAddr, g_builtinModelFlask, g_builtinModelRocketship, g_builtinModelBarcodeScanner, nodeTransformToMat4, nodeTransformFromMat4, g_builtinModelDropAttract, g_builtinModelNetwork, g_builtinModelHammerAndWrench, g_builtinModelStar, g_builtinModelTrashcan, MessageType, MsgDestroyGadget, rayVolume, MsgInstallGadget, MsgSetGadgetToAutoLaunch, g_builtinModelPanel, AvVolume, EVolumeType, g_builtinModelArrowFlat, g_builtinModelWindowIcon, infiniteVolume, endpointAddrToString, AvGadgetSettings } from '@aardvarkxr/aardvark-shared';
 import { mat4, vec3, vec4 } from '@tlaukkan/tsm';
 import Axios from 'axios';
 import bind from 'bind-decorator';
@@ -17,12 +17,12 @@ interface Icon {
 	rotateX: number
 }
 
-const k_iconAutoLaunchActive: Icon = {
+const k_iconAutoLaunchInactive: Icon = {
 	modelUri: g_builtinModelRocketship,
 	rotateX: 0
 }
 
-const k_iconAutoLaunchInactive: Icon = {
+const k_iconAutoLaunchActive: Icon = {
 	modelUri: g_builtinModelTrashcan,
 	rotateX: 90
 }
@@ -297,6 +297,7 @@ class ControlPanel extends React.Component< {}, ControlPanelState >
 		};
 
 		AvGadget.instance().registerMessageHandler( MessageType.InstallGadget,  this.onWebFavorite );
+		AvGadget.instance().registerMessageHandler( MessageType.SetGadgetToAutoLaunch,  this.onWebSetAutoLaunch );
 
 		let settingsString = window.localStorage.getItem( "aardvark_gadget_menu_settings" );
 		if( !settingsString )
@@ -872,13 +873,13 @@ class ControlPanel extends React.Component< {}, ControlPanelState >
 			{
 				if( this.settings.gadgetSettings[ gadget.url ]?.autoLaunchEnabled ) 
 				{
-					autoLaunchSet = false;
-					toggleAutoLaunchFn = () => { this.enableAutoLaunch( gadget.url ); }
+					autoLaunchSet = true;
+					toggleAutoLaunchFn = () => { this.removeAutoLaunch( gadget.url ); }
 				} 
 				else 
 				{
-					autoLaunchSet = true;
-					toggleAutoLaunchFn = () => { this.removeAutoLaunch( gadget.url ); }
+					autoLaunchSet = false;
+					toggleAutoLaunchFn = () => { this.enableAutoLaunch( gadget.url ); }
 				}
 			}
 
@@ -1118,6 +1119,12 @@ class ControlPanel extends React.Component< {}, ControlPanelState >
 		}
 
 	}
+
+	@bind 
+	private onWebSetAutoLaunch( m: MsgSetGadgetToAutoLaunch )
+	{
+		this.enableAutoLaunch( m.gadgetUri );
+	}
 
 	@bind 
 	private onWebFavorite( m: MsgInstallGadget )

diff --git a/websrc/package-lock.json b/websrc/package-lock.json
diff --git a/websrc/server/server.ts b/websrc/server/server.ts
@@ -1,4 +1,4 @@
-import { AardvarkManifest, manifestUriFromGadgetUri, AardvarkPort, AvNode, AvNodeTransform, AvNodeType, EndpointAddr, endpointAddrsMatch, endpointAddrToString, EndpointType, ENodeFlags, Envelope, gadgetDetailsToId, MessageType, MsgDestroyGadget, MsgError, MsgGadgetStarted, MsgGeAardvarkManifestResponse, MsgGetAardvarkManifest, MsgGetInstalledGadgets, MsgGetInstalledGadgetsResponse, MsgInstallGadget, MsgInterfaceEnded, MsgInterfaceEvent, MsgInterfaceReceiveEvent, MsgInterfaceSendEvent, MsgInterfaceStarted, MsgInterfaceTransformUpdated, MsgLostEndpoint, MsgNewEndpoint, MsgNodeHaptic, MsgOverrideTransform, MsgResourceLoadFailed, MsgSaveSettings, MsgSetEndpointType, MsgSetEndpointTypeResponse, MsgUpdateActionState, MsgUpdateSceneGraph, parseEnvelope, Permission, WebSocketCloseCodes } from '@aardvarkxr/aardvark-shared';
+import { AardvarkManifest, manifestUriFromGadgetUri, AardvarkPort, AvNode, AvNodeTransform, AvNodeType, EndpointAddr, endpointAddrsMatch, endpointAddrToString, EndpointType, ENodeFlags, Envelope, gadgetDetailsToId, MessageType, MsgDestroyGadget, MsgError, MsgGadgetStarted, MsgGeAardvarkManifestResponse, MsgGetAardvarkManifest, MsgGetInstalledGadgets, MsgGetInstalledGadgetsResponse, MsgInstallGadget, MsgInterfaceEnded, MsgInterfaceEvent, MsgInterfaceReceiveEvent, MsgInterfaceSendEvent, MsgInterfaceStarted, MsgInterfaceTransformUpdated, MsgLostEndpoint, MsgNewEndpoint, MsgNodeHaptic, MsgOverrideTransform, MsgResourceLoadFailed, MsgSaveSettings, MsgSetEndpointType, MsgSetEndpointTypeResponse, MsgUpdateActionState, MsgUpdateSceneGraph, parseEnvelope, Permission, WebSocketCloseCodes, MsgSetGadgetToAutoLaunch } from '@aardvarkxr/aardvark-shared';
 import bind from 'bind-decorator';
 import * as express from 'express';
 import * as http from 'http';
@@ -628,6 +628,7 @@ class CEndpoint
 		this.registerEnvelopeHandler( MessageType.GetInstalledGadgets, this.onGetInstalledGadgets );
 		this.registerEnvelopeHandler( MessageType.DestroyGadget, this.onDestroyGadget );
 		this.registerEnvelopeHandler( MessageType.InstallGadget, this.onInstallGadget );
+		this.registerEnvelopeHandler( MessageType.SetGadgetToAutoLaunch, this.onSetGadgetToAutoLaunch );
 	}
 
 	public getId() { return this.m_id; }
@@ -918,6 +919,18 @@ class CEndpoint
 		}
 	}
 
+	@bind private onSetGadgetToAutoLaunch( env: Envelope, m: MsgSetGadgetToAutoLaunch )
+	{
+		console.log( `Setting gadget to Auto Launch from web ${ m.gadgetUri }` );
+		for( let gadget of this.m_dispatcher.getListForType( EndpointType.Gadget ) )
+		{
+			if( gadget.hasPermission( Permission.Favorites ) )
+			{
+				gadget.sendMessage( MessageType.SetGadgetToAutoLaunch, m );
+			}
+		}
+	}
+
 	public hasPermission( permissionName: Permission ): boolean
 	{
 		return this.getGadgetData() && this.getGadgetData().hasPermission( permissionName );