add project change

This commit is contained in:
Chikashi Miyama 2019-12-07 16:23:04 +01:00
parent 950e2ae16e
commit 3695f9d175
7 changed files with 1509 additions and 1553 deletions

View file

@ -136,6 +136,7 @@
<e p="Threshold.cs" t="Include" /> <e p="Threshold.cs" t="Include" />
</e> </e>
<e p="PdConnection" t="Include"> <e p="PdConnection" t="Include">
<e p="CylMidiTransitionController.cs" t="Include" />
<e p="DspController.cs" t="Include" /> <e p="DspController.cs" t="Include" />
<e p="ISpectrumGenerator.cs" t="Include" /> <e p="ISpectrumGenerator.cs" t="Include" />
<e p="MidiLogger.cs" t="Include" /> <e p="MidiLogger.cs" t="Include" />
@ -155,6 +156,7 @@
<e p="PdSender.cs" t="Include" /> <e p="PdSender.cs" t="Include" />
<e p="PdSpectrumBind.cs" t="Include" /> <e p="PdSpectrumBind.cs" t="Include" />
<e p="PdTimbreIdBind.cs" t="Include" /> <e p="PdTimbreIdBind.cs" t="Include" />
<e p="ScheduledAction.cs" t="Include" />
<e p="Spectrogram.cs" t="Include" /> <e p="Spectrogram.cs" t="Include" />
<e p="SpectrumGeneratorPlayMode.cs" t="Include" /> <e p="SpectrumGeneratorPlayMode.cs" t="Include" />
<e p="Waveform.cs" t="Include" /> <e p="Waveform.cs" t="Include" />

View file

@ -2,26 +2,13 @@
<project version="4"> <project version="4">
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="c6a8ca49-0b91-43c0-a787-44b1fda29c5f" name="Default Changelist" comment="implement FFT waterfall"> <list default="true" id="c6a8ca49-0b91-43c0-a787-44b1fda29c5f" name="Default Changelist" comment="implement FFT waterfall">
<change afterPath="$PROJECT_DIR$/Assets/Scenes/Examples/Qlist/animations.meta" afterDir="false" />
<change afterPath="$PROJECT_DIR$/Assets/Scenes/Examples/Qlist/animations/BlueToRed.anim" afterDir="false" />
<change afterPath="$PROJECT_DIR$/Assets/Scenes/Examples/Qlist/animations/BlueToRed.anim.meta" afterDir="false" />
<change afterPath="$PROJECT_DIR$/Assets/Scenes/Examples/Qlist/animations/Transitions.playable" afterDir="false" />
<change afterPath="$PROJECT_DIR$/Assets/Scenes/Examples/Qlist/animations/Transitions.playable.meta" afterDir="false" />
<change afterPath="$PROJECT_DIR$/Assets/Scenes/Examples/Qlist/animations/WhiteToBlue.anim" afterDir="false" />
<change afterPath="$PROJECT_DIR$/Assets/Scenes/Examples/Qlist/animations/WhiteToBlue.anim.meta" afterDir="false" />
<change afterPath="$PROJECT_DIR$/Assets/Scenes/Examples/Qlist/material.meta" afterDir="false" />
<change afterPath="$PROJECT_DIR$/Assets/Scenes/Examples/Qlist/material/BallColor.mat" afterDir="false" />
<change afterPath="$PROJECT_DIR$/Assets/Scenes/Examples/Qlist/material/BallColor.mat.meta" afterDir="false" />
<change afterPath="$PROJECT_DIR$/Assets/Scenes/Examples/Qlist/scripts.meta" afterDir="false" />
<change afterPath="$PROJECT_DIR$/Assets/Scenes/Examples/Qlist/scripts/QlistMarker.cs" afterDir="false" />
<change afterPath="$PROJECT_DIR$/Assets/Scenes/Examples/Qlist/scripts/TimelineController.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/.idea.UnityProject/.idea/contentModel.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/.idea.UnityProject/.idea/contentModel.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/.idea.UnityProject/.idea/contentModel.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/.idea.UnityProject/.idea/contentModel.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/.idea.UnityProject/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/.idea.UnityProject/.idea/workspace.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/.idea.UnityProject/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/.idea.UnityProject/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assembly-CSharp-Editor.csproj" beforeDir="false" afterPath="$PROJECT_DIR$/Assembly-CSharp-Editor.csproj" afterDir="false" /> <change beforePath="$PROJECT_DIR$/Assembly-CSharp-Editor.csproj" beforeDir="false" afterPath="$PROJECT_DIR$/Assembly-CSharp-Editor.csproj" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assembly-CSharp.csproj" beforeDir="false" afterPath="$PROJECT_DIR$/Assembly-CSharp.csproj" afterDir="false" /> <change beforePath="$PROJECT_DIR$/Assembly-CSharp.csproj" beforeDir="false" afterPath="$PROJECT_DIR$/Assembly-CSharp.csproj" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Scenes/Examples/Qlist/Qlist.unity" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scenes/Examples/Qlist/Qlist.unity" afterDir="false" /> <change beforePath="$PROJECT_DIR$/Assets/Scripts/UnitTest.meta" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/ThridParty/Assets/Construction_Site_Column/Materials.meta" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/UnityProject.sln" beforeDir="false" afterPath="$PROJECT_DIR$/UnityProject.sln" afterDir="false" /> <change beforePath="$PROJECT_DIR$/UnityProject.sln" beforeDir="false" afterPath="$PROJECT_DIR$/UnityProject.sln" afterDir="false" />
<change beforePath="$PROJECT_DIR$/UnityProject.sln.DotSettings.user" beforeDir="false" afterPath="$PROJECT_DIR$/UnityProject.sln.DotSettings.user" afterDir="false" />
</list> </list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
@ -43,12 +30,6 @@
<expand /> <expand />
<select /> <select />
</component> </component>
<component name="FindInProjectRecents">
<findStrings>
<find>serialize</find>
<find>indices</find>
</findStrings>
</component>
<component name="Git.Settings"> <component name="Git.Settings">
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$/.." /> <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$/.." />
</component> </component>
@ -68,6 +49,7 @@
<setting file="file://$PROJECT_DIR$/Assets/Scenes/Examples/MIDI/script/RandomPosition.cs" root0="FORCE_HIGHLIGHTING" /> <setting file="file://$PROJECT_DIR$/Assets/Scenes/Examples/MIDI/script/RandomPosition.cs" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$APPLICATION_CONFIG_DIR$/resharper-host/DecompilerCache/decompiler/4CD14385-55E6-4C0E-AEDA-2393D3C9CF4A/00/5855a925/Time.cs" root0="SKIP_HIGHLIGHTING" /> <setting file="file://$APPLICATION_CONFIG_DIR$/resharper-host/DecompilerCache/decompiler/4CD14385-55E6-4C0E-AEDA-2393D3C9CF4A/00/5855a925/Time.cs" root0="SKIP_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/Assets/ThridParty/KinectScript/KinectSpecialCases.cs" root0="FORCE_HIGHLIGHTING" /> <setting file="file://$PROJECT_DIR$/Assets/ThridParty/KinectScript/KinectSpecialCases.cs" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/Assets/Scripts/PdConnection/CylMidiTransitionController.cs" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/Assets/Scenes/Examples/Waterfall/waterfall.unity" root0="FORCE_HIGHLIGHTING" /> <setting file="file://$PROJECT_DIR$/Assets/Scenes/Examples/Waterfall/waterfall.unity" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/Assets/Scripts/Versioning/VersionToggleBehaviour.cs" root0="FORCE_HIGHLIGHTING" /> <setting file="file://$PROJECT_DIR$/Assets/Scripts/Versioning/VersionToggleBehaviour.cs" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/Assets/Editor/StateManagerEditor.cs" root0="FORCE_HIGHLIGHTING" /> <setting file="file://$PROJECT_DIR$/Assets/Editor/StateManagerEditor.cs" root0="FORCE_HIGHLIGHTING" />
@ -98,6 +80,7 @@
<setting file="file://$PROJECT_DIR$/Assets/Scripts/PdConnection/PdLevelBind.cs" root0="FORCE_HIGHLIGHTING" /> <setting file="file://$PROJECT_DIR$/Assets/Scripts/PdConnection/PdLevelBind.cs" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/Assets/Scripts/PdConnection/PdNoiseBind.cs" root0="FORCE_HIGHLIGHTING" /> <setting file="file://$PROJECT_DIR$/Assets/Scripts/PdConnection/PdNoiseBind.cs" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/Assets/Scripts/PdConnection/Waveform.cs" root0="FORCE_HIGHLIGHTING" /> <setting file="file://$PROJECT_DIR$/Assets/Scripts/PdConnection/Waveform.cs" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/Assets/Scripts/PdConnection/DspController.cs" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/Assets/Scripts/PdConnection/ISpectrumGenerator.cs" root0="SKIP_HIGHLIGHTING" /> <setting file="file://$PROJECT_DIR$/Assets/Scripts/PdConnection/ISpectrumGenerator.cs" root0="SKIP_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/Assets/Scripts/PdConnection/PdArray.cs" root0="FORCE_HIGHLIGHTING" /> <setting file="file://$PROJECT_DIR$/Assets/Scripts/PdConnection/PdArray.cs" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/Assets/Scripts/PdConnection/PdSpectrumBind.cs" root0="FORCE_HIGHLIGHTING" /> <setting file="file://$PROJECT_DIR$/Assets/Scripts/PdConnection/PdSpectrumBind.cs" root0="FORCE_HIGHLIGHTING" />
@ -124,6 +107,7 @@
<setting file="file://$PROJECT_DIR$/Assets/Editor/UnitTest/UnitTest_RectangularSelection.cs" root0="FORCE_HIGHLIGHTING" /> <setting file="file://$PROJECT_DIR$/Assets/Editor/UnitTest/UnitTest_RectangularSelection.cs" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/Assets/Editor/UnitTest/UnitTest_ChangeObserver.cs" root0="FORCE_HIGHLIGHTING" /> <setting file="file://$PROJECT_DIR$/Assets/Editor/UnitTest/UnitTest_ChangeObserver.cs" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/Assets/Editor/UnitTest/UnitTest_RectangularSelection.cs.meta" root0="FORCE_HIGHLIGHTING" /> <setting file="file://$PROJECT_DIR$/Assets/Editor/UnitTest/UnitTest_RectangularSelection.cs.meta" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/Assets/Scripts/PdConnection/ScheduledAction.cs" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/Assets/Scripts/PdConnection/PdPitchBind.cs" root0="FORCE_HIGHLIGHTING" /> <setting file="file://$PROJECT_DIR$/Assets/Scripts/PdConnection/PdPitchBind.cs" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/Assets/Scenes/Examples/Qlist/scripts/QlistMarker.cs" root0="FORCE_HIGHLIGHTING" /> <setting file="file://$PROJECT_DIR$/Assets/Scenes/Examples/Qlist/scripts/QlistMarker.cs" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/Assets/ThridParty/Windows/Kinect/InfraredFrameReader.cs" root0="FORCE_HIGHLIGHTING" /> <setting file="file://$PROJECT_DIR$/Assets/ThridParty/Windows/Kinect/InfraredFrameReader.cs" root0="FORCE_HIGHLIGHTING" />
@ -136,9 +120,6 @@
<component name="IdeDocumentHistory"> <component name="IdeDocumentHistory">
<option name="CHANGED_PATHS"> <option name="CHANGED_PATHS">
<list> <list>
<option value="$PROJECT_DIR$/Assets/Editor/RectangularSelection.cs" />
<option value="$PROJECT_DIR$/Assets/Scripts/PdConnection/PdConstant.cs" />
<option value="$PROJECT_DIR$/Assets/Scripts/PdConnection/PdProcess.cs" />
<option value="$PROJECT_DIR$/Assets/Editor/UnitTest/UnitTest_SpectrumGeneratpr.cs" /> <option value="$PROJECT_DIR$/Assets/Editor/UnitTest/UnitTest_SpectrumGeneratpr.cs" />
<option value="$PROJECT_DIR$/Assets/Scenes/Examples/PdBackendDemo/script/BoomBall.cs" /> <option value="$PROJECT_DIR$/Assets/Scenes/Examples/PdBackendDemo/script/BoomBall.cs" />
<option value="$PROJECT_DIR$/Assets/Editor/UnitTest/UnitTest_SpectrumGenerator.cs" /> <option value="$PROJECT_DIR$/Assets/Editor/UnitTest/UnitTest_SpectrumGenerator.cs" />
@ -187,6 +168,9 @@
<option value="$PROJECT_DIR$/Assets/Scenes/Examples/Qlist/scripts/QlistMarker.cs" /> <option value="$PROJECT_DIR$/Assets/Scenes/Examples/Qlist/scripts/QlistMarker.cs" />
<option value="$PROJECT_DIR$/Assets/Scenes/Examples/Qlist/scripts/SceneManager.cs" /> <option value="$PROJECT_DIR$/Assets/Scenes/Examples/Qlist/scripts/SceneManager.cs" />
<option value="$PROJECT_DIR$/Assets/Scenes/Examples/Qlist/scripts/TimelineController.cs" /> <option value="$PROJECT_DIR$/Assets/Scenes/Examples/Qlist/scripts/TimelineController.cs" />
<option value="$PROJECT_DIR$/Assets/Scripts/PdConnection/ReservedAction.cs" />
<option value="$PROJECT_DIR$/Assets/Scripts/PdConnection/ScheduledAction.cs" />
<option value="$PROJECT_DIR$/Assets/Scripts/PdConnection/CylMidiTransitionController.cs" />
</list> </list>
</option> </option>
</component> </component>
@ -270,6 +254,7 @@
<workItem from="1573318954202" duration="631000" /> <workItem from="1573318954202" duration="631000" />
<workItem from="1575064364367" duration="3340000" /> <workItem from="1575064364367" duration="3340000" />
<workItem from="1575100878147" duration="6707000" /> <workItem from="1575100878147" duration="6707000" />
<workItem from="1575663620399" duration="4809000" />
</task> </task>
<task id="LOCAL-00001" summary="add Kinect Manager"> <task id="LOCAL-00001" summary="add Kinect Manager">
<created>1562485186899</created> <created>1562485186899</created>
@ -373,6 +358,16 @@
</component> </component>
<component name="UnityProjectConfiguration" hasMinimizedUI="true" /> <component name="UnityProjectConfiguration" hasMinimizedUI="true" />
<component name="UnityUnitTestConfiguration" currentTestLauncher="EditMode" /> <component name="UnityUnitTestConfiguration" currentTestLauncher="EditMode" />
<component name="Vcs.Log.History.Properties">
<option name="COLUMN_ORDER">
<list>
<option value="0" />
<option value="2" />
<option value="3" />
<option value="1" />
</list>
</option>
</component>
<component name="Vcs.Log.Tabs.Properties"> <component name="Vcs.Log.Tabs.Properties">
<option name="TAB_STATES"> <option name="TAB_STATES">
<map> <map>

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

View file

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

View file

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

View file

@ -1,6 +1,6 @@
 
Microsoft Visual Studio Solution File, Format Version 12.00 Microsoft Visual Studio Solution File, Format Version 11.00
# Visual Studio 15 # Visual Studio 2010
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assembly-CSharp", "Assembly-CSharp.csproj", "{5B580621-09B4-68CB-B5F4-5B9DD210A60F}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assembly-CSharp", "Assembly-CSharp.csproj", "{5B580621-09B4-68CB-B5F4-5B9DD210A60F}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assembly-CSharp-Editor", "Assembly-CSharp-Editor.csproj", "{3CC9D2C0-C461-07D9-EDF3-4FFB4DE5C299}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assembly-CSharp-Editor", "Assembly-CSharp-Editor.csproj", "{3CC9D2C0-C461-07D9-EDF3-4FFB4DE5C299}"