diff --git a/.vs/ARtest/v15/Server/sqlite3/db.lock b/.vs/ARtest/v15/Server/sqlite3/db.lock
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/.vs/ARtest/v15/Server/sqlite3/storage.ide b/.vs/ARtest/v15/Server/sqlite3/storage.ide
new file mode 100644
index 0000000000000000000000000000000000000000..a6b9392024ce64cac13d477ca7e699e4ee88a4a0
Binary files /dev/null and b/.vs/ARtest/v15/Server/sqlite3/storage.ide differ
diff --git a/Assets/MemoryBox/Materials/ClearSky.mat b/Assets/MemoryBox/Materials/ClearSky.mat
index 7d3c92582b1a0380db864d6227e2a921fd2c182e..06608e478cdb08f3bb55df50821290506b94a764 100644
--- a/Assets/MemoryBox/Materials/ClearSky.mat
+++ b/Assets/MemoryBox/Materials/ClearSky.mat
@@ -41,7 +41,7 @@ Material:
- _IndexOfRefraction: 2.14
- _ReflectionStrength: 1
m_Colors:
- - _Color: {r: 1, g: 1, b: 1, a: 1}
+ - _Color: {r: 1, g: 0.9805855, b: 0.03703501, a: 1}
- _MainTex_ST: {r: 1, g: 1, b: 0, a: 0}
- _ReflectTex_ST: {r: 1, g: 1, b: 0, a: 0}
- _RefractTex_ST: {r: 1, g: 1, b: 0, a: 0}
diff --git a/Assets/MemoryBox/Materials/Thunderstorm.mat b/Assets/MemoryBox/Materials/Thunderstorm.mat
index 815120011f6ce777ebb75dc84ca3b684b257558a..0036650dc1955ea70231f81b862ce525561c4f40 100644
--- a/Assets/MemoryBox/Materials/Thunderstorm.mat
+++ b/Assets/MemoryBox/Materials/Thunderstorm.mat
@@ -74,14 +74,14 @@ Material:
- _Mode: 0
- _OcclusionStrength: 1
- _Parallax: 0.02
- - _Shininess: 1
+ - _Shininess: 0.1
- _SmoothnessTextureChannel: 1
- _SpecularHighlights: 1
- _SrcBlend: 1
- _UVSec: 0
- _ZWrite: 1
m_Colors:
- - _Color: {r: 1, g: 1, b: 1, a: 1}
+ - _Color: {r: 0.22014068, g: 0.20436852, b: 0.66176474, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- - _ReflectColor: {r: 1, g: 1, b: 1, a: 0.5}
- - _SpecColor: {r: 1, g: 1, b: 1, a: 1}
+ - _ReflectColor: {r: 0.36607915, g: 0.3664011, b: 0.8161765, a: 0.941}
+ - _SpecColor: {r: 1, g: 1, b: 0, a: 1}
diff --git a/Assets/MemoryBox/Materials/Wind.mat b/Assets/MemoryBox/Materials/Wind.mat
index 21c483c6a0b216cec2cbba974d9ad11e5d71f4ee..8dc66aabbb4dfa985a0e66b2ca05800ad1867bc6 100644
--- a/Assets/MemoryBox/Materials/Wind.mat
+++ b/Assets/MemoryBox/Materials/Wind.mat
@@ -78,6 +78,6 @@ Material:
- _UVSec: 0
- _ZWrite: 1
m_Colors:
- - _Color: {r: 1, g: 1, b: 1, a: 0.865}
+ - _Color: {r: 0.35294116, g: 0.044117644, b: 0.044117644, a: 0.865}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SpecColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
diff --git a/Assets/MemoryBox/Materials/alm.mat b/Assets/MemoryBox/Materials/alm.mat
new file mode 100644
index 0000000000000000000000000000000000000000..1c11e675c5ac05711522ceba1da1714488ee8b46
--- /dev/null
+++ b/Assets/MemoryBox/Materials/alm.mat
@@ -0,0 +1,76 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+ serializedVersion: 6
+ m_ObjectHideFlags: 0
+ m_PrefabParentObject: {fileID: 0}
+ m_PrefabInternal: {fileID: 0}
+ m_Name: alm
+ m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
+ m_ShaderKeywords:
+ 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: 0}
+ 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_Floats:
+ - _BumpScale: 1
+ - _Cutoff: 0.5
+ - _DetailNormalMapScale: 1
+ - _DstBlend: 0
+ - _GlossMapScale: 1
+ - _Glossiness: 0
+ - _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: 0.026, g: 0.5564, b: 0.65, a: 1}
+ - _EmissionColor: {r: 0, g: 0, b: 0, a: 0}
diff --git a/Assets/MemoryBox/Materials/alm.mat.meta b/Assets/MemoryBox/Materials/alm.mat.meta
new file mode 100644
index 0000000000000000000000000000000000000000..d3132e50b6711cee366fd5b515b45a90b879999f
--- /dev/null
+++ b/Assets/MemoryBox/Materials/alm.mat.meta
@@ -0,0 +1,10 @@
+fileFormatVersion: 2
+guid: e07b44ac52764ac4cabd021331b4e685
+timeCreated: 1517421549
+licenseType: Free
+NativeFormatImporter:
+ externalObjects: {}
+ mainObjectFileID: 2100000
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/MemoryBox/Materials/cloudy.mat b/Assets/MemoryBox/Materials/cloudy.mat
index 05e8f107e7d467294d2579ed05eccbb1aedaf5e7..315ea2870cc77ee78906f3234d2a01fc6c43decc 100644
--- a/Assets/MemoryBox/Materials/cloudy.mat
+++ b/Assets/MemoryBox/Materials/cloudy.mat
@@ -73,7 +73,7 @@ Material:
- _UVSec: 0
- _ZWrite: 1
m_Colors:
- - _Color: {r: 1, g: 1, b: 1, a: 0.59}
+ - _Color: {r: 0.19326863, g: 0.3602941, b: 0.07947663, a: 0.59}
- _Emission: {r: 0.064655155, g: 0.08430525, b: 0.086206876, a: 0}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SpecColor: {r: 1, g: 1, b: 1, a: 0}
diff --git a/Assets/MemoryBox/Materials/mappings/638969948 1.jpg.meta b/Assets/MemoryBox/Materials/mappings/638969948 1.jpg.meta
index d352dd9dad95bb8e10493cdafe0c1c89051e0761..ded2256727c2fd34431d0b79a4b0f97f6f2c7a1c 100644
--- a/Assets/MemoryBox/Materials/mappings/638969948 1.jpg.meta
+++ b/Assets/MemoryBox/Materials/mappings/638969948 1.jpg.meta
@@ -8,11 +8,11 @@ TextureImporter:
serializedVersion: 4
mipmaps:
mipMapMode: 0
- enableMipMap: 1
+ enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
- borderMipMap: 0
+ borderMipMap: 1
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
@@ -22,7 +22,7 @@ TextureImporter:
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
- isReadable: 0
+ isReadable: 1
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
@@ -32,25 +32,25 @@ TextureImporter:
textureSettings:
serializedVersion: 2
filterMode: -1
- aniso: -1
+ aniso: 1
mipBias: -1
- wrapU: -1
- wrapV: -1
+ wrapU: 1
+ wrapV: 1
wrapW: -1
- nPOTScale: 1
+ nPOTScale: 0
lightmap: 0
compressionQuality: 50
- spriteMode: 0
- spriteExtrude: 1
- spriteMeshType: 1
+ spriteMode: 2
+ spriteExtrude: 12
+ spriteMeshType: 0
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
- spritePixelsToUnits: 100
- alphaUsage: 1
- alphaIsTransparency: 0
+ spritePixelsToUnits: 1000
+ alphaUsage: 0
+ alphaIsTransparency: 1
spriteTessellationDetail: -1
- textureType: 0
+ textureType: 8
textureShape: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
@@ -65,6 +65,17 @@ TextureImporter:
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
+ androidETC2FallbackOverride: 0
+ - buildTarget: Standalone
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []
diff --git a/Assets/MemoryBox/Materials/rains.mat b/Assets/MemoryBox/Materials/rains.mat
index bdcacc41d48755a74c8c04afe756d03bda0577f6..37f109a7fd23b2bedef94b68a05aeb76109ae6a8 100644
--- a/Assets/MemoryBox/Materials/rains.mat
+++ b/Assets/MemoryBox/Materials/rains.mat
@@ -51,7 +51,7 @@ Material:
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ParallaxMap:
- m_Texture: {fileID: 0}
+ m_Texture: {fileID: 2800000, guid: 06d5e09f171bb4147967727b2ba1979b, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
@@ -73,7 +73,7 @@ Material:
- _UVSec: 0
- _ZWrite: 1
m_Colors:
- - _Color: {r: 1, g: 1, b: 1, a: 0.785}
+ - _Color: {r: 0.24372835, g: 0.30043247, b: 0.6764706, a: 0.785}
- _Emission: {r: 0, g: 0, b: 0, a: 0}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- - _SpecColor: {r: 0.94827586, g: 0.94827586, b: 0.94827586, a: 0}
+ - _SpecColor: {r: 0.34450695, g: 0.86764705, b: 0.86764705, a: 0}
diff --git a/Assets/MemoryBox/Materials/snow.mat b/Assets/MemoryBox/Materials/snow.mat
index 92c7ca4f381d8fdc8bb3f9022223a103944d1a64..3044478140404b5a431a69fd35cc75f1037f7512 100644
--- a/Assets/MemoryBox/Materials/snow.mat
+++ b/Assets/MemoryBox/Materials/snow.mat
@@ -71,9 +71,9 @@ Material:
- _DstBlend: 10
- _EnableExternalAlpha: 0
- _GlossMapScale: 1
- - _Glossiness: 0.361
+ - _Glossiness: 0
- _GlossyReflections: 1
- - _Metallic: 0.128
+ - _Metallic: 0
- _Mode: 2
- _OcclusionStrength: 1
- _Parallax: 0.02
diff --git a/Assets/MemoryBox/arScene/Materials/GreenScreen.mat b/Assets/MemoryBox/arScene/Materials/GreenScreen.mat
new file mode 100644
index 0000000000000000000000000000000000000000..905d21c815878a183a4b4073fa92b2d030435056
--- /dev/null
+++ b/Assets/MemoryBox/arScene/Materials/GreenScreen.mat
@@ -0,0 +1,76 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+ serializedVersion: 6
+ m_ObjectHideFlags: 0
+ m_PrefabParentObject: {fileID: 0}
+ m_PrefabInternal: {fileID: 0}
+ m_Name: GreenScreen
+ m_Shader: {fileID: 10755, guid: 0000000000000000f000000000000000, type: 0}
+ m_ShaderKeywords:
+ 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: 0}
+ 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_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: 0, g: 1, b: 0.006896496, a: 1}
+ - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
diff --git a/Assets/MemoryBox/arScene/Materials/GreenScreen.mat.meta b/Assets/MemoryBox/arScene/Materials/GreenScreen.mat.meta
new file mode 100644
index 0000000000000000000000000000000000000000..055b20666695d0b5e6eeb503bb25b26339cc9267
--- /dev/null
+++ b/Assets/MemoryBox/arScene/Materials/GreenScreen.mat.meta
@@ -0,0 +1,10 @@
+fileFormatVersion: 2
+guid: a5e3f4150d4d84392ba7b8349ab3a043
+timeCreated: 1517152351
+licenseType: Free
+NativeFormatImporter:
+ externalObjects: {}
+ mainObjectFileID: 2100000
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/MemoryBox/arScene/Materials/demoPicture.jpg b/Assets/MemoryBox/arScene/Materials/demoPicture.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..f6859e267d75b653273e9d5114eb0934db56945c
Binary files /dev/null and b/Assets/MemoryBox/arScene/Materials/demoPicture.jpg differ
diff --git a/Assets/MemoryBox/arScene/Materials/demoPicture.jpg.meta b/Assets/MemoryBox/arScene/Materials/demoPicture.jpg.meta
new file mode 100644
index 0000000000000000000000000000000000000000..45543f01372152e53dc4416754e754416303a088
--- /dev/null
+++ b/Assets/MemoryBox/arScene/Materials/demoPicture.jpg.meta
@@ -0,0 +1,77 @@
+fileFormatVersion: 2
+guid: 06daaaff06cf03a4d86ad98c8f43ebf1
+timeCreated: 1517528082
+licenseType: Free
+TextureImporter:
+ fileIDToRecycleName: {}
+ externalObjects: {}
+ serializedVersion: 4
+ mipmaps:
+ mipMapMode: 0
+ enableMipMap: 1
+ sRGBTexture: 1
+ linearTexture: 0
+ fadeOut: 0
+ borderMipMap: 0
+ mipMapsPreserveCoverage: 0
+ alphaTestReferenceValue: 0.5
+ mipMapFadeDistanceStart: 1
+ mipMapFadeDistanceEnd: 3
+ bumpmap:
+ convertToNormalMap: 0
+ externalNormalMap: 0
+ heightScale: 0.25
+ normalMapFilter: 0
+ isReadable: 0
+ grayScaleToAlpha: 0
+ generateCubemap: 6
+ cubemapConvolution: 0
+ seamlessCubemap: 0
+ textureFormat: 1
+ maxTextureSize: 2048
+ textureSettings:
+ serializedVersion: 2
+ filterMode: -1
+ aniso: -1
+ mipBias: -1
+ wrapU: -1
+ wrapV: -1
+ wrapW: -1
+ nPOTScale: 1
+ lightmap: 0
+ compressionQuality: 50
+ spriteMode: 0
+ spriteExtrude: 1
+ spriteMeshType: 1
+ alignment: 0
+ spritePivot: {x: 0.5, y: 0.5}
+ spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+ spritePixelsToUnits: 100
+ alphaUsage: 1
+ alphaIsTransparency: 0
+ spriteTessellationDetail: -1
+ textureType: 0
+ textureShape: 1
+ maxTextureSizeSet: 0
+ compressionQualitySet: 0
+ textureFormatSet: 0
+ platformSettings:
+ - buildTarget: DefaultTexturePlatform
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ androidETC2FallbackOverride: 0
+ spriteSheet:
+ serializedVersion: 2
+ sprites: []
+ outline: []
+ physicsShape: []
+ spritePackingTag:
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/MemoryBox/arScene/Materials/demoPicture.mat b/Assets/MemoryBox/arScene/Materials/demoPicture.mat
new file mode 100644
index 0000000000000000000000000000000000000000..c1c3aff6c5a3c0bb82dac73e7833992704266548
--- /dev/null
+++ b/Assets/MemoryBox/arScene/Materials/demoPicture.mat
@@ -0,0 +1,76 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+ serializedVersion: 6
+ m_ObjectHideFlags: 0
+ m_PrefabParentObject: {fileID: 0}
+ m_PrefabInternal: {fileID: 0}
+ m_Name: demoPicture
+ m_Shader: {fileID: 10752, guid: 0000000000000000f000000000000000, type: 0}
+ m_ShaderKeywords:
+ 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: 06daaaff06cf03a4d86ad98c8f43ebf1, 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_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}
diff --git a/Assets/MemoryBox/arScene/Materials/demoPicture.mat.meta b/Assets/MemoryBox/arScene/Materials/demoPicture.mat.meta
new file mode 100644
index 0000000000000000000000000000000000000000..ec35cec86924b6ef7b53f7749bd9fff593b36f60
--- /dev/null
+++ b/Assets/MemoryBox/arScene/Materials/demoPicture.mat.meta
@@ -0,0 +1,10 @@
+fileFormatVersion: 2
+guid: 4e9d986b7da5dd64babb81463ef2dd7c
+timeCreated: 1517528798
+licenseType: Free
+NativeFormatImporter:
+ externalObjects: {}
+ mainObjectFileID: 2100000
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/MemoryBox/arScene/Scripts/Memstone.cs b/Assets/MemoryBox/arScene/Scripts/Memstone.cs
index 5606d441e0eb636080834c265d9b7d60ac8c1d70..5a768e50869992e9225398352a65d5314b2f0972 100644
--- a/Assets/MemoryBox/arScene/Scripts/Memstone.cs
+++ b/Assets/MemoryBox/arScene/Scripts/Memstone.cs
@@ -30,7 +30,7 @@ namespace MemoryBox.arScene.Scripts
// Update is called once per frame
private void Update () {
// move relative to player gps
- transform.position = Vector3.MoveTowards(transform.position, _transformLocation, 0.1f);
+ transform.localPosition = Vector3.MoveTowards(transform.position, _transformLocation, 0.1f);
}
/**
@@ -72,7 +72,7 @@ namespace MemoryBox.arScene.Scripts
public void UpdatePosition(GpSdata userGps)
{
var newPos = _positionInWorldSpace(userGps);
- Logger.AddDebug(newPos.x+"/"+newPos.y+"/"+newPos.z);
+ //Logger.AddDebug(newPos.x+"/"+newPos.y+"/"+newPos.z);
_transformLocation = newPos;
}
diff --git a/Assets/MemoryBox/arScene/Scripts/ObjectFactory.cs b/Assets/MemoryBox/arScene/Scripts/ObjectFactory.cs
index fa37f0505af7643330f3c730bc25bf6791eddf35..59a16bcbfdc27415c6c5ac546fd255775976e357 100644
--- a/Assets/MemoryBox/arScene/Scripts/ObjectFactory.cs
+++ b/Assets/MemoryBox/arScene/Scripts/ObjectFactory.cs
@@ -1,4 +1,3 @@
-using System;
using UnityEngine;
namespace MemoryBox.arScene.Scripts
@@ -7,11 +6,16 @@ namespace MemoryBox.arScene.Scripts
{
public UserGps UserGps;
public DebugText Logger;
+ public GameObject VisibleAreaContainer;
- public void AddMemstone(string name, float latitude, float longitude, Mesh mesh, Material material)
+ public Memstone AddMemstone(string name, float latitude, float longitude, Mesh mesh, Material material)
{
+ // todo maybe just use a constructor for this part?
+ // then the init would be done with the correct User instance already assigned and goto gps location should be updated in initial step
+
// main game object
var memObject = new GameObject(name);
+ //memObject.transform.SetParent(VisibleAreaContainer.transform);
var memComponent = memObject.AddComponent<Memstone>();
memComponent.Latitude = latitude;
memComponent.Longitude = longitude;
@@ -21,6 +25,7 @@ namespace MemoryBox.arScene.Scripts
// child object holding geometry and 3D information
var memChild = new GameObject("mesh");
+ memChild.transform.SetParent(memObject.transform);
// add mesh filter and assign its mesh
var meshFilter = memChild.AddComponent<MeshFilter>();
meshFilter.mesh = mesh;
@@ -29,16 +34,13 @@ namespace MemoryBox.arScene.Scripts
meshRenderer.material = material;
// todo maybe change some default settings ?
+
+ return memComponent;
}
private void Start()
{
- var s = SystemInfo.operatingSystemFamily == OperatingSystemFamily.Windows ? "\\": "/";
- var path = ".." + s + "Memoryox" + s + "arScene" + s + "testobjects" + s;
- var mesh = Resources.Load<Mesh>(path + "20.wav");
- var material = Resources.Load<Material>(path + "20.wav");
- AddMemstone("01", 52.52625f, 13.40070f, mesh, material);
- Logger.AddDebug("test memstone added");
+
}
}
}
diff --git a/Assets/MemoryBox/arScene/Scripts/UserGps.cs b/Assets/MemoryBox/arScene/Scripts/UserGps.cs
index 15d22178c98ee4f4c9fa721dd99b827af815dae5..03f347f5684689cfdf442ee9013a78a106d41db6 100644
--- a/Assets/MemoryBox/arScene/Scripts/UserGps.cs
+++ b/Assets/MemoryBox/arScene/Scripts/UserGps.cs
@@ -1,6 +1,7 @@
using System;
using System.Collections.Generic;
using UnityEngine;
+using Zios;
namespace MemoryBox.arScene.Scripts
{
@@ -12,9 +13,24 @@ namespace MemoryBox.arScene.Scripts
*/
public class UserGps : MonoBehaviour
{
- public GpSdata GpSdata;
+ public float Latitude = 52.52629f;
+ public float Longitude = 13.40061f;
+
+ private GpSdata _gpSdata;
+ private GpSdata GpSdata
+ {
+ get { return _gpSdata; }
+ set
+ {
+ _gpSdata = value;
+ Longitude = _gpSdata.Longitude;
+ Latitude = _gpSdata.Latitude;
+ }
+ }
- private Boolean _gpsStarted;
+ public Camera MainCamera; // thought was to move the objects relative to the camera orientation
+
+ private bool _gpsStarted;
internal List<Memstone> MemoryObjects = new List<Memstone>(); // list of objects that need gps updates
private readonly LocationService _locationService = new LocationService();
@@ -25,13 +41,44 @@ namespace MemoryBox.arScene.Scripts
{
_gpsStarted = StartGps();
InvokeRepeating("_startGPS", 30f, 30f);
- GpSdata = new GpSdata(52.52623f, 13.40068f, 0); // fake gps
+ GpSdata = new GpSdata(Latitude, Longitude, 0); // fake gps @cluster
UpdateGps(true);
}
// Update is called once per frame
void Update () {
- UpdateGps(); // todo maybe don't do this every frame - InvokeRepeating maybe? depending on how annoying this is
+ if (SystemInfo.supportsLocationService)
+ {
+ UpdateGps(); // todo maybe don't do this every frame - InvokeRepeating maybe? depending on how annoying this is
+ }
+ else
+ {
+ // keyboard controls
+ var newLocation = GpSdata;
+ const float unit = 0.00001f;
+ // keyboard movement not tied to camera rotation
+ if (Input.GetKey("w"))
+ {
+ newLocation.Latitude += unit;
+ }
+
+ if (Input.GetKey("s"))
+ {
+ newLocation.Latitude -= unit;
+ }
+
+ if (Input.GetKey("a"))
+ {
+ newLocation.Longitude += unit;
+ }
+
+ if (Input.GetKey("d"))
+ {
+ newLocation.Longitude -= unit;
+ }
+
+ UpdateGps(newLocation);
+ }
}
private void _startGPS()
@@ -39,7 +86,7 @@ namespace MemoryBox.arScene.Scripts
_gpsStarted = StartGps();
}
- Boolean StartGps()
+ private bool StartGps()
{
Input.location.Start(1f,0.1f);
var maxWait = 20;
@@ -82,21 +129,32 @@ namespace MemoryBox.arScene.Scripts
GpSdata = GetLocationInfo();
if (notifyObservers && !prevLocation.Equals(GpSdata) || force)
{
- // notify observers if wanted and location has changed
- foreach (var memoryObject in MemoryObjects)
- {
- memoryObject.UpdatePosition(GpSdata);
- }
+ NotifyObservers();
}
}
+
+ public void UpdateGps(GpSdata newLocation)
+ {
+ GpSdata = newLocation;
+ NotifyObservers();
+ }
+
+ public void NotifyObservers()
+ {
+ // notify observers if wanted and location has changed
+ foreach (var memoryObject in MemoryObjects)
+ {
+ memoryObject.UpdatePosition(GpSdata);
+ }
+ }
}
public struct GpSdata
{
- public readonly float Latitude;
- public readonly float Longitude;
- public readonly float Altitude;
+ public float Latitude;
+ public float Longitude;
+ public float Altitude;
public GpSdata(float latitude, float longitude, float altitude)
{
diff --git a/Assets/MemoryBox/arScene/Scripts/WebCamScript.cs b/Assets/MemoryBox/arScene/Scripts/WebCamScript.cs
index 8f45ee3f8f63f2dcedc0a356369d330b3613471c..65a47ae1ed4028ee73dcb68cf04fb62c11555ced 100644
--- a/Assets/MemoryBox/arScene/Scripts/WebCamScript.cs
+++ b/Assets/MemoryBox/arScene/Scripts/WebCamScript.cs
@@ -11,6 +11,14 @@ namespace MemoryBox.arScene.Scripts
public DebugText ScreenInfo;
public DebugText CameraInfo;
public GameObject InitPanel;
+ public GameObject VisibleAreaContainer;
+
+ //mouse
+ public float MouseSensitivity = 100.0f;
+ public float ClampAngle = 80.0f;
+
+ private float _rotY = 0.0f; // rotation around the up/y axis
+ private float _rotX = 0.0f; // rIotation around the right/x axis
private bool _camInitialized = false;
@@ -37,15 +45,19 @@ namespace MemoryBox.arScene.Scripts
DebugInfo.AddDebug("gyro enabled");
+ // adjust rotation of visible area
+ Input.compass.enabled = true;
+ VisibleAreaContainer.transform.rotation = Quaternion.Euler(0, -Input.compass.magneticHeading, 0);
+
_webCameraTexture = new WebCamTexture();
var camRenderer = WebCameraPlane.GetComponent<Renderer>();
- camRenderer.material.mainTexture = _webCameraTexture;
if (Application.isMobilePlatform)
{
+ camRenderer.material.mainTexture = _webCameraTexture;
camRenderer.transform.Rotate(Vector3.up, 90);
}
- _webCameraTexture.filterMode = FilterMode.Trilinear; // quality >? performance
+ _webCameraTexture.filterMode = FilterMode.Trilinear; ////// quality >? performance
// this reports very low values at the initilization
DebugInfo.AddDebug(_webCameraTexture.width+"x"+_webCameraTexture.height);
@@ -54,11 +66,13 @@ namespace MemoryBox.arScene.Scripts
PlaneResize();
DebugInfo.AddDebug("Plane resized");
-
- _webCameraTexture.Play();
-
- DebugInfo.AddDebug("camera plays");
-
+
+ if (Application.isMobilePlatform)
+ {
+ _webCameraTexture.Play();
+ DebugInfo.AddDebug("camera plays");
+ }
+
//InvokeRepeating("RecalculateCameraResolution", 0.5f, 2f);
}
@@ -115,13 +129,34 @@ namespace MemoryBox.arScene.Scripts
private void Update () {
if (_camInitialized)
{
- // update rotation with gyro
- var cameraRotation = new Quaternion(Input.gyro.attitude.x, Input.gyro.attitude.y,
- -Input.gyro.attitude.z, -Input.gyro.attitude.w);
- transform.localRotation = cameraRotation;
+ if (SystemInfo.supportsGyroscope)
+ {
+ // update rotation with gyro
+ var cameraRotation = new Quaternion(Input.gyro.attitude.x, Input.gyro.attitude.y,
+ -Input.gyro.attitude.z, -Input.gyro.attitude.w);
+ transform.localRotation = cameraRotation;
+ }
+ else
+ {
+ Cursor.lockState = Input.GetKey(KeyCode.Escape) ? CursorLockMode.None : CursorLockMode.Locked;
+ if (Cursor.lockState == CursorLockMode.Locked)
+ {
+ var mouseX = Input.GetAxis("Mouse X");
+ var mouseY = -Input.GetAxis("Mouse Y");
+
+ _rotY += mouseX * MouseSensitivity * Time.deltaTime;
+ _rotX += mouseY * MouseSensitivity * Time.deltaTime;
+
+ _rotX = Mathf.Clamp(_rotX, -ClampAngle, ClampAngle);
+
+ Quaternion localRotation = Quaternion.Euler(_rotX, _rotY, 0.0f);
+ transform.rotation = localRotation;
+ }
+ }
}
else if (_webCameraTexture != null &&
- (_webCameraTexture.width > 100 || _webCameraTexture.height > 100))
+ (_webCameraTexture.width > 100 || _webCameraTexture.height > 100)
+ || WebCamTexture.devices.Length < 1 || !Application.isMobilePlatform)
{
// show actual screen content after camera initialisation
// also resolution stuff
diff --git a/Assets/MemoryBox/arScene/arScene.unity b/Assets/MemoryBox/arScene/arScene.unity
index d1c3e74ea97dc8121375a1a3a7b8b45030c21553..64f479c4da3cc590257f5c0b0eaa12d71e5e5ceb 100644
--- a/Assets/MemoryBox/arScene/arScene.unity
+++ b/Assets/MemoryBox/arScene/arScene.unity
@@ -3143,6 +3143,9 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: aa5e4e393fa2cdc4a92ecd3e82891305, type: 3}
m_Name:
m_EditorClassIdentifier:
+ Latitude: 52.52629
+ Longitude: 13.40061
+ MainCamera: {fileID: 0}
--- !u!4 &606266133
Transform:
m_ObjectHideFlags: 0
@@ -3163,7 +3166,7 @@ GameObject:
m_PrefabInternal: {fileID: 0}
serializedVersion: 5
m_Component:
- - component: {fileID: 619437920}
+ - component: {fileID: 619437924}
- component: {fileID: 619437923}
- component: {fileID: 619437922}
- component: {fileID: 619437921}
@@ -3179,13 +3182,13 @@ Transform:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
- m_GameObject: {fileID: 619437919}
+ m_GameObject: {fileID: 1766710362}
m_LocalRotation: {x: -0.7071068, y: 0, z: 0, w: 0.7071068}
m_LocalPosition: {x: 0, y: 0, z: 100}
m_LocalScale: {x: 25, y: 1, z: 12.5}
m_Children: []
m_Father: {fileID: 1444983101}
- m_RootOrder: 0
+ m_RootOrder: 1
m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0}
--- !u!23 &619437921
MeshRenderer:
@@ -3201,7 +3204,7 @@ MeshRenderer:
m_LightProbeUsage: 0
m_ReflectionProbeUsage: 0
m_Materials:
- - {fileID: 2100000, guid: 79c300c93a67a4f4091470d05573f4b9, type: 2}
+ - {fileID: 2100000, guid: 4e9d986b7da5dd64babb81463ef2dd7c, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
@@ -3243,6 +3246,19 @@ MeshFilter:
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 619437919}
m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!4 &619437924
+Transform:
+ m_ObjectHideFlags: 0
+ m_PrefabParentObject: {fileID: 0}
+ m_PrefabInternal: {fileID: 0}
+ m_GameObject: {fileID: 619437919}
+ m_LocalRotation: {x: -0.7071068, y: -0, z: -0, w: 0.7071068}
+ m_LocalPosition: {x: 0, y: 0, z: 100}
+ m_LocalScale: {x: -25, y: 1, z: -12.5}
+ m_Children: []
+ m_Father: {fileID: 1444983101}
+ m_RootOrder: 0
+ m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0}
--- !u!1 &629051736
GameObject:
m_ObjectHideFlags: 0
@@ -4516,7 +4532,7 @@ Prefab:
m_Modifications:
- target: {fileID: 400000, guid: 092cfa909b23e78469c803637c9f7ab2, type: 3}
propertyPath: m_LocalPosition.x
- value: -0
+ value: -6.119548
objectReference: {fileID: 0}
- target: {fileID: 400000, guid: 092cfa909b23e78469c803637c9f7ab2, type: 3}
propertyPath: m_LocalPosition.y
@@ -4544,8 +4560,24 @@ Prefab:
objectReference: {fileID: 0}
- target: {fileID: 400000, guid: 092cfa909b23e78469c803637c9f7ab2, type: 3}
propertyPath: m_RootOrder
- value: 5
+ value: 6
objectReference: {fileID: 0}
+ - target: {fileID: 400000, guid: 092cfa909b23e78469c803637c9f7ab2, type: 3}
+ propertyPath: m_LocalScale.x
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 400000, guid: 092cfa909b23e78469c803637c9f7ab2, type: 3}
+ propertyPath: m_LocalScale.y
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 400000, guid: 092cfa909b23e78469c803637c9f7ab2, type: 3}
+ propertyPath: m_LocalScale.z
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 2300000, guid: 092cfa909b23e78469c803637c9f7ab2, type: 3}
+ propertyPath: m_Materials.Array.data[0]
+ value:
+ objectReference: {fileID: 2100000, guid: de9fd9692ba4543428ff4d24e1093f49, type: 2}
m_RemovedComponents: []
m_ParentPrefab: {fileID: 100100000, guid: 092cfa909b23e78469c803637c9f7ab2, type: 3}
m_IsPrefabParent: 0
@@ -4564,8 +4596,8 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: e698040042f61fb469a8ce13b2033de6, type: 3}
m_Name:
m_EditorClassIdentifier:
- Latitude: 52.55301
- Longitude: 13.40355
+ Latitude: 52.52606
+ Longitude: 13.4004
UserGps: {fileID: 606266132}
Logger: {fileID: 1167427449}
--- !u!4 &898356013 stripped
@@ -4635,7 +4667,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 1340223787}
- m_RootOrder: 6
+ m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0}
--- !u!1 &948036726
GameObject:
@@ -5278,90 +5310,6 @@ CanvasRenderer:
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1076696612}
---- !u!1 &1135407578
-GameObject:
- m_ObjectHideFlags: 0
- m_PrefabParentObject: {fileID: 0}
- m_PrefabInternal: {fileID: 0}
- serializedVersion: 5
- m_Component:
- - component: {fileID: 1135407582}
- - component: {fileID: 1135407581}
- - component: {fileID: 1135407580}
- - component: {fileID: 1135407579}
- m_Layer: 0
- m_Name: Cube
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!23 &1135407579
-MeshRenderer:
- m_ObjectHideFlags: 0
- m_PrefabParentObject: {fileID: 0}
- m_PrefabInternal: {fileID: 0}
- m_GameObject: {fileID: 1135407578}
- m_Enabled: 0
- m_CastShadows: 1
- m_ReceiveShadows: 1
- m_DynamicOccludee: 1
- m_MotionVectors: 1
- m_LightProbeUsage: 1
- m_ReflectionProbeUsage: 1
- m_Materials:
- - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0}
- m_StaticBatchInfo:
- firstSubMesh: 0
- subMeshCount: 0
- m_StaticBatchRoot: {fileID: 0}
- m_ProbeAnchor: {fileID: 0}
- m_LightProbeVolumeOverride: {fileID: 0}
- m_ScaleInLightmap: 1
- m_PreserveUVs: 1
- m_IgnoreNormalsForChartDetection: 0
- m_ImportantGI: 0
- m_StitchLightmapSeams: 0
- m_SelectedEditorRenderState: 3
- m_MinimumChartSize: 4
- m_AutoUVMaxDistance: 0.5
- m_AutoUVMaxAngle: 89
- m_LightmapParameters: {fileID: 0}
- m_SortingLayerID: 0
- m_SortingLayer: 0
- m_SortingOrder: 0
---- !u!65 &1135407580
-BoxCollider:
- m_ObjectHideFlags: 0
- m_PrefabParentObject: {fileID: 0}
- m_PrefabInternal: {fileID: 0}
- m_GameObject: {fileID: 1135407578}
- m_Material: {fileID: 0}
- m_IsTrigger: 0
- m_Enabled: 1
- serializedVersion: 2
- m_Size: {x: 1, y: 1, z: 1}
- m_Center: {x: 0, y: 0, z: 0}
---- !u!33 &1135407581
-MeshFilter:
- m_ObjectHideFlags: 0
- m_PrefabParentObject: {fileID: 0}
- m_PrefabInternal: {fileID: 0}
- m_GameObject: {fileID: 1135407578}
- m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
---- !u!4 &1135407582
-Transform:
- m_ObjectHideFlags: 0
- m_PrefabParentObject: {fileID: 0}
- m_PrefabInternal: {fileID: 0}
- m_GameObject: {fileID: 1135407578}
- m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: -3.1900024, y: 0.76000977, z: -8.810001}
- m_LocalScale: {x: 22.8, y: 10, z: 16}
- m_Children: []
- m_Father: {fileID: 1340223787}
- m_RootOrder: 0
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1162952434
GameObject:
m_ObjectHideFlags: 0
@@ -5828,11 +5776,11 @@ Prefab:
m_Modifications:
- target: {fileID: 400000, guid: ce5d8f598aa99574e9fec90ad51c07aa, type: 3}
propertyPath: m_LocalPosition.x
- value: 4.2241
+ value: -1.8954453
objectReference: {fileID: 0}
- target: {fileID: 400000, guid: ce5d8f598aa99574e9fec90ad51c07aa, type: 3}
propertyPath: m_LocalPosition.y
- value: -1.0409474
+ value: -1.0409473
objectReference: {fileID: 0}
- target: {fileID: 400000, guid: ce5d8f598aa99574e9fec90ad51c07aa, type: 3}
propertyPath: m_LocalPosition.z
@@ -5856,8 +5804,24 @@ Prefab:
objectReference: {fileID: 0}
- target: {fileID: 400000, guid: ce5d8f598aa99574e9fec90ad51c07aa, type: 3}
propertyPath: m_RootOrder
- value: 4
+ value: 2
+ objectReference: {fileID: 0}
+ - target: {fileID: 400000, guid: ce5d8f598aa99574e9fec90ad51c07aa, type: 3}
+ propertyPath: m_LocalScale.x
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 400000, guid: ce5d8f598aa99574e9fec90ad51c07aa, type: 3}
+ propertyPath: m_LocalScale.y
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 400000, guid: ce5d8f598aa99574e9fec90ad51c07aa, type: 3}
+ propertyPath: m_LocalScale.z
+ value: 1
objectReference: {fileID: 0}
+ - target: {fileID: 2300000, guid: ce5d8f598aa99574e9fec90ad51c07aa, type: 3}
+ propertyPath: m_Materials.Array.data[0]
+ value:
+ objectReference: {fileID: 2100000, guid: fc077f0d30f0a4ccea1d2c28fa3cf93b, type: 2}
m_RemovedComponents: []
m_ParentPrefab: {fileID: 100100000, guid: ce5d8f598aa99574e9fec90ad51c07aa, type: 3}
m_IsPrefabParent: 0
@@ -5876,8 +5840,8 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: e698040042f61fb469a8ce13b2033de6, type: 3}
m_Name:
m_EditorClassIdentifier:
- Latitude: 52.43355
- Longitude: 13.3631
+ Latitude: 52.52624
+ Longitude: 13.40069
UserGps: {fileID: 606266132}
Logger: {fileID: 1167427449}
--- !u!4 &1240764953 stripped
@@ -6252,13 +6216,13 @@ Transform:
m_LocalPosition: {x: 3.1900024, y: -0.76000977, z: 8.810001}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- - {fileID: 1135407582}
- - {fileID: 1415908556}
- - {fileID: 1641205795}
- - {fileID: 1614600505}
+ - {fileID: 1924470810}
+ - {fileID: 900807306}
- {fileID: 1240764953}
+ - {fileID: 1614600505}
+ - {fileID: 1641205795}
+ - {fileID: 1415908556}
- {fileID: 898356013}
- - {fileID: 900807306}
- {fileID: 578402801}
m_Father: {fileID: 0}
m_RootOrder: 1
@@ -6541,6 +6505,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
UserGps: {fileID: 606266132}
Logger: {fileID: 1167427449}
+ VisibleAreaContainer: {fileID: 1924470806}
--- !u!4 &1373830367
Transform:
m_ObjectHideFlags: 0
@@ -6796,7 +6761,7 @@ Prefab:
m_Modifications:
- target: {fileID: 400000, guid: 089f84405caae2546b3bcc31622603f4, type: 3}
propertyPath: m_LocalPosition.x
- value: -1.2904568
+ value: -7.410002
objectReference: {fileID: 0}
- target: {fileID: 400000, guid: 089f84405caae2546b3bcc31622603f4, type: 3}
propertyPath: m_LocalPosition.y
@@ -6824,8 +6789,24 @@ Prefab:
objectReference: {fileID: 0}
- target: {fileID: 400000, guid: 089f84405caae2546b3bcc31622603f4, type: 3}
propertyPath: m_RootOrder
+ value: 5
+ objectReference: {fileID: 0}
+ - target: {fileID: 400000, guid: 089f84405caae2546b3bcc31622603f4, type: 3}
+ propertyPath: m_LocalScale.x
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 400000, guid: 089f84405caae2546b3bcc31622603f4, type: 3}
+ propertyPath: m_LocalScale.y
value: 1
objectReference: {fileID: 0}
+ - target: {fileID: 400000, guid: 089f84405caae2546b3bcc31622603f4, type: 3}
+ propertyPath: m_LocalScale.z
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 2300000, guid: 089f84405caae2546b3bcc31622603f4, type: 3}
+ propertyPath: m_Materials.Array.data[0]
+ value:
+ objectReference: {fileID: 2100000, guid: 79037c49cd6b6487c9b0ed1f968b9225, type: 2}
m_RemovedComponents: []
m_ParentPrefab: {fileID: 100100000, guid: 089f84405caae2546b3bcc31622603f4, type: 3}
m_IsPrefabParent: 0
@@ -6844,8 +6825,8 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: e698040042f61fb469a8ce13b2033de6, type: 3}
m_Name:
m_EditorClassIdentifier:
- Latitude: 52.52625
- Longitude: 13.40055
+ Latitude: 52.52637
+ Longitude: 13.4007
UserGps: {fileID: 606266132}
Logger: {fileID: 1167427449}
--- !u!4 &1415908556 stripped
@@ -6882,11 +6863,14 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 7806653f8c48014449e5b05974607631, type: 3}
m_Name:
m_EditorClassIdentifier:
- WebCameraPlane: {fileID: 619437919}
+ WebCameraPlane: {fileID: 1766710362}
DebugInfo: {fileID: 1167427449}
ScreenInfo: {fileID: 602188453}
CameraInfo: {fileID: 1305741588}
InitPanel: {fileID: 390057441}
+ VisibleAreaContainer: {fileID: 1924470806}
+ MouseSensitivity: 100
+ ClampAngle: 80
--- !u!81 &1444983098
AudioListener:
m_ObjectHideFlags: 0
@@ -6947,6 +6931,7 @@ Transform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
+ - {fileID: 619437924}
- {fileID: 619437920}
m_Father: {fileID: 578402801}
m_RootOrder: 0
@@ -7926,11 +7911,11 @@ Prefab:
m_Modifications:
- target: {fileID: 400000, guid: 8696793e801fa684e8964f90180d1efd, type: 3}
propertyPath: m_LocalPosition.x
- value: -2.1500025
+ value: -8.269548
objectReference: {fileID: 0}
- target: {fileID: 400000, guid: 8696793e801fa684e8964f90180d1efd, type: 3}
propertyPath: m_LocalPosition.y
- value: 0.44439352
+ value: 0.44439355
objectReference: {fileID: 0}
- target: {fileID: 400000, guid: 8696793e801fa684e8964f90180d1efd, type: 3}
propertyPath: m_LocalPosition.z
@@ -7956,6 +7941,22 @@ Prefab:
propertyPath: m_RootOrder
value: 3
objectReference: {fileID: 0}
+ - target: {fileID: 400000, guid: 8696793e801fa684e8964f90180d1efd, type: 3}
+ propertyPath: m_LocalScale.x
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 400000, guid: 8696793e801fa684e8964f90180d1efd, type: 3}
+ propertyPath: m_LocalScale.y
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 400000, guid: 8696793e801fa684e8964f90180d1efd, type: 3}
+ propertyPath: m_LocalScale.z
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 2300000, guid: 8696793e801fa684e8964f90180d1efd, type: 3}
+ propertyPath: m_Materials.Array.data[0]
+ value:
+ objectReference: {fileID: 2100000, guid: c04975a1d6b4b40c3aaf8275b446b69f, type: 2}
m_RemovedComponents: []
m_ParentPrefab: {fileID: 100100000, guid: 8696793e801fa684e8964f90180d1efd, type: 3}
m_IsPrefabParent: 0
@@ -7974,8 +7975,8 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: e698040042f61fb469a8ce13b2033de6, type: 3}
m_Name:
m_EditorClassIdentifier:
- Latitude: 52.55314
- Longitude: 13.40363
+ Latitude: 52.52622
+ Longitude: 13.40055
UserGps: {fileID: 606266132}
Logger: {fileID: 1167427449}
--- !u!4 &1614600505 stripped
@@ -8244,7 +8245,7 @@ Prefab:
m_Modifications:
- target: {fileID: 400000, guid: d534bbe1463dba84fa42a5f308d25339, type: 3}
propertyPath: m_LocalPosition.x
- value: 0.5099976
+ value: -5.6095476
objectReference: {fileID: 0}
- target: {fileID: 400000, guid: d534bbe1463dba84fa42a5f308d25339, type: 3}
propertyPath: m_LocalPosition.y
@@ -8272,8 +8273,24 @@ Prefab:
objectReference: {fileID: 0}
- target: {fileID: 400000, guid: d534bbe1463dba84fa42a5f308d25339, type: 3}
propertyPath: m_RootOrder
- value: 2
+ value: 4
+ objectReference: {fileID: 0}
+ - target: {fileID: 400000, guid: d534bbe1463dba84fa42a5f308d25339, type: 3}
+ propertyPath: m_LocalScale.x
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 400000, guid: d534bbe1463dba84fa42a5f308d25339, type: 3}
+ propertyPath: m_LocalScale.y
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 400000, guid: d534bbe1463dba84fa42a5f308d25339, type: 3}
+ propertyPath: m_LocalScale.z
+ value: 1
objectReference: {fileID: 0}
+ - target: {fileID: 2300000, guid: d534bbe1463dba84fa42a5f308d25339, type: 3}
+ propertyPath: m_Materials.Array.data[0]
+ value:
+ objectReference: {fileID: 2100000, guid: 7c74dd021605141f5b2daecec677d0aa, type: 2}
m_RemovedComponents: []
m_ParentPrefab: {fileID: 100100000, guid: d534bbe1463dba84fa42a5f308d25339, type: 3}
m_IsPrefabParent: 0
@@ -8292,8 +8309,8 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: e698040042f61fb469a8ce13b2033de6, type: 3}
m_Name:
m_EditorClassIdentifier:
- Latitude: 52.43353
- Longitude: 13.36297
+ Latitude: 52.5263
+ Longitude: 13.40057
UserGps: {fileID: 606266132}
Logger: {fileID: 1167427449}
--- !u!4 &1641205795 stripped
@@ -9521,6 +9538,80 @@ CanvasRenderer:
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1749866734}
+--- !u!1 &1766710362
+GameObject:
+ m_ObjectHideFlags: 0
+ m_PrefabParentObject: {fileID: 0}
+ m_PrefabInternal: {fileID: 0}
+ serializedVersion: 5
+ m_Component:
+ - component: {fileID: 619437920}
+ - component: {fileID: 1766710365}
+ - component: {fileID: 1766710364}
+ - component: {fileID: 1766710363}
+ m_Layer: 0
+ m_Name: webCamPlane
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 1
+ m_IsActive: 0
+--- !u!23 &1766710363
+MeshRenderer:
+ m_ObjectHideFlags: 0
+ m_PrefabParentObject: {fileID: 0}
+ m_PrefabInternal: {fileID: 0}
+ m_GameObject: {fileID: 1766710362}
+ m_Enabled: 1
+ m_CastShadows: 0
+ m_ReceiveShadows: 0
+ m_DynamicOccludee: 1
+ m_MotionVectors: 2
+ m_LightProbeUsage: 0
+ m_ReflectionProbeUsage: 0
+ m_Materials:
+ - {fileID: 2100000, guid: 79c300c93a67a4f4091470d05573f4b9, type: 2}
+ m_StaticBatchInfo:
+ firstSubMesh: 0
+ subMeshCount: 0
+ m_StaticBatchRoot: {fileID: 0}
+ m_ProbeAnchor: {fileID: 0}
+ m_LightProbeVolumeOverride: {fileID: 0}
+ m_ScaleInLightmap: 0
+ m_PreserveUVs: 1
+ m_IgnoreNormalsForChartDetection: 1
+ m_ImportantGI: 0
+ m_StitchLightmapSeams: 0
+ m_SelectedEditorRenderState: 3
+ m_MinimumChartSize: 2
+ m_AutoUVMaxDistance: 0.5
+ m_AutoUVMaxAngle: 89
+ m_LightmapParameters: {fileID: 111300000, guid: 43de9f429f2f0344ca6c47fe68cffbae,
+ type: 2}
+ m_SortingLayerID: 0
+ m_SortingLayer: 0
+ m_SortingOrder: 0
+--- !u!64 &1766710364
+MeshCollider:
+ m_ObjectHideFlags: 0
+ m_PrefabParentObject: {fileID: 0}
+ m_PrefabInternal: {fileID: 0}
+ m_GameObject: {fileID: 1766710362}
+ m_Material: {fileID: 0}
+ m_IsTrigger: 0
+ m_Enabled: 1
+ serializedVersion: 3
+ m_Convex: 0
+ m_CookingOptions: 14
+ m_SkinWidth: 0.01
+ m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!33 &1766710365
+MeshFilter:
+ m_ObjectHideFlags: 0
+ m_PrefabParentObject: {fileID: 0}
+ m_PrefabInternal: {fileID: 0}
+ m_GameObject: {fileID: 1766710362}
+ m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0}
--- !u!1 &1842627832
GameObject:
m_ObjectHideFlags: 0
@@ -10128,6 +10219,90 @@ CanvasRenderer:
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1924140955}
+--- !u!1 &1924470806
+GameObject:
+ m_ObjectHideFlags: 0
+ m_PrefabParentObject: {fileID: 0}
+ m_PrefabInternal: {fileID: 0}
+ serializedVersion: 5
+ m_Component:
+ - component: {fileID: 1924470810}
+ - component: {fileID: 1924470809}
+ - component: {fileID: 1924470808}
+ - component: {fileID: 1924470807}
+ m_Layer: 0
+ m_Name: Visible Area
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!23 &1924470807
+MeshRenderer:
+ m_ObjectHideFlags: 0
+ m_PrefabParentObject: {fileID: 0}
+ m_PrefabInternal: {fileID: 0}
+ m_GameObject: {fileID: 1924470806}
+ m_Enabled: 0
+ m_CastShadows: 1
+ m_ReceiveShadows: 1
+ m_DynamicOccludee: 1
+ m_MotionVectors: 1
+ m_LightProbeUsage: 1
+ m_ReflectionProbeUsage: 1
+ m_Materials:
+ - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0}
+ m_StaticBatchInfo:
+ firstSubMesh: 0
+ subMeshCount: 0
+ m_StaticBatchRoot: {fileID: 0}
+ m_ProbeAnchor: {fileID: 0}
+ m_LightProbeVolumeOverride: {fileID: 0}
+ m_ScaleInLightmap: 1
+ m_PreserveUVs: 1
+ m_IgnoreNormalsForChartDetection: 0
+ m_ImportantGI: 0
+ m_StitchLightmapSeams: 0
+ m_SelectedEditorRenderState: 3
+ m_MinimumChartSize: 4
+ m_AutoUVMaxDistance: 0.5
+ m_AutoUVMaxAngle: 89
+ m_LightmapParameters: {fileID: 0}
+ m_SortingLayerID: 0
+ m_SortingLayer: 0
+ m_SortingOrder: 0
+--- !u!135 &1924470808
+SphereCollider:
+ m_ObjectHideFlags: 0
+ m_PrefabParentObject: {fileID: 0}
+ m_PrefabInternal: {fileID: 0}
+ m_GameObject: {fileID: 1924470806}
+ m_Material: {fileID: 0}
+ m_IsTrigger: 0
+ m_Enabled: 1
+ serializedVersion: 2
+ m_Radius: 0.5
+ m_Center: {x: 0, y: 0, z: 0}
+--- !u!33 &1924470809
+MeshFilter:
+ m_ObjectHideFlags: 0
+ m_PrefabParentObject: {fileID: 0}
+ m_PrefabInternal: {fileID: 0}
+ m_GameObject: {fileID: 1924470806}
+ m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!4 &1924470810
+Transform:
+ m_ObjectHideFlags: 0
+ m_PrefabParentObject: {fileID: 0}
+ m_PrefabInternal: {fileID: 0}
+ m_GameObject: {fileID: 1924470806}
+ m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+ m_LocalPosition: {x: -3.1900024, y: 0.76000977, z: -8.810001}
+ m_LocalScale: {x: 200, y: 200, z: 200}
+ m_Children: []
+ m_Father: {fileID: 1340223787}
+ m_RootOrder: 0
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1927450266
GameObject:
m_ObjectHideFlags: 0
diff --git a/Assets/MemoryBox/arScene/testobjects/20.wav.mtl b/Assets/MemoryBox/arScene/testobjects/20.wav.mtl
new file mode 100644
index 0000000000000000000000000000000000000000..2cf4dc4ba71096bc9f61d492995f376482303a38
--- /dev/null
+++ b/Assets/MemoryBox/arScene/testobjects/20.wav.mtl
@@ -0,0 +1,12 @@
+# Blender MTL File: 'adam.blend'
+# Material Count: 1
+
+newmtl Material.003
+Ns 94.117647
+Ka 1.000000 1.000000 1.000000
+Kd 0.640000 0.640000 0.640000
+Ks 0.500000 0.500000 0.500000
+Ke 0.000000 0.000000 0.000000
+Ni 1.000000
+d 1.000000
+illum 2
diff --git a/Assets/MemoryBox/arScene/testobjects/20.wav.mtl.meta b/Assets/MemoryBox/arScene/testobjects/20.wav.mtl.meta
new file mode 100644
index 0000000000000000000000000000000000000000..af9785decc188ed9267f3983b51927cf7b38cdfc
--- /dev/null
+++ b/Assets/MemoryBox/arScene/testobjects/20.wav.mtl.meta
@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: 2a101c82a17c27a4d8ff0a140e570d8b
+timeCreated: 1517766837
+licenseType: Free
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/MemoryBox/arScene/testobjects/20.wav.obj b/Assets/MemoryBox/arScene/testobjects/20.wav.obj
index 5e1e8e59a7070cc3583f6388b379c78495a9f86f..fee6b4ef3626258250a3094217454d00dbc17b49 100644
--- a/Assets/MemoryBox/arScene/testobjects/20.wav.obj
+++ b/Assets/MemoryBox/arScene/testobjects/20.wav.obj
@@ -1,54 +1,47 @@
-# Blender v2.79 (sub 0) OBJ File: 'main.blend'
+# Blender v2.79 (sub 0) OBJ File: 'adam.blend'
# www.blender.org
mtllib 20.wav.mtl
o Cube
-v 0.871314 4.600170 0.149880
-v 2.000000 3.228635 0.119890
-v -1.118515 4.600170 1.461974
-v -1.601563 4.178679 2.000000
-v -2.000000 3.363852 2.000000
-v -0.591481 2.033630 -2.000000
-v -0.138643 4.600170 -0.441636
-v 1.905058 -0.261341 2.000000
-v 2.000000 -0.301496 1.958307
-v -2.000000 -2.436661 2.000000
-v -2.000000 -4.600170 1.030517
-v 0.473975 -4.600170 0.412966
-v 2.000000 -1.181415 1.564009
-v 0.462193 -4.600170 0.063626
-v 2.000000 0.240737 -1.385553
-v 1.153527 0.005188 -2.000000
-v 2.000000 -1.009071 -0.658984
-v -2.000000 -0.259695 -1.442211
-v -2.000000 -4.600170 0.551310
-v 0.176556 -4.600170 -0.189923
-v -1.353448 0.475366 -2.000000
-v 0.541332 -0.929580 -2.000000
-vn 0.4635 0.3987 -0.7913
-vn 0.0000 1.0000 0.0000
-vn 0.5048 0.3987 0.7656
-vn -0.8154 0.3987 -0.4197
-vn 0.2221 -0.3987 0.8898
-vn 0.0000 0.0000 1.0000
-vn -1.0000 0.0000 0.0000
-vn 1.0000 -0.0000 0.0000
-vn 0.6088 -0.3987 -0.6858
-vn 0.9166 -0.3987 -0.0309
-vn -0.2956 -0.3987 -0.8681
+v 1.000000 -1.000000 -1.000000
+v 1.000000 -1.000000 1.000000
+v -1.000000 -1.000000 1.000000
+v -1.000000 -1.000000 -1.000000
+v 1.000000 1.000000 -0.999999
+v -1.000000 1.000000 -1.000000
+v -1.000000 1.000000 1.000000
+v 0.999999 1.000000 1.000001
+vt 0.333333 0.333333
+vt 0.333333 0.000000
+vt 0.666667 0.000000
+vt 0.666667 0.333333
+vt 0.333333 0.000000
+vt 0.333333 0.333333
+vt 0.000000 0.333333
+vt 0.000000 0.000000
+vt 0.666667 0.333333
+vt 0.666667 0.666667
+vt 0.333333 0.666667
+vt 0.333333 0.333334
+vt 0.000000 1.000000
+vt 0.000000 0.666667
+vt 0.333333 0.666667
+vt 0.333333 1.000000
+vt 0.000000 0.666667
+vt 0.333333 0.666667
+vt 1.000000 0.000000
+vt 1.000000 0.333333
+vt 0.666667 0.000000
vn 0.0000 -1.0000 -0.0000
-vn -0.0000 0.0000 -1.0000
-usemtl Material
-s off
-f 2//1 15//1 16//1 6//1 7//1 1//1
-f 1//2 7//2 3//2
-f 3//3 4//3 8//3 9//3 2//3 1//3
-f 6//4 21//4 18//4 5//4 4//4 3//4 7//4
-f 8//5 10//5 11//5 12//5 13//5 9//5
-f 10//6 8//6 4//6 5//6
-f 11//7 10//7 5//7 18//7 19//7
-f 13//8 17//8 15//8 2//8 9//8
-f 15//9 17//9 14//9 20//9 22//9 16//9
-f 14//10 17//10 13//10 12//10
-f 21//11 22//11 20//11 19//11 18//11
-f 19//12 20//12 14//12 12//12 11//12
-f 22//13 21//13 6//13 16//13
+vn -0.0000 1.0000 0.0000
+vn 1.0000 0.0000 0.0000
+vn -0.0000 -0.0000 1.0000
+vn -1.0000 -0.0000 0.0000
+vn 0.0000 0.0000 -1.0000
+usemtl Material.003
+s 1
+f 1/1/1 2/2/1 3/3/1 4/4/1
+f 5/5/2 6/6/2 7/7/2 8/8/2
+f 1/9/3 5/10/3 8/11/3 2/12/3
+f 2/13/4 8/14/4 7/15/4 3/16/4
+f 3/17/5 7/7/5 6/6/5 4/18/5
+f 5/19/6 1/20/6 4/4/6 6/21/6
diff --git a/Assets/MemoryBox/arScene/testobjects/20.wav.obj.meta b/Assets/MemoryBox/arScene/testobjects/20.wav.obj.meta
index 0972fa3e9cae9c7983902bfb734a5bbdb349a506..5443769b40aa7d26317d3045a825bb6e83678cd8 100644
--- a/Assets/MemoryBox/arScene/testobjects/20.wav.obj.meta
+++ b/Assets/MemoryBox/arScene/testobjects/20.wav.obj.meta
@@ -10,6 +10,8 @@ ModelImporter:
400000: //RootNode
400002: default
2100000: defaultMat
+ 2100002: Material
+ 2100004: Material.003
2300000: default
3300000: default
4300000: default
diff --git a/Assets/MemoryBox/arScene/testobjects/23.wav.mtl b/Assets/MemoryBox/arScene/testobjects/23.wav.mtl
new file mode 100644
index 0000000000000000000000000000000000000000..8659f731cd01b06024be53f32b0d96f1c8023907
--- /dev/null
+++ b/Assets/MemoryBox/arScene/testobjects/23.wav.mtl
@@ -0,0 +1,12 @@
+# Blender MTL File: '23.wave.blend'
+# Material Count: 1
+
+newmtl Material.001
+Ns 96.078431
+Ka 1.000000 1.000000 1.000000
+Kd 0.640000 0.640000 0.640000
+Ks 0.500000 0.500000 0.500000
+Ke 0.000000 0.000000 0.000000
+Ni 1.000000
+d 1.000000
+illum 2
diff --git a/Assets/MemoryBox/arScene/testobjects/23.wav.mtl.meta b/Assets/MemoryBox/arScene/testobjects/23.wav.mtl.meta
new file mode 100644
index 0000000000000000000000000000000000000000..c72209f281a109a575a527ab6d778e7389b1eaf8
--- /dev/null
+++ b/Assets/MemoryBox/arScene/testobjects/23.wav.mtl.meta
@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: d29f2e8774c8db34aa52f79c42bf50d4
+timeCreated: 1517767349
+licenseType: Free
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/MemoryBox/arScene/testobjects/23.wav.obj b/Assets/MemoryBox/arScene/testobjects/23.wav.obj
index 7649c3b917979757cb7e54f7cc95e29b36c9491b..1783818abf5c40112167654dfa3f6fb9137a5dfb 100644
--- a/Assets/MemoryBox/arScene/testobjects/23.wav.obj
+++ b/Assets/MemoryBox/arScene/testobjects/23.wav.obj
@@ -1,54 +1,105 @@
-# Blender v2.79 (sub 0) OBJ File: 'main.blend'
+# Blender v2.79 (sub 0) OBJ File: '23.wave.blend'
# www.blender.org
mtllib 23.wav.mtl
-o Cube
-v 2.000000 0.341186 -2.000000
+o Cube.001
v 0.538993 2.388983 0.579522
-v 1.641038 1.250927 2.000000
-v 2.000000 0.824348 2.000000
v 0.418528 2.388983 -0.605637
-v 1.436298 1.011073 -2.000000
v -1.550767 2.388983 -0.189082
+v 2.000000 0.824348 2.000000
+v 2.000000 0.341186 -2.000000
+v 1.436298 1.011073 -2.000000
+v 1.641038 1.250927 2.000000
v -2.000000 2.240074 -0.221480
-v -2.000000 0.161635 -2.000000
v -2.000000 0.027349 1.752281
v -1.356940 0.014788 2.000000
-v 2.000000 0.147853 -2.000000
+v -2.000000 0.161635 -2.000000
+v 1.005346 -1.039603 2.000000
+v 2.000000 -0.277318 2.000000
+v -2.000000 0.156325 -2.000000
+v -0.206670 -1.499045 -2.000000
v -0.097814 -2.388983 -0.958670
v -0.897834 -2.388983 0.015414
v -2.000000 -1.585070 0.296983
-v -2.000000 0.156325 -2.000000
-v -0.206670 -1.499045 -2.000000
-v 2.000000 -0.277318 2.000000
-v 1.005346 -1.039603 2.000000
-v 2.000000 -1.915334 0.212215
v 1.373847 -2.388983 0.219007
v 0.799691 -2.388983 0.699262
-vn 0.0000 1.0000 -0.0000
+v 2.000000 0.147853 -2.000000
+v 2.000000 -1.915334 0.212215
+vt 0.339654 0.055784
+vt 0.310732 0.139164
+vt 0.153726 0.008833
+vt 0.725165 0.058026
+vt 0.988753 0.397234
+vt 0.925559 0.462725
+vt 0.719579 0.462725
+vt 0.654985 0.348225
+vt 0.684924 0.099730
+vt 0.339654 0.051131
+vt 0.357765 0.000000
+vt 0.626877 0.080490
+vt 0.628405 0.161893
+vt 0.478065 0.494301
+vt 0.339654 0.314182
+vt 0.319062 0.399894
+vt 0.000208 0.291683
+vt 0.110041 0.000000
+vt 0.654985 0.423817
+vt 0.579925 0.534101
+vt 0.501150 0.534101
+vt 0.297125 0.831219
+vt 0.196759 0.979808
+vt 0.069019 0.979707
+vt 0.000000 0.904888
+vt 0.028791 0.811100
+vt 0.628737 0.679479
+vt 0.688156 0.747630
+vt 0.610380 0.941181
+vt 0.581522 0.887246
+vt 0.558442 0.541094
+vt 0.406354 0.906564
+vt 0.339654 0.612862
+vt 0.355963 0.534101
+vt 0.084156 0.507572
+vt 0.000000 0.292086
+vt 0.339654 0.478959
+vt 0.332078 0.493608
+vt 0.023438 0.554587
+vt 0.297447 0.507572
+vt 0.297447 0.830742
+vt 0.922594 0.891472
+vt 0.856071 0.930223
+vt 0.699721 0.828477
+vt 0.688156 0.666802
+vt 0.922594 0.534101
+vt 0.351553 1.000000
+vt 0.576737 1.000000
+vt 0.789255 0.000000
+vt 0.989794 0.076706
+vt 1.000000 0.387051
+vn 0.0000 1.0000 0.0000
vn 0.7628 0.6419 -0.0775
vn -0.2647 0.6419 0.7196
vn -0.1587 0.6419 -0.7502
-vn 0.0000 0.0000 1.0000
+vn 0.0000 -0.0000 1.0000
vn -0.5925 -0.6419 -0.4867
-vn 0.0000 -1.0000 0.0000
+vn 0.0000 -1.0000 -0.0000
vn -0.2865 -0.6419 0.7112
-vn 0.0000 0.0000 -1.0000
-vn -1.0000 -0.0000 0.0000
+vn -0.0000 0.0000 -1.0000
+vn -1.0000 0.0000 0.0000
vn 0.4791 -0.6419 -0.5987
vn 0.4920 -0.6419 0.5881
vn 1.0000 0.0000 0.0000
-usemtl Material
-s off
-f 2//1 5//1 7//1
-f 4//2 1//2 6//2 5//2 2//2 3//2
-f 7//3 8//3 10//3 11//3 3//3 2//3
-f 6//4 9//4 8//4 7//4 5//4
-f 11//5 19//5 18//5 4//5 3//5
-f 16//6 17//6 13//6 14//6 15//6
-f 14//7 13//7 21//7 22//7
-f 15//8 14//8 22//8 19//8 11//8 10//8
-f 17//9 16//9 9//9 6//9 1//9 12//9
-f 16//10 15//10 10//10 8//10 9//10
-f 20//11 21//11 13//11 17//11 12//11
-f 18//12 19//12 22//12 21//12 20//12
-f 18//13 20//13 12//13 1//13 4//13
+usemtl Material.001
+s 1
+f 1/1/1 2/2/1 3/3/1
+f 4/4/2 5/5/2 6/6/2 2/7/2 1/8/2 7/9/2
+f 3/10/3 8/11/3 9/12/3 10/13/3 7/14/3 1/15/3
+f 6/16/4 11/17/4 8/18/4 3/3/4 2/2/4
+f 10/13/5 12/19/5 13/20/5 4/21/5 7/14/5
+f 14/22/6 15/23/6 16/24/6 17/25/6 18/26/6
+f 17/27/7 16/28/7 19/29/7 20/30/7
+f 18/31/8 17/27/8 20/30/8 12/32/8 10/33/8 9/34/8
+f 15/35/9 14/36/9 11/17/9 6/16/9 5/37/9 21/38/9
+f 14/22/10 18/26/10 9/39/10 8/40/10 11/41/10
+f 22/42/11 19/43/11 16/44/11 15/45/11 21/46/11
+f 13/47/12 12/32/12 20/30/12 19/29/12 22/48/12
+f 13/49/13 22/50/13 21/51/13 5/5/13 4/4/13
diff --git a/Assets/MemoryBox/arScene/testobjects/23.wav.obj.meta b/Assets/MemoryBox/arScene/testobjects/23.wav.obj.meta
index 5f16b592c68feb56887d14cff45b48647c4b0dca..a4c42484f4f518461cf31c2ba06def87867f2971 100644
--- a/Assets/MemoryBox/arScene/testobjects/23.wav.obj.meta
+++ b/Assets/MemoryBox/arScene/testobjects/23.wav.obj.meta
@@ -10,6 +10,7 @@ ModelImporter:
400000: //RootNode
400002: default
2100000: defaultMat
+ 2100002: Material.001
2300000: default
3300000: default
4300000: default
diff --git a/Assets/MemoryBox/arScene/testobjects/24.wav.mtl b/Assets/MemoryBox/arScene/testobjects/24.wav.mtl
new file mode 100644
index 0000000000000000000000000000000000000000..2bb00c8148be8d3b6c793c30367e9ac215682ff7
--- /dev/null
+++ b/Assets/MemoryBox/arScene/testobjects/24.wav.mtl
@@ -0,0 +1,12 @@
+# Blender MTL File: '24.wav.blend'
+# Material Count: 1
+
+newmtl Material.001
+Ns 96.078431
+Ka 1.000000 1.000000 1.000000
+Kd 0.640000 0.640000 0.640000
+Ks 0.500000 0.500000 0.500000
+Ke 0.000000 0.000000 0.000000
+Ni 1.000000
+d 1.000000
+illum 2
diff --git a/Assets/MemoryBox/arScene/testobjects/24.wav.mtl.meta b/Assets/MemoryBox/arScene/testobjects/24.wav.mtl.meta
new file mode 100644
index 0000000000000000000000000000000000000000..7b6c77ebcea489758b0ae5573c8178076b33bacf
--- /dev/null
+++ b/Assets/MemoryBox/arScene/testobjects/24.wav.mtl.meta
@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: 8b7515e811f27104e83a67adc3f8eb5e
+timeCreated: 1517767349
+licenseType: Free
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/MemoryBox/arScene/testobjects/24.wav.obj b/Assets/MemoryBox/arScene/testobjects/24.wav.obj
index d10fc1359a9fb8bf2024e84507b11ab94febc81c..f3123d49a88c46223cf3ff29bdc9a039067cc153 100644
--- a/Assets/MemoryBox/arScene/testobjects/24.wav.obj
+++ b/Assets/MemoryBox/arScene/testobjects/24.wav.obj
@@ -1,46 +1,88 @@
-# Blender v2.79 (sub 0) OBJ File: 'main.blend'
+# Blender v2.79 (sub 0) OBJ File: '24.wav.blend'
# www.blender.org
mtllib 24.wav.mtl
-o Cube
+o Cube.001
v -1.117276 0.993950 2.000000
-v -0.274497 1.219230 -1.200853
-v -0.443485 0.596006 -2.000000
-v 0.171561 1.980149 -0.048923
+v 0.541059 -0.149892 2.000000
+v 2.000000 0.456516 0.237857
v 2.000000 0.728991 -0.059864
-v -2.000000 -0.440488 0.036987
+v 0.171561 1.980149 -0.048923
+v 2.000000 -0.209558 -1.076279
+v 1.774543 -0.909484 -2.000000
+v -0.443485 0.596006 -2.000000
+v -0.274497 1.219230 -1.200853
v -0.872790 0.169081 -2.000000
v -1.200639 0.100219 -1.548490
-v -2.000000 -0.785736 0.485769
-v -1.491336 0.573648 2.000000
+v -2.000000 -0.440488 0.036987
v -2.000000 -0.217394 1.026469
-v 2.000000 0.456516 0.237857
-v 0.541059 -0.149892 2.000000
+v -1.491336 0.573648 2.000000
+v -2.000000 -0.785736 0.485769
+v -0.287372 -1.956192 0.116209
v 0.403316 -0.291468 2.000000
-v 1.774543 -0.909484 -2.000000
-v 2.000000 -0.209558 -1.076279
v 1.151212 -1.550168 -2.000000
-v -0.287372 -1.956192 0.116209
+vt 0.999618 0.403634
+vt 0.761976 0.352291
+vt 0.712077 0.044390
+vt 0.738970 0.000000
+vt 1.000000 0.058241
+vt 0.090019 1.000000
+vt 0.025698 0.831408
+vt 0.000000 0.677968
+vt 0.322266 0.675767
+vt 0.348285 0.808488
+vt 0.356373 1.000000
+vt 0.544484 0.439651
+vt 0.427513 0.481829
+vt 0.370612 0.431997
+vt 0.380591 0.359029
+vt 0.408930 0.117406
+vt 0.498036 0.027125
+vt 0.658526 0.000000
+vt 0.712077 0.045373
+vt 0.712077 0.388654
+vt 0.412642 0.058404
+vt 0.174520 0.581043
+vt 0.088266 0.547831
+vt 0.045100 0.411960
+vt 0.351974 0.482030
+vt 0.334509 0.607229
+vt 1.000000 0.448964
+vt 0.763152 0.368326
+vt 0.000000 0.073198
+vt 0.084341 0.000000
+vt 0.219498 0.047655
+vt 0.368379 0.153117
+vt 0.370612 0.465855
+vt 0.018347 0.607229
+vt 0.335875 0.627992
+vt 0.370611 0.114579
+vt 0.717029 0.894132
+vt 0.422114 0.783982
+vt 0.370612 0.511365
+vt 0.433154 0.481829
+vt 0.654106 0.516078
+vt 0.717029 0.543206
vn 0.4535 0.6575 0.6017
vn 0.4463 0.6575 -0.6071
vn -0.6538 0.6575 -0.3745
vn -0.7388 0.6575 -0.1482
vn -1.0000 0.0000 0.0000
vn -0.3002 -0.6575 0.6911
-vn 0.0000 0.0000 1.0000
+vn 0.0000 -0.0000 1.0000
vn 0.6758 -0.6575 0.3332
-vn -0.0000 0.0000 -1.0000
+vn 0.0000 0.0000 -1.0000
vn 1.0000 0.0000 0.0000
vn -0.5585 -0.6575 -0.5058
-usemtl Material
-s off
-f 1//1 13//1 12//1 5//1 4//1
-f 5//2 16//2 15//2 3//2 2//2 4//2
-f 2//3 3//3 7//3 8//3
-f 8//4 6//4 11//4 10//4 1//4 4//4 2//4
-f 6//5 9//5 11//5
-f 11//6 9//6 18//6 14//6 10//6
-f 10//7 14//7 13//7 1//7
-f 14//8 18//8 17//8 15//8 16//8 12//8 13//8
-f 15//9 17//9 7//9 3//9
-f 12//10 16//10 5//10
-f 17//11 18//11 9//11 6//11 8//11 7//11
+usemtl Material.001
+s 1
+f 1/1/1 2/2/1 3/3/1 4/4/1 5/5/1
+f 4/6/2 6/7/2 7/8/2 8/9/2 9/10/2 5/11/2
+f 9/12/3 8/13/3 10/14/3 11/15/3
+f 11/15/4 12/16/4 13/17/4 14/18/4 1/19/4 5/20/4 9/12/4
+f 12/16/5 15/21/5 13/17/5
+f 13/22/6 15/23/6 16/24/6 17/25/6 14/26/6
+f 14/27/7 17/28/7 2/2/7 1/1/7
+f 17/25/8 16/24/8 18/29/8 7/30/8 6/31/8 3/32/8 2/33/8
+f 7/8/9 18/34/9 10/35/9 8/9/9
+f 3/32/10 6/31/10 4/36/10
+f 18/37/11 16/38/11 15/39/11 12/40/11 11/41/11 10/42/11
diff --git a/Assets/MemoryBox/arScene/testobjects/24.wav.obj.meta b/Assets/MemoryBox/arScene/testobjects/24.wav.obj.meta
index f611d049fdd318b8bf2c7de4663c034b06434bcc..f45d3d1b73ec10cb0348265984c381fd0cf5cf4a 100644
--- a/Assets/MemoryBox/arScene/testobjects/24.wav.obj.meta
+++ b/Assets/MemoryBox/arScene/testobjects/24.wav.obj.meta
@@ -10,6 +10,7 @@ ModelImporter:
400000: //RootNode
400002: default
2100000: defaultMat
+ 2100002: Material.001
2300000: default
3300000: default
4300000: default
diff --git a/Assets/MemoryBox/arScene/testobjects/adam.wav.mtl b/Assets/MemoryBox/arScene/testobjects/adam.wav.mtl
new file mode 100644
index 0000000000000000000000000000000000000000..434c44b365903fa5227a154748002ba80eee95cc
--- /dev/null
+++ b/Assets/MemoryBox/arScene/testobjects/adam.wav.mtl
@@ -0,0 +1,12 @@
+# Blender MTL File: 'adam.blend'
+# Material Count: 1
+
+newmtl Material.002
+Ns 96.078431
+Ka 1.000000 1.000000 1.000000
+Kd 0.640000 0.640000 0.640000
+Ks 0.500000 0.500000 0.500000
+Ke 0.000000 0.000000 0.000000
+Ni 1.000000
+d 1.000000
+illum 2
diff --git a/Assets/MemoryBox/arScene/testobjects/adam.wav.mtl.meta b/Assets/MemoryBox/arScene/testobjects/adam.wav.mtl.meta
new file mode 100644
index 0000000000000000000000000000000000000000..1dcf75eff1212eaca509105f0be095f52a85f95c
--- /dev/null
+++ b/Assets/MemoryBox/arScene/testobjects/adam.wav.mtl.meta
@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: 441016c4ce7af864db0d9e64a8731f16
+timeCreated: 1517767349
+licenseType: Free
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/MemoryBox/arScene/testobjects/adam.wav.obj b/Assets/MemoryBox/arScene/testobjects/adam.wav.obj
index 8d4924962c6039e7347bb90dbb28f0a2184a16ff..289acc1a0993e2b7752449f66554d17a2ae161bb 100644
--- a/Assets/MemoryBox/arScene/testobjects/adam.wav.obj
+++ b/Assets/MemoryBox/arScene/testobjects/adam.wav.obj
@@ -1,23 +1,57 @@
-# Blender v2.79 (sub 0) OBJ File: 'main.blend'
+# Blender v2.79 (sub 0) OBJ File: 'adam.blend'
# www.blender.org
mtllib adam.wav.mtl
-o Cube
+o Cube.002
v -2.000000 1.905332 -1.218310
-v -0.058949 4.688084 0.082218
-v -0.690879 0.396043 2.000000
-v 0.123579 4.549556 0.060150
-v -2.000000 0.931736 -1.569510
-v -2.000000 -2.014672 -0.484238
-v -0.741883 0.273497 2.000000
v -2.000000 -0.375549 0.358719
+v -0.741883 0.273497 2.000000
+v -0.690879 0.396043 2.000000
+v -0.058949 4.688084 0.082219
v -0.315252 -0.006716 2.000000
-v -0.502824 -0.209595 2.000000
-v -0.099402 -4.810041 0.053367
-v -0.091195 -4.808311 0.050604
-v 1.436442 -0.498223 -1.560012
-v 1.283972 -0.922948 -1.736527
v 1.631382 0.003986 1.190399
v 1.877258 0.699493 0.820264
+v 0.123579 4.549556 0.060151
+v 1.436442 -0.498223 -1.560012
+v 1.283972 -0.922948 -1.736527
+v -2.000000 0.931736 -1.569510
+v -2.000000 -2.014672 -0.484238
+v -0.099402 -4.810041 0.053366
+v -0.502824 -0.209595 2.000000
+v -0.091195 -4.808311 0.050603
+vt 0.518418 0.254484
+vt 0.443510 0.541786
+vt 0.296906 0.522277
+vt 0.294123 0.509365
+vt 0.350738 0.000000
+vt 0.784937 0.507896
+vt 0.747471 0.542856
+vt 0.580730 0.484790
+vt 0.568743 0.398297
+vt 0.769406 0.010467
+vt 0.786865 0.000000
+vt 0.172533 0.977298
+vt 0.156794 0.963063
+vt 0.000000 0.497138
+vt 0.007333 0.460534
+vt 0.283649 0.659418
+vt 0.294123 0.746780
+vt 0.548457 0.689395
+vt 0.568743 0.999952
+vt 0.307876 0.573181
+vt 0.786865 0.521807
+vt 0.758978 0.567927
+vt 0.568743 0.346612
+vt 0.620450 1.000000
+vt 0.619785 0.999593
+vt 0.786865 0.480811
+vt 0.848689 0.000000
+vt 1.000000 0.294216
+vt 0.988901 0.339286
+vt 0.817683 0.531734
+vt 1.000000 0.937135
+vt 0.139614 0.000245
+vt 0.140327 0.000000
+vt 0.294123 0.315879
vn -0.8070 0.3359 0.4858
vn 0.3601 0.3359 0.8703
vn 0.1423 0.3359 -0.9311
@@ -28,15 +62,15 @@ vn 0.3633 -0.3359 0.8690
vn 0.9419 -0.3359 -0.0054
vn 0.8814 0.3359 -0.3322
vn -0.2361 -0.3359 -0.9118
-usemtl Material
-s off
-f 1//1 8//1 7//1 3//1 2//1
-f 3//2 9//2 15//2 16//2 4//2 2//2
-f 2//3 4//3 13//3 14//3 5//3 1//3
-f 8//4 6//4 11//4 10//4 7//4
-f 7//5 10//5 9//5 3//5
-f 6//6 8//6 1//6 5//6
-f 10//7 11//7 12//7 15//7 9//7
-f 15//8 12//8 14//8 13//8 16//8
-f 16//9 13//9 4//9
-f 14//10 12//10 11//10 6//10 5//10
+usemtl Material.002
+s 1
+f 1/1/1 2/2/1 3/3/1 4/4/1 5/5/1
+f 4/6/2 6/7/2 7/8/2 8/9/2 9/10/2 5/11/2
+f 5/12/3 9/13/3 10/14/3 11/15/3 12/16/3 1/17/3
+f 2/2/4 13/18/4 14/19/4 15/20/4 3/3/4
+f 3/21/5 15/22/5 6/7/5 4/6/5
+f 13/18/6 2/2/6 1/1/6 12/23/6
+f 15/22/7 14/24/7 16/25/7 7/8/7 6/7/7
+f 7/26/8 16/27/8 11/28/8 10/29/8 8/30/8
+f 8/30/9 10/29/9 9/31/9
+f 11/15/10 16/32/10 14/33/10 13/34/10 12/16/10
diff --git a/Assets/MemoryBox/arScene/testobjects/adam.wav.obj.meta b/Assets/MemoryBox/arScene/testobjects/adam.wav.obj.meta
index abae84a29dbd236dbbe8304a5d8d00224c161ae1..f93441744c7ac38b067149708fd3b55da06805bf 100644
--- a/Assets/MemoryBox/arScene/testobjects/adam.wav.obj.meta
+++ b/Assets/MemoryBox/arScene/testobjects/adam.wav.obj.meta
@@ -10,6 +10,7 @@ ModelImporter:
400000: //RootNode
400002: default
2100000: defaultMat
+ 2100002: Material.002
2300000: default
3300000: default
4300000: default
diff --git a/Assets/MemoryBox/arScene/testobjects/adiko.wav.mtl b/Assets/MemoryBox/arScene/testobjects/adiko.wav.mtl
new file mode 100644
index 0000000000000000000000000000000000000000..baa02a2c4245c90275d86f34354d1f076f42bd3b
--- /dev/null
+++ b/Assets/MemoryBox/arScene/testobjects/adiko.wav.mtl
@@ -0,0 +1,12 @@
+# Blender MTL File: 'akihiko.blend'
+# Material Count: 1
+
+newmtl Material.003
+Ns 96.078431
+Ka 1.000000 1.000000 1.000000
+Kd 0.640000 0.640000 0.640000
+Ks 0.500000 0.500000 0.500000
+Ke 0.000000 0.000000 0.000000
+Ni 1.000000
+d 1.000000
+illum 2
diff --git a/Assets/MemoryBox/arScene/testobjects/adiko.wav.mtl.meta b/Assets/MemoryBox/arScene/testobjects/adiko.wav.mtl.meta
new file mode 100644
index 0000000000000000000000000000000000000000..c809b9a2014e840437781237869a9a7355d82d24
--- /dev/null
+++ b/Assets/MemoryBox/arScene/testobjects/adiko.wav.mtl.meta
@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: 8a2ce2133f694f94089940c0a89d3115
+timeCreated: 1517766837
+licenseType: Free
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/MemoryBox/arScene/testobjects/adiko.wav.obj b/Assets/MemoryBox/arScene/testobjects/adiko.wav.obj
index 44a09081be5ffc1cc931fda735d4c0d66f43199d..44908dd0506a0038df111ac4c9ae946e2dee3da6 100644
--- a/Assets/MemoryBox/arScene/testobjects/adiko.wav.obj
+++ b/Assets/MemoryBox/arScene/testobjects/adiko.wav.obj
@@ -1,46 +1,86 @@
-# Blender v2.79 (sub 0) OBJ File: 'main.blend'
+# Blender v2.79 (sub 0) OBJ File: 'akihiko.blend'
# www.blender.org
mtllib adiko.wav.mtl
-o Cube
-v 1.679449 0.877185 2.000000
-v 2.000000 -0.301131 -2.000000
-v 0.099669 1.759786 -0.052972
-v 0.006418 1.736768 -0.076129
+o Cube.003
v 1.549079 0.083369 -2.000000
v -0.176915 0.035260 -2.000000
v -1.311833 0.298783 -1.665265
+v 0.006418 1.736768 -0.076129
+v 0.099669 1.759786 -0.052972
v -1.841143 -0.017017 -0.928667
v -1.875304 0.274612 0.758539
-v -0.998999 -0.293646 2.000000
+v -0.067041 -1.432731 -0.123750
+v -0.138271 -1.276610 0.483358
v -0.790624 -0.474606 2.000000
-v 1.769404 0.800480 2.000000
+v -0.998999 -0.293646 2.000000
+v 1.679449 0.877185 2.000000
v 1.662651 0.714126 2.000000
+v 1.769404 0.800480 2.000000
+v 1.577366 -0.763112 -2.000000
v 2.000000 -0.421239 -2.000000
v 2.000000 -0.085152 -1.045376
-v 1.577366 -0.763112 -2.000000
-v -0.138271 -1.276610 0.483358
-v -0.067041 -1.432731 -0.123750
+v 2.000000 -0.301131 -2.000000
+vt 0.693756 0.488932
+vt 0.533550 0.494771
+vt 0.444322 0.452090
+vt 0.643178 0.226774
+vt 0.652948 0.223240
+vt 0.359572 0.374926
+vt 0.348252 0.169999
+vt 0.703091 0.238105
+vt 0.989063 0.222763
+vt 1.000000 0.297565
+vt 0.958398 0.513508
+vt 0.928124 0.526279
+vt 0.757283 0.435950
+vt 0.363177 0.036066
+vt 0.693756 0.000000
+vt 0.009989 0.496067
+vt 0.332102 0.501438
+vt 0.348252 0.503271
+vt 0.343852 0.508628
+vt 0.000000 0.508628
+vt 1.000000 0.000000
+vt 0.693756 0.155851
+vt 0.794356 0.078467
+vt 0.037873 0.280954
+vt 0.039931 0.206292
+vt 0.261762 0.000000
+vt 0.325700 0.007255
+vt 0.339408 0.126577
+vt 0.032405 0.508628
+vt 0.090225 0.537758
+vt 0.090225 0.768751
+vt 0.000000 0.582865
+vt 0.019405 0.514591
+vt 0.625439 0.879214
+vt 0.623032 1.000000
+vt 0.614461 0.995991
+vt 0.625439 0.498113
+vt 0.545981 0.979238
+vt 0.348252 0.687214
+vt 0.611778 0.494771
vn -0.0209 0.7499 -0.6612
vn -0.6460 0.7499 -0.1427
vn -0.6512 -0.7499 0.1164
vn -0.3278 0.7499 0.5746
-vn -0.0000 0.0000 1.0000
+vn 0.0000 -0.0000 1.0000
vn -0.3413 -0.7499 -0.5667
vn 0.6066 -0.7499 0.2640
vn 0.3634 -0.7499 0.5528
vn -0.0000 0.0000 -1.0000
vn 1.0000 0.0000 0.0000
vn 0.6394 0.7499 -0.1697
-usemtl Material
-s off
-f 5//1 6//1 7//1 4//1 3//1
-f 4//2 7//2 8//2 9//2
-f 8//3 18//3 17//3 11//3 10//3 9//3
-f 9//4 10//4 1//4 3//4 4//4
-f 11//5 13//5 12//5 1//5 10//5
-f 16//6 18//6 8//6 7//6 6//6
-f 12//7 13//7 17//7 18//7 16//7 14//7 15//7
-f 17//8 13//8 11//8
-f 14//9 16//9 6//9 5//9 2//9
-f 15//10 14//10 2//10
-f 12//11 15//11 2//11 5//11 3//11 1//11
+usemtl Material.003
+s 1
+f 1/1/1 2/2/1 3/3/1 4/4/1 5/5/1
+f 4/4/2 3/3/2 6/6/2 7/7/2
+f 6/8/3 8/9/3 9/10/3 10/11/3 11/12/3 7/13/3
+f 7/7/4 11/14/4 12/15/4 5/5/4 4/4/4
+f 10/16/5 13/17/5 14/18/5 12/19/5 11/20/5
+f 15/21/6 8/9/6 6/8/6 3/22/6 2/23/6
+f 14/18/7 13/17/7 9/24/7 8/25/7 15/26/7 16/27/7 17/28/7
+f 9/24/8 13/17/8 10/16/8
+f 16/29/9 15/30/9 2/31/9 1/32/9 18/33/9
+f 17/34/10 16/35/10 18/36/10
+f 14/37/11 17/34/11 18/36/11 1/38/11 5/39/11 12/40/11
diff --git a/Assets/MemoryBox/arScene/testobjects/adiko.wav.obj.meta b/Assets/MemoryBox/arScene/testobjects/adiko.wav.obj.meta
index 207e81ba4cf3c8c16b3cc5d5a40f50dc87f566c8..79f1308128f68c564dee246e1c0f730b7d58a534 100644
--- a/Assets/MemoryBox/arScene/testobjects/adiko.wav.obj.meta
+++ b/Assets/MemoryBox/arScene/testobjects/adiko.wav.obj.meta
@@ -10,6 +10,7 @@ ModelImporter:
400000: //RootNode
400002: default
2100000: defaultMat
+ 2100002: Material.003
2300000: default
3300000: default
4300000: default
diff --git a/Assets/MemoryBox/arScene/testobjects/img2256.wav.mtl b/Assets/MemoryBox/arScene/testobjects/img2256.wav.mtl
new file mode 100644
index 0000000000000000000000000000000000000000..72766d66c20c684f63aaf1b5c5e24f0a534baf73
--- /dev/null
+++ b/Assets/MemoryBox/arScene/testobjects/img2256.wav.mtl
@@ -0,0 +1,12 @@
+# Blender MTL File: 'img1.blend'
+# Material Count: 1
+
+newmtl Material.004
+Ns 96.078431
+Ka 1.000000 1.000000 1.000000
+Kd 0.640000 0.640000 0.640000
+Ks 0.500000 0.500000 0.500000
+Ke 0.000000 0.000000 0.000000
+Ni 1.000000
+d 1.000000
+illum 2
diff --git a/Assets/MemoryBox/arScene/testobjects/img2256.wav.mtl.meta b/Assets/MemoryBox/arScene/testobjects/img2256.wav.mtl.meta
new file mode 100644
index 0000000000000000000000000000000000000000..28c096f5113175fabfddadef0be62a467f5a0b2f
--- /dev/null
+++ b/Assets/MemoryBox/arScene/testobjects/img2256.wav.mtl.meta
@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: effc3afc3d326e048b124f299286016f
+timeCreated: 1517766837
+licenseType: Free
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/MemoryBox/arScene/testobjects/img2256.wav.obj b/Assets/MemoryBox/arScene/testobjects/img2256.wav.obj
index 0bb05187dea911c120983ffc2f75958fc2e03a2b..b2f17f1e2737b32f8d823d9d3089ae34db575b24 100644
--- a/Assets/MemoryBox/arScene/testobjects/img2256.wav.obj
+++ b/Assets/MemoryBox/arScene/testobjects/img2256.wav.obj
@@ -1,58 +1,112 @@
-# Blender v2.79 (sub 0) OBJ File: 'main.blend'
+# Blender v2.79 (sub 0) OBJ File: 'img1.blend'
# www.blender.org
mtllib img2256.wav.mtl
-o Cube
-v 2.000000 2.752542 -0.474010
+o Cube.004
v -0.764731 0.565176 2.000000
+v 1.838462 -0.449867 2.000000
+v 2.000000 -0.264114 1.811544
+v 2.000000 2.752542 -0.474010
v -0.135080 2.752542 0.156741
v 2.000000 2.752542 -0.974019
+v -0.514148 2.752542 -0.406239
+v -0.510185 2.752542 -0.362940
v 2.000000 1.375201 -2.000000
v -2.000000 0.162505 -2.000000
-v -2.000000 0.640719 0.194839
-v -0.510185 2.752542 -0.362940
-v -0.514148 2.752542 -0.406239
v -2.000000 0.851648 -1.486658
-v 1.838462 -0.449867 2.000000
-v 2.000000 -0.264114 1.811544
+v -2.000000 0.640719 0.194839
+v -2.000000 -0.277081 1.334279
+v -1.638242 -0.409609 2.000000
v 1.780953 -0.528309 2.000000
v 0.359190 -2.752542 0.447017
-v 2.000000 0.110382 -2.000000
-v 2.000000 -0.833041 -1.288881
-v -2.000000 -1.354188 -2.000000
v 0.455424 -2.752542 -0.268308
-v -1.638242 -0.409609 2.000000
-v -2.000000 -0.277081 1.334279
+v 2.000000 -0.833041 -1.288881
+v 2.000000 0.110382 -2.000000
+v -0.830498 -2.752542 -0.623204
v -2.000000 -1.778557 -1.680125
+v -2.000000 -1.354188 -2.000000
v -1.390751 -0.727134 2.000000
-v -0.830498 -2.752542 -0.623204
v -0.401530 -2.752542 0.481703
+vt 0.739343 0.081348
+vt 0.984770 0.000000
+vt 1.000000 0.026330
+vt 1.000000 0.406871
+vt 0.798706 0.368572
+vt 0.380447 0.424546
+vt 0.616630 0.438623
+vt 0.617023 0.441198
+vt 0.592258 0.474617
+vt 0.389111 0.453931
+vt 0.368223 0.252380
+vt 0.733227 0.123189
+vt 0.739343 0.209331
+vt 0.025299 0.237891
+vt 0.160380 0.322331
+vt 0.003179 0.458593
+vt 0.000000 0.455981
+vt 0.294567 0.317210
+vt 0.350745 0.346697
+vt 0.297089 0.425121
+vt 0.041339 0.489934
+vt 0.657741 0.918484
+vt 0.420171 1.000000
+vt 0.368223 0.956029
+vt 0.401798 0.740562
+vt 0.658877 0.885877
+vt 0.662142 0.912242
+vt 0.403085 0.621783
+vt 0.474046 0.521143
+vt 0.625830 0.474617
+vt 0.662142 0.505353
+vt 0.811759 0.884974
+vt 0.662142 0.672781
+vt 0.714170 0.551368
+vt 0.869116 0.474617
+vt 0.916010 0.489288
+vt 0.916010 0.917588
+vt 0.373323 0.149648
+vt 0.739343 0.000000
+vt 0.000000 0.774896
+vt 0.029545 0.760641
+vt 0.291632 0.900792
+vt 0.294340 0.908994
+vt 0.047058 0.883086
+vt 0.155870 0.014617
+vt 0.287091 0.000000
+vt 0.368223 0.066636
+vt 0.368223 0.321151
+vt 0.204280 0.565657
+vt 0.269265 0.593819
+vt 0.194293 0.489934
+vt 0.294340 0.559546
+vt 0.025538 0.151489
+vt 0.109023 0.029467
vn 0.2292 0.5878 0.7758
-vn 0.0000 1.0000 -0.0000
+vn 0.0000 1.0000 0.0000
vn -0.1782 0.5878 -0.7891
vn -0.8056 0.5878 0.0737
vn -0.6560 0.5878 0.4735
vn 0.8018 -0.5878 0.1079
-vn 1.0000 -0.0000 0.0000
+vn 1.0000 0.0000 0.0000
vn 0.2152 -0.5878 -0.7798
vn 0.0000 0.0000 -1.0000
-vn 0.0000 0.0000 1.0000
+vn 0.0000 -0.0000 1.0000
vn -0.7542 -0.5878 0.2928
vn 0.0368 -0.5878 0.8082
vn 0.0000 -1.0000 0.0000
vn -1.0000 0.0000 0.0000
-usemtl Material
-s off
-f 2//1 11//1 12//1 1//1 3//1
-f 4//2 9//2 8//2 3//2 1//2
-f 5//3 6//3 10//3 9//3 4//3
-f 10//4 7//4 8//4 9//4
-f 8//5 7//5 20//5 19//5 2//5 3//5
-f 13//6 14//6 18//6 16//6 12//6 11//6
-f 12//7 16//7 15//7 5//7 4//7 1//7
-f 16//8 18//8 23//8 21//8 17//8 15//8
-f 15//9 17//9 6//9 5//9
-f 19//10 22//10 13//10 11//10 2//10
-f 21//11 23//11 24//11 22//11 19//11 20//11
-f 22//12 24//12 14//12 13//12
-f 24//13 23//13 18//13 14//13
-f 21//14 20//14 7//14 10//14 6//14 17//14
+usemtl Material.004
+s 1
+f 1/1/1 2/2/1 3/3/1 4/4/1 5/5/1
+f 6/6/2 7/7/2 8/8/2 5/9/2 4/10/2
+f 9/11/3 10/12/3 11/13/3 7/7/3 6/6/3
+f 11/14/4 12/15/4 8/16/4 7/17/4
+f 8/16/5 12/15/5 13/18/5 14/19/5 1/20/5 5/21/5
+f 15/22/6 16/23/6 17/24/6 18/25/6 3/26/6 2/27/6
+f 3/26/7 18/25/7 19/28/7 9/29/7 6/30/7 4/31/7
+f 18/32/8 17/33/8 20/34/8 21/35/8 22/36/8 19/37/8
+f 19/38/9 22/39/9 10/12/9 9/11/9
+f 14/40/10 23/41/10 15/42/10 2/43/10 1/44/10
+f 21/45/11 20/46/11 24/47/11 23/48/11 14/19/11 13/18/11
+f 23/41/12 24/49/12 16/50/12 15/42/12
+f 24/49/13 20/51/13 17/52/13 16/50/13
+f 21/45/14 13/18/14 12/15/14 11/14/14 10/53/14 22/54/14
diff --git a/Assets/MemoryBox/arScene/testobjects/img2256.wav.obj.meta b/Assets/MemoryBox/arScene/testobjects/img2256.wav.obj.meta
index ed08680733d5d4431835ede83d38b693c6e3ac85..636a82602d9d7756926172480029305bffc4728c 100644
--- a/Assets/MemoryBox/arScene/testobjects/img2256.wav.obj.meta
+++ b/Assets/MemoryBox/arScene/testobjects/img2256.wav.obj.meta
@@ -10,6 +10,7 @@ ModelImporter:
400000: default
400002: //RootNode
2100000: defaultMat
+ 2100002: Material.004
2300000: default
3300000: default
4300000: default
diff --git a/Assets/MemoryBox/arScene/testobjects/toolur_x1NJwe.wav.mtl b/Assets/MemoryBox/arScene/testobjects/toolur_x1NJwe.wav.mtl
new file mode 100644
index 0000000000000000000000000000000000000000..480daf82f02feb6ec6fd861b4b38a71e2cb6075e
--- /dev/null
+++ b/Assets/MemoryBox/arScene/testobjects/toolur_x1NJwe.wav.mtl
@@ -0,0 +1,12 @@
+# Blender MTL File: 'img1.blend'
+# Material Count: 1
+
+newmtl Material.005
+Ns 96.078431
+Ka 1.000000 1.000000 1.000000
+Kd 0.640000 0.640000 0.640000
+Ks 0.500000 0.500000 0.500000
+Ke 0.000000 0.000000 0.000000
+Ni 1.000000
+d 1.000000
+illum 2
diff --git a/Assets/MemoryBox/arScene/testobjects/toolur_x1NJwe.wav.mtl.meta b/Assets/MemoryBox/arScene/testobjects/toolur_x1NJwe.wav.mtl.meta
new file mode 100644
index 0000000000000000000000000000000000000000..92befec19ff4f9f7c9153b2260e22f415a0f055e
--- /dev/null
+++ b/Assets/MemoryBox/arScene/testobjects/toolur_x1NJwe.wav.mtl.meta
@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: 6b8be373a9a4d30498751a1b69d1c1b0
+timeCreated: 1517766837
+licenseType: Free
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/MemoryBox/arScene/testobjects/toolur_x1NJwe.wav.obj b/Assets/MemoryBox/arScene/testobjects/toolur_x1NJwe.wav.obj
index 4074d38cefad898d4d1c8483c9da62a20a8826c5..a5e07c077842db5f385eadeadb8e4e93527dff1f 100644
--- a/Assets/MemoryBox/arScene/testobjects/toolur_x1NJwe.wav.obj
+++ b/Assets/MemoryBox/arScene/testobjects/toolur_x1NJwe.wav.obj
@@ -1,42 +1,76 @@
-# Blender v2.79 (sub 0) OBJ File: 'main.blend'
+# Blender v2.79 (sub 0) OBJ File: 'img1.blend'
# www.blender.org
mtllib toolur_x1NJwe.wav.mtl
-o Cube
+o Cube.005
v -0.596707 -0.031341 -2.000000
-v 2.000000 0.177684 -0.552169
-v -1.235841 2.385987 2.000000
-v 0.002736 2.527344 -0.022091
-v 2.000000 0.118771 -0.590742
v -0.775245 -0.297227 -2.000000
-v -0.532511 -0.080842 -2.000000
v -0.932873 -0.497506 -1.959078
-v -0.078986 -2.545766 -0.035242
v -1.971529 0.344870 0.877463
-v 0.238730 0.281822 2.000000
v -1.641875 1.781303 2.000000
+v -1.235841 2.385987 2.000000
+v 0.002736 2.527344 -0.022091
+v 0.238730 0.281822 2.000000
v 0.611980 -0.160532 1.904380
-v 2.000000 0.064769 -0.553763
-v 0.007888 -2.540360 0.014087
v 2.000000 0.116203 -0.487038
+v 2.000000 0.177684 -0.552169
+v 2.000000 0.118771 -0.590742
+v -0.532511 -0.080842 -2.000000
+v -0.078986 -2.545766 -0.035242
+v 0.007888 -2.540360 0.014087
+v 2.000000 0.064769 -0.553763
+vt 1.000000 0.491883
+vt 0.974064 0.520123
+vt 0.949365 0.538990
+vt 0.673601 0.282778
+vt 0.672068 0.064225
+vt 0.731052 0.000000
+vt 1.000000 0.103851
+vt 0.672068 0.000000
+vt 0.670414 0.156914
+vt 0.657568 0.195797
+vt 0.345200 0.322605
+vt 0.336735 0.322036
+vt 0.407869 0.114133
+vt 0.997926 1.000000
+vt 0.677532 0.799705
+vt 0.675560 0.791620
+vt 0.975420 0.609308
+vt 0.984848 0.612175
+vt 0.991408 0.583712
+vt 0.004286 0.284069
+vt 0.326164 0.000000
+vt 0.336643 0.006038
+vt 0.336643 0.371601
+vt 0.277136 0.409978
+vt 0.000000 0.502588
+vt 0.015204 0.566715
+vt 0.085201 0.027491
+vt 0.672068 0.561090
+vt 0.342435 0.332177
+vt 0.336643 0.330160
+vt 0.672068 0.789397
+vt 0.749661 0.545185
+vt 0.760041 0.538990
+vt 0.997926 0.564629
vn -0.7515 0.5046 -0.4250
vn 0.7201 0.5046 0.4763
vn 0.3891 0.5046 -0.7707
vn 0.0000 0.0000 -1.0000
vn -0.4023 -0.5046 0.7639
-vn 0.0000 0.0000 1.0000
+vn -0.0000 -0.0000 1.0000
vn -0.8483 -0.5046 -0.1607
vn 0.7708 -0.5046 0.3890
vn 1.0000 0.0000 0.0000
vn 0.4498 -0.5046 -0.7369
-usemtl Material
-s off
-f 1//1 6//1 8//1 10//1 12//1 3//1 4//1
-f 3//2 11//2 13//2 16//2 2//2 4//2
-f 4//3 2//3 5//3 7//3 1//3
-f 7//4 6//4 1//4
-f 10//5 9//5 15//5 13//5 11//5 12//5
-f 12//6 11//6 3//6
-f 9//7 10//7 8//7
-f 13//8 15//8 14//8 16//8
-f 16//9 14//9 5//9 2//9
-f 14//10 15//10 9//10 8//10 6//10 7//10 5//10
+usemtl Material.005
+s 1
+f 1/1/1 2/2/1 3/3/1 4/4/1 5/5/1 6/6/1 7/7/1
+f 6/8/2 8/9/2 9/10/2 10/11/2 11/12/2 7/13/2
+f 7/14/3 11/15/3 12/16/3 13/17/3 1/18/3
+f 13/17/4 2/19/4 1/18/4
+f 4/20/5 14/21/5 15/22/5 9/23/5 8/24/5 5/25/5
+f 5/25/6 8/24/6 6/26/6
+f 14/21/7 4/20/7 3/27/7
+f 9/10/8 15/28/8 16/29/8 10/11/8
+f 10/11/9 16/29/9 12/30/9 11/12/9
+f 16/31/10 15/32/10 14/33/10 3/34/10 2/19/10 13/17/10 12/16/10
diff --git a/Assets/MemoryBox/arScene/testobjects/toolur_x1NJwe.wav.obj.meta b/Assets/MemoryBox/arScene/testobjects/toolur_x1NJwe.wav.obj.meta
index 47c7cf1625a3d2572f1cd4d9158707e032b4246e..2eed734a2a20181bb4167f0370b13ba52a537f5a 100644
--- a/Assets/MemoryBox/arScene/testobjects/toolur_x1NJwe.wav.obj.meta
+++ b/Assets/MemoryBox/arScene/testobjects/toolur_x1NJwe.wav.obj.meta
@@ -10,6 +10,7 @@ ModelImporter:
400000: default
400002: //RootNode
2100000: defaultMat
+ 2100002: Material.005
2300000: default
3300000: default
4300000: default