fix #56

UnityProject/Assembly-CSharp.csproj

@@ -64,6 +64,7 @@
     <Compile Include="Assets\Scenes\Examples\VisualEffectGraph\script\FlareBind.cs" />
     <Compile Include="Assets\Scenes\Examples\VisualEffectGraph\script\SmokeBind.cs" />
     <Compile Include="Assets\Scripts\PdConnection\FFTArrayContainer.cs" />
+    <Compile Include="Assets\Scripts\PdConnection\FFTArraySelector.cs" />
     <Compile Include="Assets\Scripts\PdConnection\ISpectrumGenerator.cs" />
     <Compile Include="Assets\Scripts\PdConnection\PdArray.cs" />
     <Compile Include="Assets\Scripts\PdConnection\PdBackend.cs" />

UnityProject/Assets/Editor/PdSpectrumBindEditor.cs

@@ -16,27 +16,29 @@ namespace cylvester
         private SerializedProperty selectionProperty_;
         private SerializedProperty pdBackendProperty_;
         private SerializedProperty energyChangedProperty_;
+        private SerializedProperty channelProperty_;
         private Rect paintSpace_;
         private ISpectrumGenerator spectrumGeneratorEditMode_;
 
         public void OnEnable()
         {
-            var behaviour = (IPdSpectrumBind) target;
+            var behaviour = (PdSpectrumBind) target;
 
             pdBackendProperty_ = serializedObject.FindProperty("pdBackend");
             selectionProperty_ = serializedObject.FindProperty("selection");
             energyChangedProperty_ = serializedObject.FindProperty("energyChanged");
+            channelProperty_ = serializedObject.FindProperty("channel");
             rectangularSelection_ = new RectangularSelection(behaviour.TextureWidth, behaviour.TextureHeight);
             spectrumGeneratorEditMode_ = new SpectrumGeneratorEditMode(behaviour.TextureWidth, behaviour.TextureHeight);
         }
 
         public override void OnInspectorGUI()
         {
-            var behaviour = (IPdSpectrumBind) target;
+            var behaviour = (PdSpectrumBind) target;
             EditorGUILayout.PropertyField(pdBackendProperty_);
 
             GUILayout.Label("PureData Inputs", EditorStyles.boldLabel);
-            behaviour.Channel = EditorGUILayout.Popup("Input Channel", behaviour.Channel, channels_);
+            channelProperty_.intValue = EditorGUILayout.Popup("Input Channel", channelProperty_.intValue, channels_);
 
             GUILayout.Label("Callback", EditorStyles.boldLabel);
             EditorGUILayout.PropertyField(energyChangedProperty_);

UnityProject/Assets/Editor/UnitTest/UnitTest_SpectrumGeneratorPlayMode.cs

@@ -7,7 +7,7 @@ namespace cylvester
     [TestFixture]
     public class UnitTest_SpectrumGeneratorPlayMode
     {
-        private IPdArray pdArray_;
+        private ISpectrumArraySelector spectrumArraySelector_;
         private Rect selectionRect_;
         private Rect noSelectionRect_;
         private float[] dummyData_;
@@ -17,8 +17,8 @@ namespace cylvester
         public void SetUp()
         {
             dummyData_ = new float[100];
-            pdArray_ = Substitute.For<IPdArray>();
+            spectrumArraySelector_ = Substitute.For<ISpectrumArraySelector>();
-            pdArray_.Data.Returns(dummyData_);
+            spectrumArraySelector_.SelectedArray.Returns(dummyData_);
             selectionRect_ = new Rect {x = 9, y = 9, width = 3, height = 3};
             noSelectionRect_ = new Rect {width = 0, height = 0};
         }
@@ -26,7 +26,7 @@ namespace cylvester
         [Test]
         public void Construction()
         {
-            var spectrumGenerator = new SpectrumGeneratorPlayMode(100, 101, pdArray_);
+            var spectrumGenerator = new SpectrumGeneratorPlayMode(100, 101, spectrumArraySelector_);
 
             Assert.AreEqual(100, spectrumGenerator.Spectrum.width);
             Assert.AreEqual(101, spectrumGenerator.Spectrum.height);
@@ -38,7 +38,7 @@ namespace cylvester
             for (var i = 0; i < dummyData_.Length; ++i)
                 dummyData_[i] = 100f; // loud sound
 
-            var spectrumGenerator = new SpectrumGeneratorPlayMode(100, 100, pdArray_);
+            var spectrumGenerator = new SpectrumGeneratorPlayMode(100, 100, spectrumArraySelector_);
             var validPixel = spectrumGenerator.Update(selectionRect_);
 
             Assert.AreEqual(1, validPixel);
@@ -50,7 +50,7 @@ namespace cylvester
             for (var i = 0; i < dummyData_.Length; ++i)
                 dummyData_[i] = 0.001f; // soft sound
 
-            var spectrumGenerator = new SpectrumGeneratorPlayMode(100, 100, pdArray_);
+            var spectrumGenerator = new SpectrumGeneratorPlayMode(100, 100, spectrumArraySelector_);
             var validPixel = spectrumGenerator.Update(selectionRect_);
 
             Assert.AreEqual(0, validPixel);
@@ -62,7 +62,7 @@ namespace cylvester
             for (var i = 0; i < dummyData_.Length; ++i)
                 dummyData_[i] = 100f; // loud sound
 
-            var spectrumGenerator = new SpectrumGeneratorPlayMode(100, 100, pdArray_);
+            var spectrumGenerator = new SpectrumGeneratorPlayMode(100, 100, spectrumArraySelector_);
             var validPixel = spectrumGenerator.Update(noSelectionRect_);
 
             Assert.AreEqual(0, validPixel);

UnityProject/Assets/Scenes/Examples/PdBackend/PdBackendDemo.unity

@@ -144,24 +144,13 @@ MonoBehaviour:
   pdBackend: {fileID: 987772533}
   selection:
     serializedVersion: 2
-    x: -16.071749
+    x: 119.36657
-    y: -380
+    y: -154
-    width: 361.61435
+    width: 6.005865
-    height: 814
+    height: -3
   energyChanged:
     m_PersistentCalls:
       m_Calls:
-      - m_Target: {fileID: 428795649}
-        m_MethodName: set_Size
-        m_Mode: 0
-        m_Arguments:
-          m_ObjectArgument: {fileID: 0}
-          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
-          m_IntArgument: 0
-          m_FloatArgument: 0
-          m_StringArgument: 
-          m_BoolArgument: 0
-        m_CallState: 2
       - m_Target: {fileID: 0}
         m_MethodName: 
         m_Mode: 1
@@ -175,6 +164,7 @@ MonoBehaviour:
         m_CallState: 2
     m_TypeName: cylvester.UnityFloatEvent, Assembly-CSharp, Version=0.0.0.0, Culture=neutral,
       PublicKeyToken=null
+  channel: 1
 --- !u!4 &127705019
 Transform:
   m_ObjectHideFlags: 0

UnityProject/Assets/Scripts/PdConnection/FFTArrayContainer.cs

@@ -1,16 +1,16 @@
 namespace cylvester
 {
-    public interface IFftArrayContainer
+    public interface ISpectrumArrayContainer
     {
         IPdArray this[int index] { get; }
         void Update();
     }
     
-    public class FftArrayContainer : IFftArrayContainer
+    public class SpectrumArrayContainer : ISpectrumArrayContainer
     {
         private readonly IPdArray[] arrays_;
 
-        public FftArrayContainer()
+        public SpectrumArrayContainer()
         {
             arrays_ = new IPdArray[16];
             for(var i  = 0; i < 16; ++i)

UnityProject/Assets/Scripts/PdConnection/FFTArraySelector.cs

@@ -0,0 +1,26 @@
+namespace cylvester
+{
+    public interface ISpectrumArraySelector
+    {
+        int Selection { set; }
+        float[] SelectedArray { get; }
+    }
+    
+    public class SpectrumArraySelector : ISpectrumArraySelector
+    {
+        private int selection_;
+        private readonly ISpectrumArrayContainer arrayContainer_;
+
+        public SpectrumArraySelector(ISpectrumArrayContainer arrayContainer)
+        {
+            arrayContainer_ = arrayContainer;
+        }
+
+        public int Selection
+        {
+            set => selection_ = value;
+        }
+
+        public float[] SelectedArray => arrayContainer_[selection_].Data;
+    }
+}

UnityProject/Assets/Scripts/PdConnection/FFTArraySelector.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 62b5baef27604c5e8d36766c7ccf6908
+timeCreated: 1570194849

UnityProject/Assets/Scripts/PdConnection/PdBackend.cs

@@ -8,7 +8,7 @@ namespace cylvester
         public string mainPatch = "analyzer.pd";
         public int samplePlayback;
         public PdArray levelMeterArray;
-        public IFftArrayContainer fftArrayContainer;
+        public ISpectrumArrayContainer spectrumArrayContainer;
 
         private IChangeObserver<int> samplePlaybackObserver_;
         private Action onSamplePlaybackChanged_;
@@ -18,7 +18,7 @@ namespace cylvester
         {
             PdProcess.Instance.Start(mainPatch);
             levelMeterArray = new PdArray("levelmeters", PdConstant.NumMaxInputChannels);
-            fftArrayContainer = new FftArrayContainer();
+            spectrumArrayContainer = new SpectrumArrayContainer();
             pdSocket_ = new PdSocket(PdConstant.ip, PdConstant.port);
             
             samplePlaybackObserver_ = new ChangeObserver<int>(samplePlayback);
@@ -45,7 +45,7 @@ namespace cylvester
             if(PdProcess.Instance.Running)
                 levelMeterArray.Update();
 
-            fftArrayContainer.Update();
+            spectrumArrayContainer.Update();
             samplePlaybackObserver_.Value = samplePlayback;
         }
     }

UnityProject/Assets/Scripts/PdConnection/PdSpectrumBind.cs

@@ -6,37 +6,31 @@ namespace cylvester
     [System.Serializable]
     class UnityFloatEvent : UnityEvent<float> { }
     
-    public interface IPdSpectrumBind
-    {
-        int Channel { get; set; }
-        int Energy { get; }
-        int TextureWidth { get; }
-        int TextureHeight { get; }
-        Texture2D Spectrum { get; }
-    }
 
-    public class PdSpectrumBind : MonoBehaviour, IPdSpectrumBind
+    public class PdSpectrumBind : MonoBehaviour
     {
         [SerializeField] private PdBackend pdBackend;
         [SerializeField] private Rect selection;
         [SerializeField] private UnityFloatEvent energyChanged;
+        [SerializeField] private int channel = 0;
 
         private ISpectrumGenerator spectrumGenerator_;
-
+        private ISpectrumArraySelector arraySelector_;
-        private void Start()
-        {
-            var spectrumArray = pdBackend.fftArrayContainer[Channel];
-            spectrumGenerator_ = new SpectrumGeneratorPlayMode(TextureWidth, TextureHeight, spectrumArray);
-        }
 
         public int TextureWidth { get; } = 512;
         public int TextureHeight { get; } = 256;
         public Texture2D Spectrum => spectrumGenerator_.Spectrum;
-        public int Channel { get; set; }
         public int Energy { get; private set; }
 
+        private void Start()
+        {
+            arraySelector_ = new SpectrumArraySelector(pdBackend.spectrumArrayContainer);
+            spectrumGenerator_ = new SpectrumGeneratorPlayMode(TextureWidth, TextureHeight, arraySelector_);
+        }
+        
         private void Update()
         {
+            arraySelector_.Selection = channel;
             var energy = spectrumGenerator_.Update(selection);
             if (energy == Energy)
                 return;

UnityProject/Assets/Scripts/PdConnection/SpectrumGeneratorPlayMode.cs

@@ -4,18 +4,18 @@ namespace cylvester
 {
     public class SpectrumGeneratorPlayMode : SpectrumGenerator, ISpectrumGenerator
     {
-        private IPdArray pdArray_;
+        private ISpectrumArraySelector arraySelector_;
         
-        public SpectrumGeneratorPlayMode(int textureWidth, int textureHeight, IPdArray pdArray)
+        public SpectrumGeneratorPlayMode(int textureWidth, int textureHeight, ISpectrumArraySelector arraySelector)
             :base(textureWidth, textureHeight)
         {
-            pdArray_ = pdArray;
+            arraySelector_ = arraySelector;
         }
 
         public int Update( Rect selectionRect)
         {
             var numPixels = 0;
-            var data = pdArray_.Data;
+            var data = arraySelector_.SelectedArray;
             OnAllPixels((x, y) =>
             {
                 var magnitude = data[x] * 20f;

UnityProject/Assets/Scripts/Visualizer/WaterfallVisualizer.cs

@@ -30,7 +30,7 @@ namespace cylvester
         
         public void Update()
         {
-            spectrumArray_ = pdBackend.fftArrayContainer[channel-1];
+            spectrumArray_ = pdBackend.spectrumArrayContainer[channel-1];
             visualizers_[head_].Spectrum = spectrumArray_.Data;
             head_++;
             head_ %= historySize;

UnityProject/Assets/ThridParty/Assets/JapaneseHouse/meshes/Materials.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 374daf37c18625648b60a99b2d9593af
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

UnityProject/Assets/ThridParty/Assets/JapaneseHouse/meshes/Materials/Lantern.mat

@@ -0,0 +1,290 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 6
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Lantern
+  m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3}
+  m_ShaderKeywords: _NORMALMAP_TANGENT_SPACE
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses:
+  - DistortionVectors
+  - TransparentDepthPrepass
+  - TransparentDepthPostpass
+  - TransparentBackface
+  - MOTIONVECTORS
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _AnisotropyMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _BaseColorMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _BentNormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _BentNormalMapOS:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _BumpMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _CoatMaskMap:
+        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}
+    - _DetailMap:
+        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}
+    - _DistortionVectorMap:
+        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}
+    - _EmissiveColorMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _HeightMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _IridescenceMaskMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _IridescenceThicknessMap:
+        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}
+    - _MaskMap:
+        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}
+    - _NormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _NormalMapOS:
+        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}
+    - _SpecularColorMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _SubsurfaceMaskMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _TangentMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _TangentMapOS:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _ThicknessMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _TransmittanceColorMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Floats:
+    - _AORemapMax: 1
+    - _AORemapMin: 0
+    - _ATDistance: 1
+    - _AlbedoAffectEmissive: 0
+    - _AlphaCutoff: 0.5
+    - _AlphaCutoffEnable: 0
+    - _AlphaCutoffPostpass: 0.5
+    - _AlphaCutoffPrepass: 0.5
+    - _AlphaCutoffShadow: 0.5
+    - _AlphaDstBlend: 0
+    - _AlphaSrcBlend: 1
+    - _Anisotropy: 0
+    - _BlendMode: 0
+    - _BumpScale: 1
+    - _CoatMask: 0
+    - _CullMode: 2
+    - _CullModeForward: 2
+    - _Cutoff: 0.5
+    - _DepthOffsetEnable: 0
+    - _DetailAlbedoScale: 1
+    - _DetailNormalMapScale: 1
+    - _DetailNormalScale: 1
+    - _DetailSmoothnessScale: 1
+    - _DiffusionProfile: 0
+    - _DiffusionProfileHash: 0
+    - _DisplacementLockObjectScale: 1
+    - _DisplacementLockTilingScale: 1
+    - _DisplacementMode: 0
+    - _DistortionBlendMode: 0
+    - _DistortionBlurBlendMode: 0
+    - _DistortionBlurDstBlend: 1
+    - _DistortionBlurRemapMax: 1
+    - _DistortionBlurRemapMin: 0
+    - _DistortionBlurScale: 1
+    - _DistortionBlurSrcBlend: 1
+    - _DistortionDepthTest: 1
+    - _DistortionDstBlend: 1
+    - _DistortionEnable: 0
+    - _DistortionScale: 1
+    - _DistortionSrcBlend: 1
+    - _DistortionVectorBias: -1
+    - _DistortionVectorScale: 2
+    - _DoubleSidedEnable: 0
+    - _DoubleSidedNormalMode: 1
+    - _DstBlend: 0
+    - _EmissiveColorMode: 1
+    - _EmissiveExposureWeight: 1
+    - _EmissiveIntensity: 1
+    - _EmissiveIntensityUnit: 0
+    - _EnableBlendModePreserveSpecularLighting: 1
+    - _EnableFogOnTransparent: 1
+    - _EnableGeometricSpecularAA: 0
+    - _EnableSpecularOcclusion: 0
+    - _EnergyConservingSpecularColor: 1
+    - _GlossMapScale: 1
+    - _Glossiness: 0
+    - _GlossyReflections: 1
+    - _HdrpVersion: 2
+    - _HeightAmplitude: 0.02
+    - _HeightCenter: 0.5
+    - _HeightMapParametrization: 0
+    - _HeightMax: 1
+    - _HeightMin: -1
+    - _HeightOffset: 0
+    - _HeightPoMAmplitude: 2
+    - _HeightTessAmplitude: 2
+    - _HeightTessCenter: 0.5
+    - _InvTilingScale: 1
+    - _Ior: 1
+    - _IridescenceMask: 1
+    - _IridescenceThickness: 1
+    - _LinkDetailsWithBase: 0
+    - _MaterialID: 1
+    - _Metallic: 0
+    - _Mode: 0
+    - _NormalMapSpace: 0
+    - _NormalScale: 1
+    - _OcclusionStrength: 1
+    - _PPDLodThreshold: 5
+    - _PPDMaxSamples: 15
+    - _PPDMinSamples: 5
+    - _PPDPrimitiveLength: 1
+    - _PPDPrimitiveWidth: 1
+    - _Parallax: 0.02
+    - _ReceivesSSR: 1
+    - _RefractionModel: 0
+    - _SSRefractionProjectionModel: 0
+    - _Smoothness: 0
+    - _SmoothnessRemapMax: 0
+    - _SmoothnessRemapMin: 0
+    - _SmoothnessTextureChannel: 0
+    - _SpecularAAScreenSpaceVariance: 0.1
+    - _SpecularAAThreshold: 0.2
+    - _SpecularHighlights: 1
+    - _SrcBlend: 1
+    - _StencilRef: 2
+    - _StencilRefDepth: 0
+    - _StencilRefDistortionVec: 64
+    - _StencilRefGBuffer: 2
+    - _StencilRefMV: 128
+    - _StencilWriteMask: 3
+    - _StencilWriteMaskDepth: 48
+    - _StencilWriteMaskDistortionVec: 64
+    - _StencilWriteMaskGBuffer: 51
+    - _StencilWriteMaskMV: 176
+    - _SubsurfaceMask: 1
+    - _SupportDecals: 1
+    - _SurfaceType: 0
+    - _TexWorldScale: 1
+    - _TexWorldScaleEmissive: 1
+    - _Thickness: 1
+    - _ThicknessMultiplier: 1
+    - _TransmissionEnable: 1
+    - _TransparentBackfaceEnable: 0
+    - _TransparentCullMode: 2
+    - _TransparentDepthPostpassEnable: 0
+    - _TransparentDepthPrepassEnable: 0
+    - _TransparentSortPriority: 0
+    - _TransparentWritingMotionVec: 0
+    - _UVBase: 0
+    - _UVDetail: 0
+    - _UVEmissive: 0
+    - _UVSec: 0
+    - _UseEmissiveIntensity: 0
+    - _UseShadowThreshold: 0
+    - _ZTestDepthEqualForOpaque: 3
+    - _ZTestGBuffer: 4
+    - _ZTestModeDistortion: 4
+    - _ZTestTransparent: 4
+    - _ZWrite: 1
+    m_Colors:
+    - _BaseColor: {r: 0.8, g: 0.8, b: 0.8, a: 1}
+    - _BaseColorMap_MipInfo: {r: 0, g: 0, b: 0, a: 0}
+    - _Color: {r: 0.8, g: 0.8, b: 0.8, a: 1}
+    - _DiffusionProfileAsset: {r: 0, g: 0, b: 0, a: 0}
+    - _DoubleSidedConstants: {r: 1, g: 1, b: -1, a: 0}
+    - _EmissionColor: {r: 1, g: 1, b: 1, a: 1}
+    - _EmissiveColor: {r: 0, g: 0, b: 0, a: 1}
+    - _EmissiveColorLDR: {r: 0, g: 0, b: 0, a: 1}
+    - _InvPrimScale: {r: 1, g: 1, b: 0, a: 0}
+    - _IridescenceThicknessRemap: {r: 0, g: 1, b: 0, a: 0}
+    - _SpecularColor: {r: 1, g: 1, b: 1, a: 1}
+    - _ThicknessRemap: {r: 0, g: 1, b: 0, a: 0}
+    - _TransmittanceColor: {r: 1, g: 1, b: 1, a: 1}
+    - _UVDetailsMappingMask: {r: 1, g: 0, b: 0, a: 0}
+    - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0}
+    - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0}

UnityProject/Assets/ThridParty/Assets/JapaneseHouse/meshes/Materials/Lantern.mat.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 55f1954e90f400b419e56e0f480a4cec
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

UnityProject/Assets/ThridParty/Assets/JapaneseHouse/meshes/Materials/floor.mat

@@ -0,0 +1,290 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 6
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: floor
+  m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3}
+  m_ShaderKeywords: _NORMALMAP_TANGENT_SPACE
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses:
+  - DistortionVectors
+  - TransparentDepthPrepass
+  - TransparentDepthPostpass
+  - TransparentBackface
+  - MOTIONVECTORS
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _AnisotropyMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _BaseColorMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _BentNormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _BentNormalMapOS:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _BumpMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _CoatMaskMap:
+        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}
+    - _DetailMap:
+        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}
+    - _DistortionVectorMap:
+        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}
+    - _EmissiveColorMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _HeightMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _IridescenceMaskMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _IridescenceThicknessMap:
+        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}
+    - _MaskMap:
+        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}
+    - _NormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _NormalMapOS:
+        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}
+    - _SpecularColorMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _SubsurfaceMaskMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _TangentMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _TangentMapOS:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _ThicknessMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _TransmittanceColorMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Floats:
+    - _AORemapMax: 1
+    - _AORemapMin: 0
+    - _ATDistance: 1
+    - _AlbedoAffectEmissive: 0
+    - _AlphaCutoff: 0.5
+    - _AlphaCutoffEnable: 0
+    - _AlphaCutoffPostpass: 0.5
+    - _AlphaCutoffPrepass: 0.5
+    - _AlphaCutoffShadow: 0.5
+    - _AlphaDstBlend: 0
+    - _AlphaSrcBlend: 1
+    - _Anisotropy: 0
+    - _BlendMode: 0
+    - _BumpScale: 1
+    - _CoatMask: 0
+    - _CullMode: 2
+    - _CullModeForward: 2
+    - _Cutoff: 0.5
+    - _DepthOffsetEnable: 0
+    - _DetailAlbedoScale: 1
+    - _DetailNormalMapScale: 1
+    - _DetailNormalScale: 1
+    - _DetailSmoothnessScale: 1
+    - _DiffusionProfile: 0
+    - _DiffusionProfileHash: 0
+    - _DisplacementLockObjectScale: 1
+    - _DisplacementLockTilingScale: 1
+    - _DisplacementMode: 0
+    - _DistortionBlendMode: 0
+    - _DistortionBlurBlendMode: 0
+    - _DistortionBlurDstBlend: 1
+    - _DistortionBlurRemapMax: 1
+    - _DistortionBlurRemapMin: 0
+    - _DistortionBlurScale: 1
+    - _DistortionBlurSrcBlend: 1
+    - _DistortionDepthTest: 1
+    - _DistortionDstBlend: 1
+    - _DistortionEnable: 0
+    - _DistortionScale: 1
+    - _DistortionSrcBlend: 1
+    - _DistortionVectorBias: -1
+    - _DistortionVectorScale: 2
+    - _DoubleSidedEnable: 0
+    - _DoubleSidedNormalMode: 1
+    - _DstBlend: 0
+    - _EmissiveColorMode: 1
+    - _EmissiveExposureWeight: 1
+    - _EmissiveIntensity: 1
+    - _EmissiveIntensityUnit: 0
+    - _EnableBlendModePreserveSpecularLighting: 1
+    - _EnableFogOnTransparent: 1
+    - _EnableGeometricSpecularAA: 0
+    - _EnableSpecularOcclusion: 0
+    - _EnergyConservingSpecularColor: 1
+    - _GlossMapScale: 1
+    - _Glossiness: 0
+    - _GlossyReflections: 1
+    - _HdrpVersion: 2
+    - _HeightAmplitude: 0.02
+    - _HeightCenter: 0.5
+    - _HeightMapParametrization: 0
+    - _HeightMax: 1
+    - _HeightMin: -1
+    - _HeightOffset: 0
+    - _HeightPoMAmplitude: 2
+    - _HeightTessAmplitude: 2
+    - _HeightTessCenter: 0.5
+    - _InvTilingScale: 1
+    - _Ior: 1
+    - _IridescenceMask: 1
+    - _IridescenceThickness: 1
+    - _LinkDetailsWithBase: 0
+    - _MaterialID: 1
+    - _Metallic: 0
+    - _Mode: 0
+    - _NormalMapSpace: 0
+    - _NormalScale: 1
+    - _OcclusionStrength: 1
+    - _PPDLodThreshold: 5
+    - _PPDMaxSamples: 15
+    - _PPDMinSamples: 5
+    - _PPDPrimitiveLength: 1
+    - _PPDPrimitiveWidth: 1
+    - _Parallax: 0.02
+    - _ReceivesSSR: 1
+    - _RefractionModel: 0
+    - _SSRefractionProjectionModel: 0
+    - _Smoothness: 0
+    - _SmoothnessRemapMax: 0
+    - _SmoothnessRemapMin: 0
+    - _SmoothnessTextureChannel: 0
+    - _SpecularAAScreenSpaceVariance: 0.1
+    - _SpecularAAThreshold: 0.2
+    - _SpecularHighlights: 1
+    - _SrcBlend: 1
+    - _StencilRef: 2
+    - _StencilRefDepth: 0
+    - _StencilRefDistortionVec: 64
+    - _StencilRefGBuffer: 2
+    - _StencilRefMV: 128
+    - _StencilWriteMask: 3
+    - _StencilWriteMaskDepth: 48
+    - _StencilWriteMaskDistortionVec: 64
+    - _StencilWriteMaskGBuffer: 51
+    - _StencilWriteMaskMV: 176
+    - _SubsurfaceMask: 1
+    - _SupportDecals: 1
+    - _SurfaceType: 0
+    - _TexWorldScale: 1
+    - _TexWorldScaleEmissive: 1
+    - _Thickness: 1
+    - _ThicknessMultiplier: 1
+    - _TransmissionEnable: 1
+    - _TransparentBackfaceEnable: 0
+    - _TransparentCullMode: 2
+    - _TransparentDepthPostpassEnable: 0
+    - _TransparentDepthPrepassEnable: 0
+    - _TransparentSortPriority: 0
+    - _TransparentWritingMotionVec: 0
+    - _UVBase: 0
+    - _UVDetail: 0
+    - _UVEmissive: 0
+    - _UVSec: 0
+    - _UseEmissiveIntensity: 0
+    - _UseShadowThreshold: 0
+    - _ZTestDepthEqualForOpaque: 3
+    - _ZTestGBuffer: 4
+    - _ZTestModeDistortion: 4
+    - _ZTestTransparent: 4
+    - _ZWrite: 1
+    m_Colors:
+    - _BaseColor: {r: 0.8, g: 0.8, b: 0.8, a: 1}
+    - _BaseColorMap_MipInfo: {r: 0, g: 0, b: 0, a: 0}
+    - _Color: {r: 0.8, g: 0.8, b: 0.8, a: 1}
+    - _DiffusionProfileAsset: {r: 0, g: 0, b: 0, a: 0}
+    - _DoubleSidedConstants: {r: 1, g: 1, b: -1, a: 0}
+    - _EmissionColor: {r: 1, g: 1, b: 1, a: 1}
+    - _EmissiveColor: {r: 0, g: 0, b: 0, a: 1}
+    - _EmissiveColorLDR: {r: 0, g: 0, b: 0, a: 1}
+    - _InvPrimScale: {r: 1, g: 1, b: 0, a: 0}
+    - _IridescenceThicknessRemap: {r: 0, g: 1, b: 0, a: 0}
+    - _SpecularColor: {r: 1, g: 1, b: 1, a: 1}
+    - _ThicknessRemap: {r: 0, g: 1, b: 0, a: 0}
+    - _TransmittanceColor: {r: 1, g: 1, b: 1, a: 1}
+    - _UVDetailsMappingMask: {r: 1, g: 0, b: 0, a: 0}
+    - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0}
+    - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0}

UnityProject/Assets/ThridParty/Assets/JapaneseHouse/meshes/Materials/floor.mat.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: ae6934f99ba5ce04489238a1cdba6cc2
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

UnityProject/Logs/Packages-Update.log

@@ -0,0 +1,26 @@
+
+=== Fri Oct  4 10:53:21 2019
+
+Packages were changed.
+Update Mode: updateDependencies
+
+The following packages were added:
+  com.unity.2d.tilemap@1.0.0
+  com.unity.ext.nunit@1.0.0
+  com.unity.test-framework@1.0.13
+  com.unity.timeline@1.1.0
+  com.unity.2d.sprite@1.0.0
+  com.unity.ide.vscode@1.1.2
+  com.unity.ide.rider@1.1.0
+  com.unity.ugui@1.0.0
+  com.unity.modules.androidjni@1.0.0
+  com.unity.multiplayer-hlapi@1.0.2
+  com.unity.xr.legacyinputhelpers@2.0.2
+The following packages were updated:
+  com.unity.analytics from version 3.2.2 to 3.3.2
+  com.unity.collab-proxy from version 1.2.15 to 1.2.16
+  com.unity.package-manager-ui from version 2.0.7 to 2.2.0
+  com.unity.purchasing from version 2.0.3 to 2.0.6
+  com.unity.render-pipelines.high-definition from version 4.10.0-preview to 6.9.0-preview
+  com.unity.textmeshpro from version 1.4.1 to 2.0.1
+  com.unity.visualeffectgraph from version 4.10.0-preview to 6.9.0-preview

UnityProject/ProjectSettings/XRSettings.asset

@@ -0,0 +1,10 @@
+{
+    "m_SettingKeys": [
+        "VR Device Disabled",
+        "VR Device User Alert"
+    ],
+    "m_SettingValues": [
+        "False",
+        "False"
+    ]
+}