Merge branch 'skelton'

# Conflicts:
#	UnityProject/.idea/.idea.UnityProject/.idea/contentModel.xml
#	UnityProject/.idea/.idea.UnityProject/.idea/workspace.xml
#	UnityProject/Assets/Scenes/Examples/KinectSkeleton/joint.prefab.meta
#	UnityProject/Assets/Scripts/VideoInput/Editor.meta
#	UnityProject/Assets/ThridParty/Assets/Construction_Site_Column/Materials.meta
This commit is contained in:
Chikashi Miyama 2019-10-31 21:10:29 +01:00
commit a49e32d713
23 changed files with 471 additions and 311 deletions

View file

@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ContentModelStore">
<e p="C:\Users\Cylvester\.Rider2019.2\system\extResources" t="IncludeRecursive" />
<e p="C:\Users\Cylvester\.Rider2019.2\system\resharper-host\local\Transient\ReSharperHost\v192\SolutionCaches\_UnityProject.442702191.00" t="ExcludeRecursive" />
<e p="D:\SoundVision_Repo\Soundvision\UnityProject" t="IncludeRecursive">
<e p="C:\Users\chikashi\.Rider2019.2\system\extResources" t="IncludeRecursive" />
<e p="C:\Users\chikashi\.Rider2019.2\system\resharper-host\local\Transient\ReSharperHost\v192\SolutionCaches\_UnityProject.1346624737.00" t="ExcludeRecursive" />
<e p="C:\Users\chikashi\Development\Soundvision\UnityProject" t="IncludeRecursive">
<e p="Assembly-CSharp-Editor.csproj" t="IncludeRecursive" />
<e p="Assembly-CSharp.csproj" t="IncludeRecursive" />
<e p="Assets" t="Include">
@ -35,9 +35,9 @@
<e p="RMSAnalyzer.cs" t="Include" />
</e>
</e>
<e p="KinectSkelton" t="Include">
<e p="KinectSkeleton" t="Include">
<e p="script" t="Include">
<e p="Skelton.cs" t="Include" />
<e p="Skeleton.cs" t="Include" />
</e>
</e>
<e p="LevelThreshold" t="Include">
@ -51,7 +51,6 @@
<e p="CubeSync.cs" t="Include" />
<e p="MidiSyncCounter.cs" t="Include" />
<e p="Mover.cs" t="Include" />
<e p="OrangeCubeScript.cs" t="Include" />
<e p="PositionBind.cs" t="Include" />
<e p="RandomPosition.cs" t="Include" />
</e>
@ -125,10 +124,7 @@
<e p="VersionToggleBehaviour.cs" t="Include" />
</e>
<e p="VideoInput" t="Include">
<e p="InfraredCamera.cs" t="Include" />
<e p="KinectFacade.cs" t="Include" />
<e p="KinectManagerBehaviour.cs" t="Include" />
<e p="SkeletonTracker.cs" t="Include" />
</e>
<e p="Visualizer" t="Include">
<e p="CombMesh.cs" t="Include" />

View file

@ -2,7 +2,34 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="c6a8ca49-0b91-43c0-a787-44b1fda29c5f" name="Default Changelist" comment="implement FFT waterfall">
<change beforePath="$PROJECT_DIR$/Assets/Scenes/Examples/MIDI/script/OrangeCubeScript.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scenes/Examples/MIDI/script/OrangeCubeScript.cs" afterDir="false" />
<change afterPath="$PROJECT_DIR$/Assets/Scenes/Examples/KinectSkeleton.meta" afterDir="false" />
<change afterPath="$PROJECT_DIR$/Assets/Scenes/Examples/KinectSkeleton/Skeleton.unity" afterDir="false" />
<change afterPath="$PROJECT_DIR$/Assets/Scenes/Examples/KinectSkeleton/Skeleton.unity.meta" afterDir="false" />
<change afterPath="$PROJECT_DIR$/Assets/Scenes/Examples/KinectSkeleton/joint.prefab" afterDir="false" />
<change afterPath="$PROJECT_DIR$/Assets/Scenes/Examples/KinectSkeleton/joint.prefab.meta" afterDir="false" />
<change afterPath="$PROJECT_DIR$/Assets/Scenes/Examples/KinectSkeleton/script.meta" afterDir="false" />
<change afterPath="$PROJECT_DIR$/Assets/Scenes/Examples/KinectSkeleton/script/Skeleton.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/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/.idea.UnityProject/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assembly-CSharp.csproj" beforeDir="false" afterPath="$PROJECT_DIR$/Assembly-CSharp.csproj" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Materials/IRPanel.mat" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Materials/IRPanel.mat" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Prefabs/KinectVisualization.prefab" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Prefabs/KinectVisualization.prefab" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Scenes/Examples/KinectSceneGraph/Shader Graphs_Max Kinect Effect.mat" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scenes/Examples/KinectSceneGraph/Shader Graphs_Max Kinect Effect.mat" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Scenes/Examples/KinectSkelton.meta" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Scenes/Examples/KinectSkelton/Skeleton.unity" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Scenes/Examples/KinectSkelton/Skeleton.unity.meta" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Scenes/Examples/KinectSkelton/script.meta" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Scenes/Examples/KinectSkelton/script/Skelton.cs" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Scenes/Examples/KinectSkelton/script/Skelton.cs.meta" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Scripts/VideoInput/Editor.meta" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Scripts/VideoInput/InfraredCamera.cs" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Scripts/VideoInput/InfraredCamera.cs.meta" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Scripts/VideoInput/KinectFacade.cs" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Scripts/VideoInput/KinectFacade.cs.meta" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scenes/Examples/KinectSkeleton/script/Skeleton.cs.meta" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Scripts/VideoInput/KinectManagerBehaviour.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/VideoInput/KinectManagerBehaviour.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Scripts/VideoInput/SkeletonTracker.cs" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Scripts/VideoInput/SkeletonTracker.cs.meta" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Scripts/Visualizer/CombMesh.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/Visualizer/CombMesh.cs" afterDir="false" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="SHOW_DIALOG" value="false" />
@ -34,74 +61,89 @@
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$/.." />
</component>
<component name="HighlightingSettingsPerFile">
<setting file="file://$PROJECT_DIR$/Assets/Scripts/PdConnection/PdProcess.cs" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/Assets/Scripts/PdConnection/MidiParser.cs" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/Assets/Prefabs/Specttrum.prefab" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/Assets/Editor/SequencerEditor.cs" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/Assets/Scenes/Examples/MIDI/script/PositionBind.cs" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/Assets/ThridParty/KinectScript/EventPump.cs" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/Assets/Scripts/PdConnection/PdTimbreIdBind.cs" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/Assets/Scenes/Examples/PdBackend/PdBackendDemo.unity" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/Assets/ThridParty/Editor/KinectCopyPluginDataHelper.cs" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/Assets/ThridParty/KinectScript/KinectBuffer.cs" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/Assets/Scenes/Examples/PdBackend/script/BoomBall.cs" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/Assets/Scenes/Examples/MIDI/script/RandomPosition.cs" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/Assets/ThridParty/KinectScript/KinectSpecialCases.cs" 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/VideoInput/KinectManagerBehaviour.cs" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/Assets/Editor/StateManagerEditor.cs" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$APPLICATION_CONFIG_DIR$/resharper-host/DecompilerCache/decompiler/4CD14385-55E6-4C0E-AEDA-2393D3C9CF4A/8f/e51c37c5/UnityEvent.cs" root0="SKIP_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/Assets/Scripts/Math/Smoother.cs" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/Assets/Scenes/Examples/MIDI/script/Mover.cs" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/ProjectSettings/QualitySettings.asset" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/Assets/ThridParty/KinectView/Scripts/BodySourceManager.cs" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$APPLICATION_CONFIG_DIR$/resharper-host/DecompilerCache/decompiler/EF28F193-EAB6-4E49-B44B-3FB27EAB4F75/09/cd62623e/Array.cs" root0="SKIP_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/Assets/ThridParty/KinectView/Scripts/BodySourceView.cs" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/Assets/Scripts/Visualizer/WaterfallVisualizer.cs.meta" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/Assets/ThridParty/Windows/Kinect/BodyFrameSource.cs" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/Assets/Scripts/Visualizer/SpectrumVisualizer.cs" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/Assets/Scripts/Visualizer/CombMesh.cs" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/Assets/Scripts/Visualizer/CombMesh.cs.meta" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/Assets/ThridParty/Windows/Kinect/BodyFrameReader.cs" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/Assets/Scripts/Visualizer/WaveformVisualizerBehaviour.cs" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/Assets/Scripts/Visualizer/IRPanelBehaviour.cs" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/Assets/Scripts/PdConnection/MidiSyncedLoop.cs" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/Assets/ThridParty/KinectView/Scripts/DisableOnStart.cs" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/Assets/Scripts/Visualizer/WaterfallVisualizer.cs" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/Assets/ThridParty/KinectView/Scripts/InfraredSourceManager.cs" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/Assets/Scenes/Examples/KinectSkeleton/script/Skeleton.cs" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/Assets/Scripts/PdConnection/PdArraySelector.cs" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/Assets/Scenes/Examples/TimbreID/script/IdToText.cs" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/Assets/Scripts/PdConnection/PdBackend.cs" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/Assets/Scripts/PdConnection/PdSender.cs" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/Assets/Scripts/PdConnection/MidiParser.cs" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/Assets/ThridParty/Windows/Kinect/TrackingState.cs" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/Assets/Scripts/PdConnection/Spectrogram.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/ISpectrumGenerator.cs" root0="SKIP_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/Assets/Scripts/PdConnection/PdArray.cs" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$APPLICATION_CONFIG_DIR$/resharper-host/DecompilerCache/decompiler/941CEA63-F4BD-416D-BDF8-16377660D449/37/bbbbd7e4/SerializedProperty.cs" root0="SKIP_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/Assets/Scripts/PdConnection/PdSpectrumBind.cs" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/Assets/Scripts/PdConnection/SpectrumGeneratorPlayMode.cs" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/Assets/Scenes/Examples/MIDI/script/OrangeCubeScript.cs" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/Assets/Scripts/PdConnection/PdBackend.cs" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$APPLICATION_CONFIG_DIR$/resharper-host/DecompilerCache/decompiler/941CEA63-F4BD-416D-BDF8-16377660D449/b3/a8d7d743/EditorGUILayout.cs" root0="SKIP_HIGHLIGHTING" />
<setting file="file://$APPLICATION_CONFIG_DIR$/resharper-host/DecompilerCache/decompiler/4CD14385-55E6-4C0E-AEDA-2393D3C9CF4A/12/9ecf7704/UnityEvent`1.cs" root0="SKIP_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/Assets/Scripts/StateManagement/StateManager.cs" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/Assets/ThridParty/Windows/Data/PropertyChangedEventArgs.cs" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/Assets/Scripts/PdConnection/PdConstant.cs" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/Assets/Scripts/TemplateLibrary/ChangeObserver.cs" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/Assets/Scenes/Examples/MIDI/script/PositionBind.cs" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/Assets/Scenes/Examples/TimbreID/script/IdToText.cs" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/Assets/Scenes/Examples/VisualEffectGraph/VisualEffectGraph.unity" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/Assets/ThridParty/Windows/Kinect/InfraredFrameReader.cs" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/Assets/Scenes/Examples/VisualEffectGraph/script/SmokeBind.cs" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/Assets/ThridParty/Editor/KinectCopyPluginDataHelper.cs" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/Assets/Scenes/Examples/VisualEffectGraph/script/FlareBind.cs" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/ProjectSettings/QualitySettings.asset" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/Assets/ThridParty/Windows/Kinect/InfraredFrame.cs" root0="FORCE_HIGHLIGHTING" />
<setting file="file://D:/Unity Installs/2019.2.8f1/Editor/Data/Resources/PackageManager/BuiltInPackages/com.unity.ugui/Runtime/EventSystem/EventSystem.cs" root0="SKIP_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/Assets/Scenes/Examples/MIDI/script/CubeSync.cs" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/Assets/Editor/AppBuilder.cs" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/Assets/Prefabs/Specttrum.prefab" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/Assets/Editor/LevelMeter.cs" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/Assets/Scripts/PdConnection/PdProcess.cs" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/Assets/Editor/RectangularSelection.cs" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/Assets/Scenes/Examples/MIDI/script/RandomPosition.cs" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/Assets/Scripts/PdConnection/MidiLogger.cs" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/Assets/Scripts/PdConnection/SpectrumGeneratorPlayMode.cs" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/Assets/Scripts/TemplateLibrary/ChangeObserver.cs" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/Assets/ThridParty/Windows/Kinect/KinectSensor.cs" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/Assets/Editor/PdBackendEditor.cs" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/Assets/Scenes/Examples/VisualEffectGraph/VisualEffectGraph.unity" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/Assets/Editor/AppBuilder.cs" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/Assets/Editor/SpectrumGeneratorEditMode.cs" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/Assets/Editor/LevelMeter.cs" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/Assets/Editor/PdSpectrumBindEditor.cs" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/Assets/Scenes/Examples/VisualEffectGraph/script/SmokeBind.cs" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/Assets/Editor/CreatePlane.cs.cs" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/Assets/Scenes/Examples/VisualEffectGraph/script/FlareBind.cs" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/Assets/Editor/UnitTest/UnitTest_SpectrumGeneratorEditMode.cs" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/Assets/ThridParty/KinectView/Scripts/BodySourceView.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_RectangularSelection.cs.meta" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/Assets/ThridParty/KinectView/Scripts/InfraredSourceManager.cs" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/Assets/Scripts/PdConnection/PdPitchBind.cs" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/Assets/Editor/UnitTest/UnitTest_SpectrumGeneratorPlayMode.cs" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/Assets/Scripts/VideoInput/KinectManagerBehaviour.cs" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/Assets/Scripts/VideoInput/InfraredCamera.cs" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/Assets/ThridParty/KinectView/Scripts/DisableOnStart.cs" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/Assets/ThridParty/Windows/Kinect/KinectSensor.cs" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/Assets/Scripts/Visualizer/WaterfallVisualizer.cs.meta" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/Assets/Scripts/Visualizer/SpectrumVisualizer.cs" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/Assets/Scripts/PdConnection/PdArraySelector.cs" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/Assets/Scripts/PdConnection/MidiLogger.cs" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/Assets/Scripts/Visualizer/CombMesh.cs" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/Assets/ThridParty/KinectScript/KinectBuffer.cs" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/Assets/Scripts/Visualizer/CombMesh.cs.meta" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/Assets/Scripts/Visualizer/IRPanelBehaviour.cs" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/Assets/Scripts/Visualizer/WaterfallVisualizer.cs" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/Assets/Scenes/Examples/Waterfall/waterfall.unity" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/Assets/ThridParty/Windows/Kinect/InfraredFrameReader.cs" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/Assets/Scripts/PdConnection/MidiSequencer.cs" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/Assets/ThridParty/Windows/Kinect/InfraredFrame.cs" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/Assets/Scenes/Examples/PdBackend/script/MoveBall.cs" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/Assets/Scenes/Examples/MIDI/script/CubeSync.cs" root0="FORCE_HIGHLIGHTING" />
</component>
<component name="IdeDocumentHistory">
<option name="CHANGED_PATHS">
<list>
<option value="$PROJECT_DIR$/Assets/Editor/EditorToggle.cs" />
<option value="$PROJECT_DIR$/Assets/PdBackend/PdBackend.cs" />
<option value="$PROJECT_DIR$/Assets/Scripts/DataModel/ToogleResponder.cs" />
<option value="$PROJECT_DIR$/Assets/Scripts/DataModel/ParameterResponder.cs" />
<option value="$PROJECT_DIR$/Assets/Scripts/DataModel/Parameter.cs" />
<option value="$PROJECT_DIR$/Assets/Editor/UnitTest/UnitTest_ParameterResponder.cs" />
<option value="$PROJECT_DIR$/Assets/Scripts/Visualizer/WaveformVisualizerBehaviour.cs" />
<option value="$PROJECT_DIR$/Assets/Scripts/PdConnection/PdArray.cs" />
<option value="$PROJECT_DIR$/Assets/Editor/PdBindEditor.cs" />
<option value="$PROJECT_DIR$/Assets/Scripts/PdConnection/PdBind.cs" />
<option value="$PROJECT_DIR$/Assets/Editor/PdConsole.cs" />
<option value="$PROJECT_DIR$/Assets/Editor/TogglePresenter.cs" />
<option value="$PROJECT_DIR$/Assets/Scripts/PdConnection/UdpSender.cs" />
<option value="$PROJECT_DIR$/Assets/Scripts/PdConnection/FFTArrays.cs" />
<option value="$PROJECT_DIR$/Assets/Editor/LevelMeter.cs" />
@ -109,7 +151,6 @@
<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/PdBackendEditor.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/Editor/UnitTest/UnitTest_SpectrumGenerator.cs" />
@ -119,7 +160,6 @@
<option value="$PROJECT_DIR$/Assets/Scripts/PdConnection/PdSpectrumBind.cs" />
<option value="$PROJECT_DIR$/Assets/Scripts/PdConnection/PdBackend.cs" />
<option value="$PROJECT_DIR$/Assets/Scripts/PdConnection/SpectrumGeneratorPlayMode.cs" />
<option value="$PROJECT_DIR$/Assets/Editor/PdSpectrumBindEditor.cs" />
<option value="$PROJECT_DIR$/Assets/Scripts/Visualizer/Visualizer.cs" />
<option value="$PROJECT_DIR$/Assets/Scripts/MathUtility.cs" />
<option value="$PROJECT_DIR$/Assets/Scripts/Visualizer/FFTRippleBehaviour.cs" />
@ -134,13 +174,27 @@
<option value="$PROJECT_DIR$/Assets/Scripts/Visualizer/RingArrayBuffer.cs" />
<option value="$PROJECT_DIR$/Assets/Scripts/Visualizer/SpectrumVisualizer.cs" />
<option value="$PROJECT_DIR$/Assets/Scripts/Visualizer/WaterfallVisualizer.cs" />
<option value="$PROJECT_DIR$/Assets/Scripts/Visualizer/CombMesh.cs" />
<option value="$PROJECT_DIR$/Assets/createplane.cs" />
<option value="$PROJECT_DIR$/Assets/Scenes/Examples/KinectSceneGraph/CreatePlane.cs.cs" />
<option value="$PROJECT_DIR$/Assets/Scripts/PdConnection/ISpectrumGenerator.cs" />
<option value="$PROJECT_DIR$/Assets/Scripts/PdConnection/PdArraySelector.cs" />
<option value="$PROJECT_DIR$/Assets/Scripts/CreatePlane.cs.cs" />
<option value="$PROJECT_DIR$/Assets/Scenes/Examples/MIDI/script/OrangeCubeScript.cs" />
<option value="$PROJECT_DIR$/Assets/Editor/PdBackendEditor.cs" />
<option value="$PROJECT_DIR$/Assets/Editor/PdSpectrumBindEditor.cs" />
<option value="$PROJECT_DIR$/Assets/Editor/SequencerEditor.cs" />
<option value="$PROJECT_DIR$/Assets/Editor/StateManagerEditor.cs" />
<option value="$PROJECT_DIR$/Assets/Scripts/VideoInput/InfraredCamera.cs" />
<option value="$PROJECT_DIR$/Assets/Scripts/VideoInput/ComponentFactory.cs" />
<option value="$PROJECT_DIR$/Assets/Scripts/VideoInput/Editor/UnitTest/KinectSensorTestCase.cs" />
<option value="$PROJECT_DIR$/Assets/Scripts/VideoInput/Editor/UnitTest/ComponentFactoryTestCase.cs" />
<option value="$PROJECT_DIR$/Assets/Scripts/VideoInput/KinectSensor.cs" />
<option value="$PROJECT_DIR$/Assets/Scripts/Visualizer/IRPanelBehaviour.cs" />
<option value="$PROJECT_DIR$/Assets/Scripts/TemplateLibrary/ChangeObserver.cs" />
<option value="$PROJECT_DIR$/Assets/Scripts/Visualizer/CombMesh.cs" />
<option value="$PROJECT_DIR$/Assets/Scenes/Examples/KinectSkelton/script/Skelton.cs" />
<option value="$PROJECT_DIR$/Assets/Scenes/Examples/KinectSkelton/script/Skeleton.cs" />
<option value="$PROJECT_DIR$/Assets/Scripts/VideoInput/KinectManagerBehaviour.cs" />
<option value="$PROJECT_DIR$/Assets/Scenes/Examples/KinectSkeleton/script/Skeleton.cs" />
</list>
</option>
</component>
@ -219,6 +273,7 @@
<workItem from="1571216505468" duration="820000" />
<workItem from="1572195974043" duration="667000" />
<workItem from="1572298619890" duration="330000" />
<workItem from="1572535803542" duration="2972000" />
</task>
<task id="LOCAL-00001" summary="add Kinect Manager">
<created>1562485186899</created>
@ -358,8 +413,26 @@
<properties exception="System.Threading.ThreadAbortException" displayValue="System.Threading.ThreadAbortException" />
<option name="timeStamp" value="1" />
</breakpoint>
<line-breakpoint enabled="true" type="DotNet Breakpoints">
<url>file://$PROJECT_DIR$/Assets/Scenes/Examples/KinectSkelton/script/Skeleton.cs</url>
<line>10</line>
<properties documentPath="$PROJECT_DIR$/Assets/Scenes/Examples/KinectSkelton/script/Skeleton.cs" initialLine="10">
<startOffsets>
<option value="232" />
</startOffsets>
<endOffsets>
<option value="255" />
</endOffsets>
</properties>
<option name="timeStamp" value="13" />
</line-breakpoint>
</breakpoints>
</breakpoint-manager>
<reveal-manager>
<revealed-members>
<RevealItemInfo typeName="Windows.Kinect.InfraredFrameArrivedEventArgs" fieldName="nativePtr" />
</revealed-members>
</reveal-manager>
<watches-manager>
<configuration name="UNITY_DEBUG_RUN_CONFIGURATION">
<watch expression="array[190000..199999]" />

View file

@ -58,7 +58,7 @@
<ItemGroup>
<Compile Include="Assets\Scenes\Examples\Composition\script\BallMapping.cs" />
<Compile Include="Assets\Scenes\Examples\Composition\script\RmsAnalyzer.cs" />
<Compile Include="Assets\Scenes\Examples\KinectSkelton\script\Skelton.cs" />
<Compile Include="Assets\Scenes\Examples\KinectSkeleton\script\Skeleton.cs" />
<Compile Include="Assets\Scenes\Examples\LevelThreshold\script\ConstructionColumnBehaviour.cs" />
<Compile Include="Assets\Scenes\Examples\LevelThreshold\script\Spawner.cs" />
<Compile Include="Assets\Scenes\Examples\MIDI\script\CubeSync.cs" />
@ -101,10 +101,7 @@
<Compile Include="Assets\Scripts\StateManagement\StateManager.cs" />
<Compile Include="Assets\Scripts\TemplateLibrary\ChangeObserver.cs" />
<Compile Include="Assets\Scripts\Versioning\VersionToggleBehaviour.cs" />
<Compile Include="Assets\Scripts\VideoInput\InfraredCamera.cs" />
<Compile Include="Assets\Scripts\VideoInput\KinectFacade.cs" />
<Compile Include="Assets\Scripts\VideoInput\KinectManagerBehaviour.cs" />
<Compile Include="Assets\Scripts\VideoInput\SkeletonTracker.cs" />
<Compile Include="Assets\Scripts\Visualizer\CombMesh.cs" />
<Compile Include="Assets\Scripts\Visualizer\IRPanelBehaviour.cs" />
<Compile Include="Assets\Scripts\Visualizer\SpectrumVisualizer.cs" />

View file

@ -8,7 +8,7 @@ Material:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: IRPanel
m_Shader: {fileID: -6465566751694194690, guid: 0710b26be2a23d24d8005549cc475ba2,
m_Shader: {fileID: -6465566751694194690, guid: ab1500b418a77404a9a159988c31409e,
type: 3}
m_ShaderKeywords: _NORMALMAP_TANGENT_SPACE
m_LightmapFlags: 4

View file

@ -1,5 +1,48 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &826238032
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 826238033}
- component: {fileID: 826238034}
m_Layer: 0
m_Name: Skeleton
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &826238033
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 826238032}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 4731626927875726468}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &826238034
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 826238032}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d2ea1c499e186a74e9ba944b44026403, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &4731626927875726491
GameObject:
m_ObjectHideFlags: 0
@ -29,7 +72,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 4731626929094548426}
- {fileID: 4731626929341064471}
- {fileID: 826238033}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -45,6 +88,36 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 5b54a31bc1a14c1abb51fe86c56c6227, type: 3}
m_Name:
m_EditorClassIdentifier:
infrared: 1
infraredFrameReceived:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 4731626929094548427}
m_MethodName: OnInfraredFrameReceived
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
skeleton: 1
skeletonDataReceived:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 826238034}
m_MethodName: OnSkeletonFrameReceived
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
--- !u!1 &4731626929094548425
GameObject:
m_ObjectHideFlags: 0
@ -136,99 +209,4 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: c0603bf64edb4c8885cefbc40ee206fe, type: 3}
m_Name:
m_EditorClassIdentifier:
kinectManagerBehaviour: {fileID: 5059429581819481323}
panel: {fileID: 4731626929094548425}
--- !u!1 &4731626929341064470
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 4731626929341064471}
- component: {fileID: 4731626929341064466}
- component: {fileID: 4731626929341064465}
- component: {fileID: 4731626929341064464}
m_Layer: 0
m_Name: PointCloud
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!4 &4731626929341064471
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4731626929341064470}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 4731626927875726468}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!23 &4731626929341064466
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4731626929341064470}
m_Enabled: 1
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: 3f6444796bbb89e45a6a51b5bb0037f6, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
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!33 &4731626929341064465
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4731626929341064470}
m_Mesh: {fileID: 0}
--- !u!114 &4731626929341064464
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4731626929341064470}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: ffecec984845420991cec1a5fcf11959, type: 3}
m_Name:
m_EditorClassIdentifier:
zScale: 1
kinectManagerBehaviour: {fileID: 5059429581819481323}
meshFilter: {fileID: 4731626929341064465}

View file

@ -8,7 +8,7 @@ Material:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Shader Graphs_Max Kinect Effect
m_Shader: {fileID: -6465566751694194690, guid: 0710b26be2a23d24d8005549cc475ba2,
m_Shader: {fileID: -6465566751694194690, guid: ab1500b418a77404a9a159988c31409e,
type: 3}
m_ShaderKeywords:
m_LightmapFlags: 4

View file

@ -187,46 +187,21 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5059429581819481323, guid: 2cf41770dc7914b46aa31a442508dd25,
- target: {fileID: 4731626929094548426, guid: 2cf41770dc7914b46aa31a442508dd25,
type: 3}
propertyPath: infraredFrameReceived.m_PersistentCalls.m_Calls.Array.size
value: 1
propertyPath: m_LocalPosition.x
value: -5
objectReference: {fileID: 0}
- target: {fileID: 5059429581819481323, guid: 2cf41770dc7914b46aa31a442508dd25,
- target: {fileID: 4731626929094548426, guid: 2cf41770dc7914b46aa31a442508dd25,
type: 3}
propertyPath: infrared
value: 1
propertyPath: m_LocalPosition.z
value: 2.36
objectReference: {fileID: 0}
- target: {fileID: 5059429581819481323, guid: 2cf41770dc7914b46aa31a442508dd25,
type: 3}
propertyPath: skeleton
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5059429581819481323, guid: 2cf41770dc7914b46aa31a442508dd25,
type: 3}
propertyPath: infraredFrameReceived.m_PersistentCalls.m_Calls.Array.data[0].m_Mode
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5059429581819481323, guid: 2cf41770dc7914b46aa31a442508dd25,
type: 3}
propertyPath: infraredFrameReceived.m_PersistentCalls.m_Calls.Array.data[0].m_CallState
value: 2
objectReference: {fileID: 0}
- target: {fileID: 5059429581819481323, guid: 2cf41770dc7914b46aa31a442508dd25,
type: 3}
propertyPath: infraredFrameReceived.m_PersistentCalls.m_Calls.Array.data[0].m_Target
- target: {fileID: 826238034, guid: 2cf41770dc7914b46aa31a442508dd25, type: 3}
propertyPath: spherePrefab
value:
objectReference: {fileID: 2080636163}
- target: {fileID: 5059429581819481323, guid: 2cf41770dc7914b46aa31a442508dd25,
objectReference: {fileID: 7867200591126897977, guid: aa3a931c281348c4a91db2ad6fd4c7d6,
type: 3}
propertyPath: infraredFrameReceived.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
value: OnInfraredFrameReceived
objectReference: {fileID: 0}
- target: {fileID: 5059429581819481323, guid: 2cf41770dc7914b46aa31a442508dd25,
type: 3}
propertyPath: infraredFrameReceived.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName
value: UnityEngine.Object, UnityEngine
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 2cf41770dc7914b46aa31a442508dd25, type: 3}
--- !u!1 &1931119204
@ -240,6 +215,7 @@ GameObject:
- component: {fileID: 1931119207}
- component: {fileID: 1931119206}
- component: {fileID: 1931119205}
- component: {fileID: 1931119208}
m_Layer: 0
m_Name: Main Camera
m_TagString: MainCamera
@ -291,8 +267,8 @@ Camera:
m_TargetTexture: {fileID: 0}
m_TargetDisplay: 0
m_TargetEye: 3
m_HDR: 1
m_AllowMSAA: 1
m_HDR: 0
m_AllowMSAA: 0
m_AllowDynamicResolution: 0
m_ForceIntoRT: 0
m_OcclusionCulling: 1
@ -312,6 +288,105 @@ Transform:
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1931119208
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1931119204}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 23c1ce4fb46143f46bc5cb5224c934f6, type: 3}
m_Name:
m_EditorClassIdentifier:
clearColorMode: 0
backgroundColorHDR: {r: 0.025, g: 0.07, b: 0.19, a: 0}
clearDepth: 1
volumeLayerMask:
serializedVersion: 2
m_Bits: 1
volumeAnchorOverride: {fileID: 0}
antialiasing: 0
SMAAQuality: 2
dithering: 0
stopNaNs: 0
physicalParameters:
m_Iso: 200
m_ShutterSpeed: 0.005
m_Aperture: 16
m_BladeCount: 5
m_Curvature: {x: 2, y: 11}
m_BarrelClipping: 0.25
m_Anamorphism: 0
flipYMode: 0
fullscreenPassthrough: 0
allowDynamicResolution: 0
customRenderingSettings: 0
invertFaceCulling: 0
probeLayerMask:
serializedVersion: 2
m_Bits: 4294967295
m_RenderingPathCustomFrameSettings:
bitDatas:
data1: 69284264935197
data2: 4539628424389459968
lodBias: 1
lodBiasMode: 0
maximumLODLevel: 0
maximumLODLevelMode: 0
renderingPathCustomFrameSettingsOverrideMask:
mask:
data1: 0
data2: 0
defaultFrameSettings: 0
m_Version: 5
m_ObsoleteRenderingPath: 0
m_ObsoleteFrameSettings:
overrides: 0
enableShadow: 0
enableContactShadows: 0
enableShadowMask: 0
enableSSR: 0
enableSSAO: 0
enableSubsurfaceScattering: 0
enableTransmission: 0
enableAtmosphericScattering: 0
enableVolumetrics: 0
enableReprojectionForVolumetrics: 0
enableLightLayers: 0
enableExposureControl: 1
diffuseGlobalDimmer: 0
specularGlobalDimmer: 0
shaderLitMode: 0
enableDepthPrepassWithDeferredRendering: 0
enableTransparentPrepass: 0
enableMotionVectors: 0
enableObjectMotionVectors: 0
enableDecals: 0
enableRoughRefraction: 0
enableTransparentPostpass: 0
enableDistortion: 0
enablePostprocess: 0
enableOpaqueObjects: 0
enableTransparentObjects: 0
enableRealtimePlanarReflection: 0
enableMSAA: 0
enableAsyncCompute: 0
runLightListAsync: 0
runSSRAsync: 0
runSSAOAsync: 0
runContactShadowsAsync: 0
runVolumeVoxelizationAsync: 0
lightLoopSettings:
overrides: 0
enableDeferredTileAndCluster: 0
enableComputeLightEvaluation: 0
enableComputeLightVariants: 0
enableComputeMaterialVariants: 0
enableFptlForForwardOpaque: 0
enableBigTilePrepass: 0
isFptlEnabled: 0
--- !u!1 &2001908821
GameObject:
m_ObjectHideFlags: 0
@ -506,15 +581,3 @@ MonoBehaviour:
kernelSize: 5
lightAngle: 1
maxDepthBias: 0.001
--- !u!114 &2080636163 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 4731626929094548427, guid: 2cf41770dc7914b46aa31a442508dd25,
type: 3}
m_PrefabInstance: {fileID: 1384498139}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: c0603bf64edb4c8885cefbc40ee206fe, type: 3}
m_Name:
m_EditorClassIdentifier:

View file

@ -0,0 +1,80 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &7867200591126897977
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1366288549331334081}
- component: {fileID: 6482507337449139577}
- component: {fileID: 8976194142327021739}
m_Layer: 0
m_Name: joint
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1366288549331334081
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7867200591126897977}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -1.2028971, y: -0.6283364, z: 0.5670376}
m_LocalScale: {x: 0.5, y: 0.5, z: 0.5}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!33 &6482507337449139577
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7867200591126897977}
m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0}
--- !u!23 &8976194142327021739
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7867200591126897977}
m_Enabled: 1
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 10301, 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_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 1
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

View file

@ -1,7 +1,6 @@
fileFormatVersion: 2
guid: 9581872f89ab2c24c849f6ff4bfeea7d
folderAsset: yes
DefaultImporter:
guid: aa3a931c281348c4a91db2ad6fd4c7d6
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:

View file

@ -0,0 +1,46 @@
using System;
using System.Collections.Generic;
using System.Linq;
using Windows.Kinect;
using UnityEngine;
namespace cylvester
{
public class Skeleton : MonoBehaviour
{
[SerializeField] private GameObject spherePrefab;
private GameObject[] balls_;
private void Start()
{
balls_ = new GameObject[25];
for (var i = 0; i < 25; ++i)
{
balls_[i] = Instantiate(spherePrefab, gameObject.transform, true);
}
}
public void OnSkeletonFrameReceived(Body[] bodies)
{
foreach (var body in bodies)
{
if(!body.IsTracked)
continue;
var i = 0;
foreach(var pair in body.Joints)
{
var joint = pair.Value;
if(joint.TrackingState == TrackingState.NotTracked)
balls_[i].SetActive(false);
else
{
balls_[i].SetActive(true);
balls_[i].transform.position = new Vector3(joint.Position.X * 10f , joint.Position.Y * 10f, 0f);
}
i++;
}
}
}
}
}

View file

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 65a1be18ffcd5b44ea6787f744154d3b
guid: d2ea1c499e186a74e9ba944b44026403
MonoImporter:
externalObjects: {}
serializedVersion: 2

View file

@ -1,18 +0,0 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
public class Skelton : MonoBehaviour
{
// Start is called before the first frame update
void Start()
{
}
// Update is called once per frame
void Update()
{
}
}

View file

@ -1,11 +0,0 @@
fileFormatVersion: 2
guid: e5a7463b4de2d0e4caecea5317286d07
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View file

@ -1,10 +0,0 @@
using System;
using System.IO;
using UnityEngine;
using Windows.Kinect;
namespace cylvester
{
}

View file

@ -1,11 +0,0 @@
fileFormatVersion: 2
guid: 9189f3eb01f76664d9f7c970bbd36e02
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View file

@ -1,7 +0,0 @@
namespace UnityEditor
{
public class KinectFacade
{
}
}

View file

@ -1,5 +1,4 @@
using System;
using System.Collections.Generic;
using System.IO;
using Windows.Kinect;
using UnityEngine;
@ -8,7 +7,7 @@ using UnityEngine.Events;
namespace cylvester
{
[Serializable] public class UnityInfraredCameraEvent : UnityEvent<Texture2D>{ }
[Serializable] public class UnitySkeletonEvent : UnityEvent<IList<Body>>{ }
[Serializable] public class UnitySkeletonEvent : UnityEvent<Body[]>{ }
public class KinectManagerBehaviour : MonoBehaviour
{
@ -16,15 +15,16 @@ namespace cylvester
[SerializeField] public UnityInfraredCameraEvent infraredFrameReceived;
[SerializeField] private bool skeleton;
[SerializeField] public UnitySkeletonEvent skeletonDataReveived;
private Texture2D InfraredTexture { get; set;}
[SerializeField] public UnitySkeletonEvent skeletonDataReceived;
private KinectSensor sensor_;
private InfraredFrameReader infraredFrameReader_;
private BodyFrameReader bodyFrameReader_;
private ushort [] irData_;
private ushort [] irData_;
private Texture2D infraredTexture_;
private Body[] bodies_;
private EventHandler<InfraredFrameArrivedEventArgs> onInfraredFrameArrived_;
private EventHandler<BodyFrameArrivedEventArgs> onSkeletonFrameArrived_;
@ -46,46 +46,52 @@ namespace cylvester
infraredFrameReader_ = sensor_.InfraredFrameSource.OpenReader();
var frameDesc = sensor_.InfraredFrameSource.FrameDescription;
irData_ = new ushort[frameDesc.LengthInPixels];
InfraredTexture = new Texture2D(frameDesc.Width, frameDesc.Height, TextureFormat.R16, false);
infraredTexture_ = new Texture2D(frameDesc.Width, frameDesc.Height, TextureFormat.R16, false);
onInfraredFrameArrived_ = (frameReader, eventArgs) =>
{
if(!infrared)
return;
using (var infraredFrame = infraredFrameReader_.AcquireLatestFrame())
using (var infraredFrame = eventArgs.FrameReference.AcquireFrame())
{
if (infraredFrame == null) return;
if (infraredFrame == null)
return;
infraredFrame.CopyFrameDataToArray(irData_);
unsafe
{
fixed (ushort* irDataPtr = irData_)
{
InfraredTexture.LoadRawTextureData((IntPtr) irDataPtr, sizeof(ushort) * irData_.Length);
infraredTexture_.LoadRawTextureData((IntPtr) irDataPtr, sizeof(ushort) * irData_.Length);
}
}
InfraredTexture.Apply();
infraredTexture_.Apply();
}
infraredFrameReceived.Invoke(InfraredTexture);
infraredFrameReceived.Invoke(infraredTexture_);
};
infraredFrameReader_.FrameArrived += onInfraredFrameArrived_;
}
private void InitSkeletonTracking()
{
bodies_ = new Body[1];
bodyFrameReader_ = sensor_.BodyFrameSource.OpenReader();
onSkeletonFrameArrived_ = (frameReader, eventArgs) =>
{
if(!skeleton)
return;
using (var bodyFrame = eventArgs.FrameReference.AcquireFrame())
{
if (bodyFrame == null)
return;
Array.Resize(ref bodies_, bodyFrame.BodyCount);
bodyFrame.GetAndRefreshBodyData(bodies_);
skeletonDataReceived.Invoke(bodies_);
}
};
bodyFrameReader_.FrameArrived += onSkeletonFrameArrived_;

View file

@ -1,7 +0,0 @@
namespace cylvester
{
public class SkeltonTracker
{
}
}

View file

@ -1,11 +0,0 @@
fileFormatVersion: 2
guid: 42ff44fc2f2fc574c804d56e68af9bc3
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View file

@ -76,10 +76,7 @@ namespace cylvester
indices[index++] = offset + 1 + onset;
indices[index++] = 1 + onset;
}
return indices;
}
}
}