Commit fbe3790e authored by Sylvain Renault's avatar Sylvain Renault
Browse files

Updated user values/names (scriptables) 

Updated openapi test scene.
parent 8d0b687c

Runtime/Scenes/OpenAPITest.cs

+18 −5
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ public class OpenAPITest : MonoBehaviour 
    public TMP_Text servername;

    public TMP_Text output;



    private string serverState = "-";

    private string msg = null;

    private Queue handleResponseQ = new Queue();
@@ -41,7 +42,7 @@ public class OpenAPITest : MonoBehaviour 
            if (o is ResponseObject<string>)

            {

                ResponseObject<string> response = o as ResponseObject<string>;

                output.text = $"Request Time: { response.requestTime.ToLongTimeString() } / Total Time: { response.DeltaTime.TotalMilliseconds }ms\n\n<b>Content:</b>\n{ response.result }";

                output.text = $"Server State:\n\n{ serverState }";

            }

            else if (o is ResponseObject<Trackable>)

            {
@@ -62,7 +63,7 @@ public class OpenAPITest : MonoBehaviour 
        }

    }



    public void OnButtonClick_TestPing()

    public void OnButtonClick_ServerTest()

    {

        if (server == null)

        {
@@ -70,11 +71,23 @@ public class OpenAPITest : MonoBehaviour 
            return;

        }



        ResponseObject<string> token = AdminRequest.PingAsync(server, (response) =>

        serverState = $"Requesting server state @ time: { DateTime.Now.ToLongTimeString() }...\n";



        AdminRequest.PingAsync(server, (response1) =>

        {

            handleResponseQ.Enqueue(response);

            serverState += $"\nSending: Ping\n   Receiving: { response1.result }\n   Req time: { response1.requestTime.ToLongTimeString() } Tot time: { response1.DeltaTime.TotalMilliseconds }";

            handleResponseQ.Enqueue(response1);

        });

        AdminRequest.AdminAsync(server, (response2) =>

        {

            serverState += $"\nSending: Admin\n   Receiving: { response2.result }\n   Req time: { response2.requestTime.ToLongTimeString() } Tot time: { response2.DeltaTime.TotalMilliseconds }";

            handleResponseQ.Enqueue(response2);

        });

        AdminRequest.VersionAsync(server, (response3) =>

        {

            serverState += $"\nSending: Version\n   Receiving: { response3.result }\n   Req time: { response3.requestTime.ToLongTimeString() } Tot time: { response3.DeltaTime.TotalMilliseconds }";

            handleResponseQ.Enqueue(response3);

        });

        output.text = "Starting request @ time: " + token.requestTime.ToLongTimeString() + "...";

    }



    public void OnButtonClick_GetLastTrackable()

Runtime/Scenes/Package Test.unity

+36 −36
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ RenderSettings: 
  m_ReflectionIntensity: 1

  m_CustomReflection: {fileID: 0}

  m_Sun: {fileID: 0}

  m_IndirectSpecularColor: {r: 0.44402242, g: 0.49316543, b: 0.5722324, a: 1}

  m_IndirectSpecularColor: {r: 0.18028378, g: 0.22571412, b: 0.30692285, a: 1}

  m_UseRadianceAmbientProbe: 0

--- !u!157 &3

LightmapSettings:
@@ -189,8 +189,8 @@ MonoBehaviour: 
  m_fontMaterials: []

  m_fontColor32:

    serializedVersion: 2

    rgba: 4281479730

  m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}

    rgba: 4278190080

  m_fontColor: {r: 0, g: 0, b: 0, a: 1}

  m_enableVertexGradient: 0

  m_colorMode: 3

  m_fontColorGradient:
@@ -207,8 +207,8 @@ MonoBehaviour: 
  m_faceColor:

    serializedVersion: 2

    rgba: 4294967295

  m_fontSize: 36

  m_fontSizeBase: 36

  m_fontSize: 32

  m_fontSizeBase: 32

  m_fontWeight: 400

  m_enableAutoSizing: 0

  m_fontSizeMin: 0
@@ -399,8 +399,8 @@ MonoBehaviour: 
  m_fontMaterials: []

  m_fontColor32:

    serializedVersion: 2

    rgba: 4281479730

  m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}

    rgba: 4278190080

  m_fontColor: {r: 0, g: 0, b: 0, a: 1}

  m_enableVertexGradient: 0

  m_colorMode: 3

  m_fontColorGradient:
@@ -417,8 +417,8 @@ MonoBehaviour: 
  m_faceColor:

    serializedVersion: 2

    rgba: 4294967295

  m_fontSize: 36

  m_fontSizeBase: 36

  m_fontSize: 32

  m_fontSizeBase: 32

  m_fontWeight: 400

  m_enableAutoSizing: 0

  m_fontSizeMin: 0
@@ -480,7 +480,7 @@ GameObject: 
  - component: {fileID: 485599440}

  - component: {fileID: 485599439}

  m_Layer: 5

  m_Name: Button Ping

  m_Name: Button WS State

  m_TagString: Untagged

  m_Icon: {fileID: 0}

  m_NavMeshLayer: 0
@@ -551,8 +551,8 @@ MonoBehaviour: 
    m_PersistentCalls:

      m_Calls:

      - m_Target: {fileID: 2123268211}

        m_TargetAssemblyTypeName: OpenAPITest, Assembly-CSharp

        m_MethodName: OnButtonClick_TestPing

        m_TargetAssemblyTypeName: OpenAPITest, etsi.isg.arf.worldstorage

        m_MethodName: OnButtonClick_ServerTest

        m_Mode: 1

        m_Arguments:

          m_ObjectArgument: {fileID: 0}
@@ -611,7 +611,7 @@ GameObject: 
  - component: {fileID: 491226576}

  - component: {fileID: 491226577}

  m_Layer: 5

  m_Name: Buttons

  m_Name: UI

  m_TagString: Untagged

  m_Icon: {fileID: 0}

  m_NavMeshLayer: 0
@@ -643,7 +643,7 @@ RectTransform: 
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}

  m_AnchorMin: {x: 0, y: 1}

  m_AnchorMax: {x: 1, y: 1}

  m_AnchoredPosition: {x: 32, y: -200}

  m_AnchoredPosition: {x: 32, y: 0}

  m_SizeDelta: {x: -64, y: 400}

  m_Pivot: {x: 0, y: 1}

--- !u!114 &491226577
@@ -995,7 +995,7 @@ MonoBehaviour: 
  m_OnCullStateChanged:

    m_PersistentCalls:

      m_Calls: []

  m_text: Request trackables

  m_text: Request all trackables

  m_isRightToLeft: 0

  m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}

  m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
@@ -1004,8 +1004,8 @@ MonoBehaviour: 
  m_fontMaterials: []

  m_fontColor32:

    serializedVersion: 2

    rgba: 4281479730

  m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}

    rgba: 4278190080

  m_fontColor: {r: 0, g: 0, b: 0, a: 1}

  m_enableVertexGradient: 0

  m_colorMode: 3

  m_fontColorGradient:
@@ -1022,8 +1022,8 @@ MonoBehaviour: 
  m_faceColor:

    serializedVersion: 2

    rgba: 4294967295

  m_fontSize: 36

  m_fontSizeBase: 36

  m_fontSize: 32

  m_fontSizeBase: 32

  m_fontWeight: 400

  m_enableAutoSizing: 0

  m_fontSizeMin: 0
@@ -1373,8 +1373,8 @@ MonoBehaviour: 
  m_fontMaterials: []

  m_fontColor32:

    serializedVersion: 2

    rgba: 4281479730

  m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}

    rgba: 4278190080

  m_fontColor: {r: 0, g: 0, b: 0, a: 1}

  m_enableVertexGradient: 0

  m_colorMode: 3

  m_fontColorGradient:
@@ -1391,8 +1391,8 @@ MonoBehaviour: 
  m_faceColor:

    serializedVersion: 2

    rgba: 4294967295

  m_fontSize: 36

  m_fontSizeBase: 36

  m_fontSize: 32

  m_fontSizeBase: 32

  m_fontWeight: 400

  m_enableAutoSizing: 0

  m_fontSizeMin: 0
@@ -2042,8 +2042,8 @@ MonoBehaviour: 
  m_fontMaterials: []

  m_fontColor32:

    serializedVersion: 2

    rgba: 4281479730

  m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}

    rgba: 4278190080

  m_fontColor: {r: 0, g: 0, b: 0, a: 1}

  m_enableVertexGradient: 0

  m_colorMode: 3

  m_fontColorGradient:
@@ -2060,8 +2060,8 @@ MonoBehaviour: 
  m_faceColor:

    serializedVersion: 2

    rgba: 4294967295

  m_fontSize: 36

  m_fontSizeBase: 36

  m_fontSize: 32

  m_fontSizeBase: 32

  m_fontWeight: 400

  m_enableAutoSizing: 0

  m_fontSizeMin: 0
@@ -2145,7 +2145,7 @@ Camera: 
  m_GameObject: {fileID: 1900725046}

  m_Enabled: 1

  serializedVersion: 2

  m_ClearFlags: 1

  m_ClearFlags: 2

  m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0}

  m_projectionMatrixMode: 1

  m_GateFitMode: 2
@@ -2380,8 +2380,8 @@ MonoBehaviour: 
  m_faceColor:

    serializedVersion: 2

    rgba: 4294967295

  m_fontSize: 36

  m_fontSizeBase: 36

  m_fontSize: 30

  m_fontSizeBase: 30

  m_fontWeight: 400

  m_enableAutoSizing: 0

  m_fontSizeMin: 18
@@ -2688,7 +2688,7 @@ MonoBehaviour: 
  m_OnCullStateChanged:

    m_PersistentCalls:

      m_Calls: []

  m_text: Ping

  m_text: Get WS server state

  m_isRightToLeft: 0

  m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}

  m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
@@ -2697,8 +2697,8 @@ MonoBehaviour: 
  m_fontMaterials: []

  m_fontColor32:

    serializedVersion: 2

    rgba: 4281479730

  m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}

    rgba: 4278190080

  m_fontColor: {r: 0, g: 0, b: 0, a: 1}

  m_enableVertexGradient: 0

  m_colorMode: 3

  m_fontColorGradient:
@@ -2715,8 +2715,8 @@ MonoBehaviour: 
  m_faceColor:

    serializedVersion: 2

    rgba: 4294967295

  m_fontSize: 36

  m_fontSizeBase: 36

  m_fontSize: 32

  m_fontSizeBase: 32

  m_fontWeight: 400

  m_enableAutoSizing: 0

  m_fontSizeMin: 0
@@ -2794,7 +2794,7 @@ MonoBehaviour: 
  m_Script: {fileID: 11500000, guid: 8d8b78014fb03e94c90db2fa1a2fde7b, type: 3}

  m_Name: 

  m_EditorClassIdentifier: 

  server: {fileID: 11400000, guid: e58ba3b536eb26a4d899273c538c88e7, type: 2}

  server: {fileID: 11400000, guid: a3bbdc2753015174d9cf466761005897, type: 2}

  servername: {fileID: 1270536910}

  output: {fileID: 1973593797}

--- !u!4 &2123268212

Runtime/Scenes/User ETSI.asset

0 → 100644
+17 −0
Original line number Diff line number Diff line 
%YAML 1.1

%TAG !u! tag:unity3d.com,2011:

--- !u!114 &11400000

MonoBehaviour:

  m_ObjectHideFlags: 0

  m_CorrespondingSourceObject: {fileID: 0}

  m_PrefabInstance: {fileID: 0}

  m_PrefabAsset: {fileID: 0}

  m_GameObject: {fileID: 0}

  m_Enabled: 1

  m_EditorHideFlags: 0

  m_Script: {fileID: 11500000, guid: 8a1e3e7961eae84468e6ee20d5b09ffd, type: 3}

  m_Name: User ETSI

  m_EditorClassIdentifier: 

  userName: ARF User

  company: ETSI Org

  UUID: 5090fd9f-64bf-4e06-843f-26aaf2eb8e40

Runtime/Scenes/User ETSI.asset.meta

0 → 100644
+8 −0
Original line number Diff line number Diff line 
fileFormatVersion: 2

guid: 748585a50399fd64883147cd731ae0b7

NativeFormatImporter:

  externalObjects: {}

  mainObjectFileID: 11400000

  userData: 

  assetBundleName: 

  assetBundleVariant: