Commit 38f1b219 authored by Jérémy Lacoche's avatar Jérémy Lacoche
Browse files

Update Samples GLTF and readme

parent 095853a0

Assets/ISG-ARF/Common_Application/Scenes/ExampleGLTF.unity

+3 −3
Original line number Diff line number Diff line
@@ -424,7 +424,7 @@ MonoBehaviour: 
  m_Script: {fileID: 11500000, guid: 02da7adcc65f4694684d71e61d88070b, type: 3}

  m_Name: 

  m_EditorClassIdentifier: 

  worldStorageServer: {fileID: 11400000, guid: cc5c5acfb44773a4ba9decc291b718d2, type: 2}

  worldStorageServer: {fileID: 11400000, guid: c1d7543b3d89e1543a49016de1a81d8f, type: 2}

--- !u!4 &236535456

Transform:

  m_ObjectHideFlags: 0
@@ -569,8 +569,9 @@ MonoBehaviour: 
  m_Script: {fileID: 11500000, guid: f7351c94a4c22144284b9eac3270dc8d, type: 3}

  m_Name: 

  m_EditorClassIdentifier: 

  _PathToGLTF: ARSceneOneAnchor.glb

  _PathToGLTF: ARSceneThreeAnchor.glb

  _ValiditySubscription: 10000000

  _DisableObjectWhenNotTracked: 1

--- !u!4 &842320175

Transform:

  m_ObjectHideFlags: 0
@@ -728,7 +729,6 @@ MonoBehaviour: 
  m_DeselectOnBackgroundClick: 1

  m_PointerBehavior: 0

  m_CursorLockBehavior: 0

  m_ScrollDeltaPerTick: 6

--- !u!114 &1405320277

MonoBehaviour:

  m_ObjectHideFlags: 0

Assets/ISG-ARF/Common_Application/Scripts/SceneManagementGLTF.cs

+8 −2
Original line number Diff line number Diff line
@@ -15,6 +15,10 @@ public class SceneManagementGLTF : MonoBehaviour 
    /// Validity in milliseconds for a subscription to the WA

    /// </summary>

    public int _ValiditySubscription = 100000;

    /// <summary>

    /// If true : before first tracking, objects are hidden

    /// </summary>

    public bool _DisableObjectWhenNotTracked; 



    /// <summary>

    /// List of trackables and anchors in the AR Scene
@@ -33,6 +37,7 @@ public class SceneManagementGLTF : MonoBehaviour 
        

        foreach(KeyValuePair<Guid , Transform> toSubscribe in m_trackablesAndAnchorsInARScene)

        {

            toSubscribe.Value.gameObject.SetActive(!_DisableObjectWhenNotTracked); // disable object when not tracked

            int validity = _ValiditySubscription;

            Guid subscriptionUUID;

            // TODO : if only one : subscribeToPose, if multiple subscribetoPoses
@@ -58,6 +63,7 @@ public class SceneManagementGLTF : MonoBehaviour 
            ETSI.ARF.OpenAPI.WorldAnalysis.VectorQuaternionPoseValue value = (ETSI.ARF.OpenAPI.WorldAnalysis.VectorQuaternionPoseValue)pose.Value;

            if (m_trackablesAndAnchorsInARScene.ContainsKey(pose.Uuid))

            {

                m_trackablesAndAnchorsInARScene[pose.Uuid].transform.gameObject.SetActive(true);

                m_trackablesAndAnchorsInARScene[pose.Uuid].transform.position =  WorldAnalysisUnityHelper.ConvertETSIVector3ToUnity(value.Position);

                m_trackablesAndAnchorsInARScene[pose.Uuid].transform.rotation =  WorldAnalysisUnityHelper.ConvertETSIARFQuaternionToUnity(value.Rotation);

            }

Assets/ISG-ARF/Resources/WS/ARFWorldStorageServerOrange.asset

deleted100644 → 0
+0 −19
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: e4b7be4c33f68d0418c3b4e1a7053d91, type: 3}

  m_Name: ARFWorldStorageServerOrange

  m_EditorClassIdentifier: 

  serverName: Test

  company: Orange

  basePath: http://stef512.ddns.net

  port: 0

  currentUser: {fileID: 11400000, guid: 19460fb98cba6a247a1ab3a067f97cb2, type: 2}

Assets/ISG-ARF/Resources/WS/ARFWorldStorageServerOrange.asset.meta

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

guid: ee077e143d6b54f5599ae86b474ec214

NativeFormatImporter:

  externalObjects: {}

  mainObjectFileID: 11400000

  userData: 

  assetBundleName: 

  assetBundleVariant:

Assets/Scenes.meta

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

guid: ee1525db27f57c04aa59527c062bb582

folderAsset: yes

DefaultImporter:

  externalObjects: {}

  userData: 

  assetBundleName: 

  assetBundleVariant: