Commit a850d892 authored by Sylvain Buche's avatar Sylvain Buche
Browse files

Add Unity project modifications for Geospatial module

parent 3a7179ee

Assets/Materials/Purple.mat

+12 −7
Original line number Diff line number Diff line
@@ -9,14 +9,19 @@ Material: 
  m_PrefabAsset: {fileID: 0}

  m_Name: Purple

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

  m_ValidKeywords: []

  m_Parent: {fileID: 0}

  m_ModifiedSerializedProperties: 0

  m_ValidKeywords:

  - _ALPHAPREMULTIPLY_ON

  m_InvalidKeywords: []

  m_LightmapFlags: 4

  m_EnableInstancingVariants: 0

  m_DoubleSidedGI: 0

  m_CustomRenderQueue: -1

  stringTagMap: {}

  m_CustomRenderQueue: 3000

  stringTagMap:

    RenderType: Transparent

  disabledShaderPasses: []

  m_LockedProperties: 

  m_SavedProperties:

    serializedVersion: 3

    m_TexEnvs:
@@ -61,20 +66,20 @@ Material: 
    - _BumpScale: 1

    - _Cutoff: 0.5

    - _DetailNormalMapScale: 1

    - _DstBlend: 0

    - _DstBlend: 10

    - _GlossMapScale: 1

    - _Glossiness: 0.5

    - _GlossyReflections: 1

    - _Metallic: 0

    - _Mode: 0

    - _Mode: 3

    - _OcclusionStrength: 1

    - _Parallax: 0.02

    - _SmoothnessTextureChannel: 0

    - _SpecularHighlights: 1

    - _SrcBlend: 1

    - _UVSec: 0

    - _ZWrite: 1

    - _ZWrite: 0

    m_Colors:

    - _Color: {r: 0.40046763, g: 0, b: 0.4716981, a: 1}

    - _Color: {r: 1, g: 0.12549019, b: 0.96812713, a: 0.24705882}

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

  m_BuildTextureStacks: []

Assets/Plugins/Android/proguard-user.txt

+17 −0
Original line number Diff line number Diff line
@@ -32,3 +32,20 @@ 
                    -keep class com.google.android.gms.tasks.** { *; }



### Module Progurad Rules ends ###



### Module Progurad Rules starts ###



## Default ##

-keep class com.unity3d.plugin.* { *; }



## LocationModule ##

-keep class com.google.android.gms.common.** { *; }

                    -keep class com.google.android.gms.location.** { *; }

                    -keep class com.google.android.gms.tasks.** { *; }



## AuthenticationModule ##

-keep class com.google.android.gms.common.** { *; }

                    -keep class com.google.android.gms.auth.** { *; }

                    -keep class com.google.android.gms.tasks.** { *; }



### Module Progurad Rules ends ###

Assets/Resources/ARFWorldStorageServer.asset

+2 −2
Original line number Diff line number Diff line
@@ -12,8 +12,8 @@ MonoBehaviour: 
  m_Script: {fileID: 11500000, guid: e4b7be4c33f68d0418c3b4e1a7053d91, type: 3}

  m_Name: ARFWorldStorageServer

  m_EditorClassIdentifier: 

  serverName: 192.168.1.27

  serverName: 192.168.1.44

  company: Orange

  basePath: http://192.168.1.27

  basePath: http://192.168.1.44

  port: 8080

  currentUser: {fileID: 11400000, guid: 220ed7f6ba8f6404e8bee0e9057e2ffd, type: 2}

Assets/Scenes/ExampleGLTF.unity

+3 −3
Original line number Diff line number Diff line
@@ -331,7 +331,7 @@ Camera: 
    width: 1

    height: 1

  near clip plane: 0.1

  far clip plane: 20

  far clip plane: 250

  field of view: 60

  orthographic: 0

  orthographic size: 5
@@ -424,7 +424,7 @@ MonoBehaviour: 
  m_Script: {fileID: 11500000, guid: 02da7adcc65f4694684d71e61d88070b, type: 3}

  m_Name: 

  m_EditorClassIdentifier: 

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

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

--- !u!4 &236535456

Transform:

  m_ObjectHideFlags: 0
@@ -570,7 +570,7 @@ MonoBehaviour: 
  m_Name: 

  m_EditorClassIdentifier: 

  _PathToGLTF: ARSceneOneAnchor.glb

  _ValiditySubscription: 100000

  _ValiditySubscription: 1000000

--- !u!4 &842320175

Transform:

  m_ObjectHideFlags: 0

unity-world-analysis-arfoundation-wra... @ 4c4c84e3

Compare e68c91f3 to 4c4c84e3
Original line number Diff line number Diff line 
Subproject commit e68c91f304caf48e3221e71a06fd2fc834e4b19b
 
Subproject commit 4c4c84e3662efe4cd7b16abfcf2f273286dcffcd