Commit 78a74615 authored by Sylvain Renault's avatar Sylvain Renault
Browse files

Final validation scene with the museums room and statue. 

WOrld Storage gizmos created for the use case.
parent 1a001bd0

Assets/ETSI.ARF/ARF World Storage API/Editor/Windows/WorldStorageWindow.cs

+2 −14
Original line number Original line Diff line number Diff line
@@ -68,7 +68,7 @@ namespace ETSI.ARF.WorldStorage.UI 
        private string filterByKeyValueTag = "";

        private string filterByKeyValueTag = "";





        static public string winName = "ARF Authoring Editor";

        static public string winName = "ARF Authoring Editor";

        static public int lineH= 2;

        static public int lineH = 5;

        static public Color[] arfColors = new Color[]

        static public Color[] arfColors = new Color[]

        {

        {

            Color.yellow,                   // paneltext

            Color.yellow,                   // paneltext
@@ -117,7 +117,7 @@ namespace ETSI.ARF.WorldStorage.UI 
            // Server info

            // Server info

            GUILayout.BeginVertical("World Storage Server", gsTest);

            GUILayout.BeginVertical("World Storage Server", gsTest);

            EditorGUILayout.Space();

            EditorGUILayout.Space();

            Rect rect = EditorGUILayout.GetControlRect(false, 1);

            Rect rect = EditorGUILayout.GetControlRect(false, 1); // WorldStorageWindow.lineH);

            EditorGUI.DrawRect(rect, Color.black);

            EditorGUI.DrawRect(rect, Color.black);

            //

            //

            GUILayout gl = new GUILayout();

            GUILayout gl = new GUILayout();
@@ -278,10 +278,6 @@ namespace ETSI.ARF.WorldStorage.UI 




            // Show list

            // Show list

            stringsProperty = so.FindProperty("trackables");

            stringsProperty = so.FindProperty("trackables");

            //EditorGUILayout.PropertyField(stringsProperty, /*new GUIContent("Trackbales"),*/ true); // True means show children

            //so.ApplyModifiedProperties(); // Remember to apply modified properties



            // New version with "Edit" button:

            showListT = EditorGUILayout.BeginFoldoutHeaderGroup(showListT, "List of Trackables");

            showListT = EditorGUILayout.BeginFoldoutHeaderGroup(showListT, "List of Trackables");

            if (showListT)

            if (showListT)

                for (int i = 0; i < stringsProperty.arraySize; i++)

                for (int i = 0; i < stringsProperty.arraySize; i++)
@@ -371,10 +367,6 @@ namespace ETSI.ARF.WorldStorage.UI 




            // Show list

            // Show list

            stringsProperty = so.FindProperty("anchors");

            stringsProperty = so.FindProperty("anchors");

            //EditorGUILayout.PropertyField(stringsProperty, /*new GUIContent("Trackbales"),*/ true); // True means show children

            //so.ApplyModifiedProperties(); // Remember to apply modified properties



            // New version with "Edit" button:

            showListA = EditorGUILayout.BeginFoldoutHeaderGroup(showListA, "List of World Anchors");

            showListA = EditorGUILayout.BeginFoldoutHeaderGroup(showListA, "List of World Anchors");

            if (showListA)

            if (showListA)

                for (int i = 0; i < stringsProperty.arraySize; i++)

                for (int i = 0; i < stringsProperty.arraySize; i++)
@@ -464,10 +456,6 @@ namespace ETSI.ARF.WorldStorage.UI 




            // Show list

            // Show list

            stringsProperty = so.FindProperty("links");

            stringsProperty = so.FindProperty("links");

            //EditorGUILayout.PropertyField(stringsProperty, /*new GUIContent("Trackbales"),*/ true); // True means show children

            //so.ApplyModifiedProperties(); // Remember to apply modified properties



            // New version with "Edit" button:

            showListL = EditorGUILayout.BeginFoldoutHeaderGroup(showListL, "List of World Links");

            showListL = EditorGUILayout.BeginFoldoutHeaderGroup(showListL, "List of World Links");

            if (showListL)

            if (showListL)

                for (int i = 0; i < stringsProperty.arraySize; i++)

                for (int i = 0; i < stringsProperty.arraySize; i++)

Assets/ETSI.ARF/ARF World Storage API/Images/Materials.meta

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

guid: fb3f0905e8c5e4448ad7871a219b9f8a

folderAsset: yes

DefaultImporter:

  externalObjects: {}

  userData: 

  assetBundleName: 

  assetBundleVariant:

Assets/ETSI.ARF/ARF World Storage API/Images/Materials/anchor.mat

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

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

--- !u!21 &2100000

Material:

  serializedVersion: 8

  m_ObjectHideFlags: 0

  m_CorrespondingSourceObject: {fileID: 0}

  m_PrefabInstance: {fileID: 0}

  m_PrefabAsset: {fileID: 0}

  m_Name: anchor

  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}

  m_ValidKeywords: []

  m_InvalidKeywords: []

  m_LightmapFlags: 4

  m_EnableInstancingVariants: 0

  m_DoubleSidedGI: 0

  m_CustomRenderQueue: -1

  stringTagMap: {}

  disabledShaderPasses: []

  m_SavedProperties:

    serializedVersion: 3

    m_TexEnvs:

    - _BumpMap:

        m_Texture: {fileID: 0}

        m_Scale: {x: 1, y: 1}

        m_Offset: {x: 0, y: 0}

    - _DetailAlbedoMap:

        m_Texture: {fileID: 0}

        m_Scale: {x: 1, y: 1}

        m_Offset: {x: 0, y: 0}

    - _DetailMask:

        m_Texture: {fileID: 0}

        m_Scale: {x: 1, y: 1}

        m_Offset: {x: 0, y: 0}

    - _DetailNormalMap:

        m_Texture: {fileID: 0}

        m_Scale: {x: 1, y: 1}

        m_Offset: {x: 0, y: 0}

    - _EmissionMap:

        m_Texture: {fileID: 0}

        m_Scale: {x: 1, y: 1}

        m_Offset: {x: 0, y: 0}

    - _MainTex:

        m_Texture: {fileID: 2800000, guid: 000725cae67a4f7448f79fe2a478a50d, type: 3}

        m_Scale: {x: 1, y: 1}

        m_Offset: {x: 0, y: 0}

    - _MetallicGlossMap:

        m_Texture: {fileID: 0}

        m_Scale: {x: 1, y: 1}

        m_Offset: {x: 0, y: 0}

    - _OcclusionMap:

        m_Texture: {fileID: 0}

        m_Scale: {x: 1, y: 1}

        m_Offset: {x: 0, y: 0}

    - _ParallaxMap:

        m_Texture: {fileID: 0}

        m_Scale: {x: 1, y: 1}

        m_Offset: {x: 0, y: 0}

    m_Ints: []

    m_Floats:

    - _BumpScale: 1

    - _Cutoff: 0.5

    - _DetailNormalMapScale: 1

    - _DstBlend: 0

    - _GlossMapScale: 1

    - _Glossiness: 0.5

    - _GlossyReflections: 1

    - _Metallic: 0

    - _Mode: 0

    - _OcclusionStrength: 1

    - _Parallax: 0.02

    - _SmoothnessTextureChannel: 0

    - _SpecularHighlights: 1

    - _SrcBlend: 1

    - _UVSec: 0

    - _ZWrite: 1

    m_Colors:

    - _Color: {r: 1, g: 1, b: 1, a: 1}

    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}

  m_BuildTextureStacks: []

Assets/ETSI.ARF/ARF World Storage API/Images/Materials/anchor.mat.meta

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

guid: 730ea8fe50af5874fb3b990c534eaebc

NativeFormatImporter:

  externalObjects: {}

  mainObjectFileID: 2100000

  userData: 

  assetBundleName: 

  assetBundleVariant:

Assets/ETSI.ARF/ARF World Storage API/Images/Materials/link.mat

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

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

--- !u!21 &2100000

Material:

  serializedVersion: 8

  m_ObjectHideFlags: 0

  m_CorrespondingSourceObject: {fileID: 0}

  m_PrefabInstance: {fileID: 0}

  m_PrefabAsset: {fileID: 0}

  m_Name: link

  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}

  m_ValidKeywords: []

  m_InvalidKeywords: []

  m_LightmapFlags: 4

  m_EnableInstancingVariants: 0

  m_DoubleSidedGI: 0

  m_CustomRenderQueue: -1

  stringTagMap: {}

  disabledShaderPasses: []

  m_SavedProperties:

    serializedVersion: 3

    m_TexEnvs:

    - _BumpMap:

        m_Texture: {fileID: 0}

        m_Scale: {x: 1, y: 1}

        m_Offset: {x: 0, y: 0}

    - _DetailAlbedoMap:

        m_Texture: {fileID: 0}

        m_Scale: {x: 1, y: 1}

        m_Offset: {x: 0, y: 0}

    - _DetailMask:

        m_Texture: {fileID: 0}

        m_Scale: {x: 1, y: 1}

        m_Offset: {x: 0, y: 0}

    - _DetailNormalMap:

        m_Texture: {fileID: 0}

        m_Scale: {x: 1, y: 1}

        m_Offset: {x: 0, y: 0}

    - _EmissionMap:

        m_Texture: {fileID: 0}

        m_Scale: {x: 5, y: 5}

        m_Offset: {x: 0, y: 0}

    - _MainTex:

        m_Texture: {fileID: 2800000, guid: fef18a27fe1e4a040b8cfda6b3b5c178, type: 3}

        m_Scale: {x: 5, y: 5}

        m_Offset: {x: 0, y: 0}

    - _MetallicGlossMap:

        m_Texture: {fileID: 0}

        m_Scale: {x: 1, y: 1}

        m_Offset: {x: 0, y: 0}

    - _OcclusionMap:

        m_Texture: {fileID: 0}

        m_Scale: {x: 1, y: 1}

        m_Offset: {x: 0, y: 0}

    - _ParallaxMap:

        m_Texture: {fileID: 0}

        m_Scale: {x: 1, y: 1}

        m_Offset: {x: 0, y: 0}

    m_Ints: []

    m_Floats:

    - _BumpScale: 1

    - _Cutoff: 0.5

    - _DetailNormalMapScale: 1

    - _DstBlend: 0

    - _GlossMapScale: 1

    - _Glossiness: 0.5

    - _GlossyReflections: 1

    - _Metallic: 0

    - _Mode: 0

    - _OcclusionStrength: 1

    - _Parallax: 0.02

    - _SmoothnessTextureChannel: 0

    - _SpecularHighlights: 1

    - _SrcBlend: 1

    - _UVSec: 0

    - _ZWrite: 1

    m_Colors:

    - _Color: {r: 1, g: 1, b: 1, a: 1}

    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}

  m_BuildTextureStacks: []