diff --git a/.DS_Store b/.DS_Store
index ecf001b..22f4a3b 100644
Binary files a/.DS_Store and b/.DS_Store differ
diff --git a/Assets/.DS_Store b/Assets/.DS_Store
index f1c944e..a089053 100644
Binary files a/Assets/.DS_Store and b/Assets/.DS_Store differ
diff --git a/Assets/Oculus/OculusProjectConfig.asset b/Assets/Oculus/OculusProjectConfig.asset
index a24c93d..83ee5b0 100644
--- a/Assets/Oculus/OculusProjectConfig.asset
+++ b/Assets/Oculus/OculusProjectConfig.asset
@@ -40,5 +40,5 @@ MonoBehaviour:
systemSplashScreen: {fileID: 0}
systemSplashScreenType: 0
_systemLoadingScreenBackground: 0
- ovrPluginMd5Win64: e8cfe66d40bc858ac6a51dd265d3b2f75a0542a3e3343a50aea7cfb077f7e496
- ovrPluginMd5Android: c7bb9a379e186c4b2726b69bbb7d3acebc5010d969f325037b474f297f01d26f
+ ovrPluginMd5Win64: e8cfe66d40bc858ac6a51dd265d3b2f7f0a29c248517d959fdfeab3a8c5ba89e
+ ovrPluginMd5Android: c7bb9a379e186c4b2726b69bbb7d3aced75ccf1ec60fa8579907e323401f936d
diff --git a/Assets/SharedSpatialAnchors/Prefabs/Resources/GUI.prefab b/Assets/SharedSpatialAnchors/Prefabs/Resources/GUI.prefab
index d89220f..d43287c 100644
--- a/Assets/SharedSpatialAnchors/Prefabs/Resources/GUI.prefab
+++ b/Assets/SharedSpatialAnchors/Prefabs/Resources/GUI.prefab
@@ -162,7 +162,7 @@ RectTransform:
m_GameObject: {fileID: 1671468704}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
- m_LocalScale: {x: 0.58, y: 0.58, z: 0.58}
+ m_LocalScale: {x: 0.82, y: 0.82, z: 0.82}
m_ConstrainProportionsScale: 1
m_Children: []
m_Father: {fileID: 1160440967424361300}
@@ -170,7 +170,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
- m_AnchoredPosition: {x: -134, y: 0}
+ m_AnchoredPosition: {x: -112, y: 0}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1671468707
@@ -201,7 +201,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
- m_Sprite: {fileID: 21300516, guid: 7f186a9ac091755489927d745be0185a, type: 3}
+ m_Sprite: {fileID: 21300000, guid: bedfa77ea91e4eb45ab252e90d1fca47, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@@ -228,7 +228,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 0
+ m_IsActive: 1
--- !u!4 &4890728644967733177
Transform:
m_ObjectHideFlags: 0
@@ -320,6 +320,18 @@ PrefabInstance:
propertyPath: m_Name
value: CanvasVoltageTurbine
objectReference: {fileID: 0}
+ - target: {fileID: 287564678239901346, guid: 1837e416a7f023e4b9de7c449006ca42, type: 3}
+ propertyPath: m_Color.b
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 287564678239901346, guid: 1837e416a7f023e4b9de7c449006ca42, type: 3}
+ propertyPath: m_Color.g
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 287564678239901346, guid: 1837e416a7f023e4b9de7c449006ca42, type: 3}
+ propertyPath: m_Color.r
+ value: 0
+ objectReference: {fileID: 0}
- target: {fileID: 287564678239901375, guid: 1837e416a7f023e4b9de7c449006ca42, type: 3}
propertyPath: m_Pivot.x
value: 0.5
@@ -420,6 +432,22 @@ PrefabInstance:
propertyPath: m_ConstrainProportionsScale
value: 1
objectReference: {fileID: 0}
+ - target: {fileID: 287564679024842756, guid: 1837e416a7f023e4b9de7c449006ca42, type: 3}
+ propertyPath: m_fontColor.b
+ value: 0.05050863
+ objectReference: {fileID: 0}
+ - target: {fileID: 287564679024842756, guid: 1837e416a7f023e4b9de7c449006ca42, type: 3}
+ propertyPath: m_fontColor.g
+ value: 0.8396226
+ objectReference: {fileID: 0}
+ - target: {fileID: 287564679024842756, guid: 1837e416a7f023e4b9de7c449006ca42, type: 3}
+ propertyPath: m_fontColor.r
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 287564679024842756, guid: 1837e416a7f023e4b9de7c449006ca42, type: 3}
+ propertyPath: m_fontColor32.rgba
+ value: 4279096832
+ objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 1837e416a7f023e4b9de7c449006ca42, type: 3}
--- !u!224 &4621530251025807187 stripped
@@ -478,27 +506,27 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 6036491610417066955, guid: ebcaad662ef2ae14ca92fbcd7a67ee56, type: 3}
propertyPath: m_AnchorMax.y
- value: 1
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 6036491610417066955, guid: ebcaad662ef2ae14ca92fbcd7a67ee56, type: 3}
propertyPath: m_AnchorMin.y
- value: 1
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 6036491610417066955, guid: ebcaad662ef2ae14ca92fbcd7a67ee56, type: 3}
propertyPath: m_SizeDelta.x
- value: 165
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 6036491610417066955, guid: ebcaad662ef2ae14ca92fbcd7a67ee56, type: 3}
propertyPath: m_SizeDelta.y
- value: 66.66667
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 6036491610417066955, guid: ebcaad662ef2ae14ca92fbcd7a67ee56, type: 3}
propertyPath: m_AnchoredPosition.x
- value: 82.5
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 6036491610417066955, guid: ebcaad662ef2ae14ca92fbcd7a67ee56, type: 3}
propertyPath: m_AnchoredPosition.y
- value: -100.00001
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 6036491611111016748, guid: ebcaad662ef2ae14ca92fbcd7a67ee56, type: 3}
propertyPath: m_AnchoredPosition.x
@@ -506,27 +534,27 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 6036491611226881075, guid: ebcaad662ef2ae14ca92fbcd7a67ee56, type: 3}
propertyPath: m_AnchorMax.y
- value: 1
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 6036491611226881075, guid: ebcaad662ef2ae14ca92fbcd7a67ee56, type: 3}
propertyPath: m_AnchorMin.y
- value: 1
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 6036491611226881075, guid: ebcaad662ef2ae14ca92fbcd7a67ee56, type: 3}
propertyPath: m_SizeDelta.x
- value: 175
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 6036491611226881075, guid: ebcaad662ef2ae14ca92fbcd7a67ee56, type: 3}
propertyPath: m_SizeDelta.y
- value: 66.666664
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 6036491611226881075, guid: ebcaad662ef2ae14ca92fbcd7a67ee56, type: 3}
propertyPath: m_AnchoredPosition.x
- value: 87.5
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 6036491611226881075, guid: ebcaad662ef2ae14ca92fbcd7a67ee56, type: 3}
propertyPath: m_AnchoredPosition.y
- value: -166.66666
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 6036491611226881076, guid: ebcaad662ef2ae14ca92fbcd7a67ee56, type: 3}
propertyPath: m_fontAsset
@@ -542,27 +570,27 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 6036491611310996876, guid: ebcaad662ef2ae14ca92fbcd7a67ee56, type: 3}
propertyPath: m_AnchorMax.y
- value: 1
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 6036491611310996876, guid: ebcaad662ef2ae14ca92fbcd7a67ee56, type: 3}
propertyPath: m_AnchorMin.y
- value: 1
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 6036491611310996876, guid: ebcaad662ef2ae14ca92fbcd7a67ee56, type: 3}
propertyPath: m_SizeDelta.x
- value: 175
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 6036491611310996876, guid: ebcaad662ef2ae14ca92fbcd7a67ee56, type: 3}
propertyPath: m_SizeDelta.y
- value: 66.666664
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 6036491611310996876, guid: ebcaad662ef2ae14ca92fbcd7a67ee56, type: 3}
propertyPath: m_AnchoredPosition.x
- value: 87.5
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 6036491611310996876, guid: ebcaad662ef2ae14ca92fbcd7a67ee56, type: 3}
propertyPath: m_AnchoredPosition.y
- value: -100
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 6036491611310996877, guid: ebcaad662ef2ae14ca92fbcd7a67ee56, type: 3}
propertyPath: m_fontAsset
@@ -578,51 +606,55 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 6036491611539832495, guid: ebcaad662ef2ae14ca92fbcd7a67ee56, type: 3}
propertyPath: m_AnchorMax.y
- value: 1
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 6036491611539832495, guid: ebcaad662ef2ae14ca92fbcd7a67ee56, type: 3}
propertyPath: m_AnchorMin.y
- value: 1
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 6036491611539832495, guid: ebcaad662ef2ae14ca92fbcd7a67ee56, type: 3}
propertyPath: m_SizeDelta.x
- value: 165
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 6036491611539832495, guid: ebcaad662ef2ae14ca92fbcd7a67ee56, type: 3}
propertyPath: m_SizeDelta.y
- value: 66.66667
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 6036491611539832495, guid: ebcaad662ef2ae14ca92fbcd7a67ee56, type: 3}
propertyPath: m_AnchoredPosition.x
- value: 82.5
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 6036491611539832495, guid: ebcaad662ef2ae14ca92fbcd7a67ee56, type: 3}
propertyPath: m_AnchoredPosition.y
- value: -33.333336
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 6036491611599734976, guid: ebcaad662ef2ae14ca92fbcd7a67ee56, type: 3}
propertyPath: m_AnchorMax.y
- value: 1
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 6036491611599734976, guid: ebcaad662ef2ae14ca92fbcd7a67ee56, type: 3}
propertyPath: m_AnchorMin.y
- value: 1
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 6036491611599734976, guid: ebcaad662ef2ae14ca92fbcd7a67ee56, type: 3}
propertyPath: m_SizeDelta.x
- value: 165
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 6036491611599734976, guid: ebcaad662ef2ae14ca92fbcd7a67ee56, type: 3}
propertyPath: m_SizeDelta.y
- value: 66.66667
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 6036491611599734976, guid: ebcaad662ef2ae14ca92fbcd7a67ee56, type: 3}
propertyPath: m_AnchoredPosition.x
- value: 82.5
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 6036491611599734976, guid: ebcaad662ef2ae14ca92fbcd7a67ee56, type: 3}
propertyPath: m_AnchoredPosition.y
- value: -166.66669
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6036491611617463841, guid: ebcaad662ef2ae14ca92fbcd7a67ee56, type: 3}
+ propertyPath: m_AnchoredPosition.x
+ value: 49
objectReference: {fileID: 0}
- target: {fileID: 6036491611617463842, guid: ebcaad662ef2ae14ca92fbcd7a67ee56, type: 3}
propertyPath: m_text
@@ -634,27 +666,27 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 6036491611808532185, guid: ebcaad662ef2ae14ca92fbcd7a67ee56, type: 3}
propertyPath: m_AnchorMax.y
- value: 1
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 6036491611808532185, guid: ebcaad662ef2ae14ca92fbcd7a67ee56, type: 3}
propertyPath: m_AnchorMin.y
- value: 1
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 6036491611808532185, guid: ebcaad662ef2ae14ca92fbcd7a67ee56, type: 3}
propertyPath: m_SizeDelta.x
- value: 175
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 6036491611808532185, guid: ebcaad662ef2ae14ca92fbcd7a67ee56, type: 3}
propertyPath: m_SizeDelta.y
- value: 66.666664
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 6036491611808532185, guid: ebcaad662ef2ae14ca92fbcd7a67ee56, type: 3}
propertyPath: m_AnchoredPosition.x
- value: 87.5
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 6036491611808532185, guid: ebcaad662ef2ae14ca92fbcd7a67ee56, type: 3}
propertyPath: m_AnchoredPosition.y
- value: -33.333332
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 6036491611808532186, guid: ebcaad662ef2ae14ca92fbcd7a67ee56, type: 3}
propertyPath: m_fontAsset
@@ -672,6 +704,18 @@ PrefabInstance:
propertyPath: m_Name
value: CanvasJsonData
objectReference: {fileID: 0}
+ - target: {fileID: 6036491612173940088, guid: ebcaad662ef2ae14ca92fbcd7a67ee56, type: 3}
+ propertyPath: m_Color.b
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6036491612173940088, guid: ebcaad662ef2ae14ca92fbcd7a67ee56, type: 3}
+ propertyPath: m_Color.g
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6036491612173940088, guid: ebcaad662ef2ae14ca92fbcd7a67ee56, type: 3}
+ propertyPath: m_Color.r
+ value: 0
+ objectReference: {fileID: 0}
- target: {fileID: 6036491612173940093, guid: ebcaad662ef2ae14ca92fbcd7a67ee56, type: 3}
propertyPath: m_Pivot.x
value: 0.5
diff --git a/Assets/SharedSpatialAnchors/Prefabs/Resources/WBgTeamLogo.jpeg.meta b/Assets/SharedSpatialAnchors/Prefabs/Resources/WBgTeamLogo.jpeg.meta
index 3143a7c..ae3059e 100644
--- a/Assets/SharedSpatialAnchors/Prefabs/Resources/WBgTeamLogo.jpeg.meta
+++ b/Assets/SharedSpatialAnchors/Prefabs/Resources/WBgTeamLogo.jpeg.meta
@@ -6,7 +6,7 @@ TextureImporter:
serializedVersion: 12
mipmaps:
mipMapMode: 0
- enableMipMap: 1
+ enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
@@ -36,13 +36,13 @@ TextureImporter:
filterMode: 1
aniso: 1
mipBias: 0
- wrapU: 0
- wrapV: 0
+ wrapU: 1
+ wrapV: 1
wrapW: 0
- nPOTScale: 1
+ nPOTScale: 0
lightmap: 0
compressionQuality: 50
- spriteMode: 0
+ spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
@@ -51,9 +51,9 @@ TextureImporter:
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
- alphaIsTransparency: 0
+ alphaIsTransparency: 1
spriteTessellationDetail: -1
- textureType: 0
+ textureType: 8
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
@@ -125,13 +125,25 @@ TextureImporter:
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 3
+ buildTarget: WebGL
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
- spriteID:
+ spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
diff --git a/Assets/SharedSpatialAnchors/Prefabs/Resources/Wind Turbine Animated 3.0.unitypackage.meta b/Assets/SharedSpatialAnchors/Prefabs/Resources/Wind Turbine Animated 3.0.unitypackage.meta
new file mode 100644
index 0000000..be2a30f
--- /dev/null
+++ b/Assets/SharedSpatialAnchors/Prefabs/Resources/Wind Turbine Animated 3.0.unitypackage.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: a4d9fd75d7bc74d1697fa3fb645e60f2
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/SharedSpatialAnchors/Scenes/SharedSpatialAnchors.unity b/Assets/SharedSpatialAnchors/Scenes/SharedSpatialAnchors.unity
index 49af451..e05183d 100644
--- a/Assets/SharedSpatialAnchors/Scenes/SharedSpatialAnchors.unity
+++ b/Assets/SharedSpatialAnchors/Scenes/SharedSpatialAnchors.unity
@@ -38,7 +38,7 @@ RenderSettings:
m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 705507994}
- m_IndirectSpecularColor: {r: 0.18028378, g: 0.22571412, b: 0.30692285, a: 1}
+ m_IndirectSpecularColor: {r: 0.18028326, g: 0.22571333, b: 0.30692202, a: 1}
m_UseRadianceAmbientProbe: 0
--- !u!157 &3
LightmapSettings:
@@ -181,7 +181,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 0
+ m_IsActive: 1
--- !u!114 &472077539
MonoBehaviour:
m_ObjectHideFlags: 0