From 15ed32aea0d3e1fb3b16ffff795c0653a1b206bd Mon Sep 17 00:00:00 2001 From: Chikashi Miyama Date: Thu, 31 Oct 2019 10:43:47 +0100 Subject: [PATCH] fix namespace --- .../Assets/Scenes/Examples/KinectSkelton.meta | 8 + .../Examples/KinectSkelton/Skelton.unity | 296 ++++++++++++++++++ .../Examples/KinectSkelton/Skelton.unity.meta | 7 + .../Scenes/Examples/KinectSkelton/script.meta | 8 + .../Examples/KinectSkelton/script/Skelton.cs | 18 ++ .../KinectSkelton/script/Skelton.cs.meta | 11 + .../Scripts/VideoInput/ComponentFactory.cs | 3 +- .../UnitTest/ComponentFactoryTestCase.cs | 2 +- .../Editor/UnitTest/KinectSensorTestCase.cs | 2 +- .../Assets/Scripts/VideoInput/KinectFacade.cs | 7 + .../Scripts/VideoInput/KinectFacade.cs.meta | 11 + .../VideoInput/KinectManagerBehaviour.cs | 2 +- .../Assets/Scripts/VideoInput/KinectSensor.cs | 6 +- .../Scripts/VideoInput/SkeletonTracker.cs | 7 + .../VideoInput/SkeletonTracker.cs.meta | 11 + .../Scripts/Visualizer/IRPanelBehaviour.cs | 5 +- .../Scripts/Visualizer/PointCloudBehaviour.cs | 7 +- 17 files changed, 397 insertions(+), 14 deletions(-) create mode 100644 UnityProject/Assets/Scenes/Examples/KinectSkelton.meta create mode 100644 UnityProject/Assets/Scenes/Examples/KinectSkelton/Skelton.unity create mode 100644 UnityProject/Assets/Scenes/Examples/KinectSkelton/Skelton.unity.meta create mode 100644 UnityProject/Assets/Scenes/Examples/KinectSkelton/script.meta create mode 100644 UnityProject/Assets/Scenes/Examples/KinectSkelton/script/Skelton.cs create mode 100644 UnityProject/Assets/Scenes/Examples/KinectSkelton/script/Skelton.cs.meta create mode 100644 UnityProject/Assets/Scripts/VideoInput/KinectFacade.cs create mode 100644 UnityProject/Assets/Scripts/VideoInput/KinectFacade.cs.meta create mode 100644 UnityProject/Assets/Scripts/VideoInput/SkeletonTracker.cs create mode 100644 UnityProject/Assets/Scripts/VideoInput/SkeletonTracker.cs.meta diff --git a/UnityProject/Assets/Scenes/Examples/KinectSkelton.meta b/UnityProject/Assets/Scenes/Examples/KinectSkelton.meta new file mode 100644 index 0000000..28c2622 --- /dev/null +++ b/UnityProject/Assets/Scenes/Examples/KinectSkelton.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 5726eb3270e198d48a5718b0ef263a34 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Scenes/Examples/KinectSkelton/Skelton.unity b/UnityProject/Assets/Scenes/Examples/KinectSkelton/Skelton.unity new file mode 100644 index 0000000..038ade7 --- /dev/null +++ b/UnityProject/Assets/Scenes/Examples/KinectSkelton/Skelton.unity @@ -0,0 +1,296 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!29 &1 +OcclusionCullingSettings: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_OcclusionBakeSettings: + smallestOccluder: 5 + smallestHole: 0.25 + backfaceThreshold: 100 + m_SceneGUID: 00000000000000000000000000000000 + m_OcclusionCullingData: {fileID: 0} +--- !u!104 &2 +RenderSettings: + m_ObjectHideFlags: 0 + serializedVersion: 9 + m_Fog: 0 + m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_FogMode: 3 + m_FogDensity: 0.01 + m_LinearFogStart: 0 + m_LinearFogEnd: 300 + m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1} + m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1} + m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1} + m_AmbientIntensity: 1 + m_AmbientMode: 0 + m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1} + m_SkyboxMaterial: {fileID: 10304, guid: 0000000000000000f000000000000000, type: 0} + m_HaloStrength: 0.5 + m_FlareStrength: 1 + m_FlareFadeSpeed: 3 + m_HaloTexture: {fileID: 0} + m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0} + m_DefaultReflectionMode: 0 + m_DefaultReflectionResolution: 128 + m_ReflectionBounces: 1 + m_ReflectionIntensity: 1 + m_CustomReflection: {fileID: 0} + m_Sun: {fileID: 0} + m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1} + m_UseRadianceAmbientProbe: 0 +--- !u!157 &3 +LightmapSettings: + m_ObjectHideFlags: 0 + serializedVersion: 11 + m_GIWorkflowMode: 1 + m_GISettings: + serializedVersion: 2 + m_BounceScale: 1 + m_IndirectOutputScale: 1 + m_AlbedoBoost: 1 + m_EnvironmentLightingMode: 0 + m_EnableBakedLightmaps: 1 + m_EnableRealtimeLightmaps: 1 + m_LightmapEditorSettings: + serializedVersion: 12 + m_Resolution: 2 + m_BakeResolution: 40 + m_AtlasSize: 1024 + m_AO: 0 + m_AOMaxDistance: 1 + m_CompAOExponent: 1 + m_CompAOExponentDirect: 0 + m_ExtractAmbientOcclusion: 0 + m_Padding: 2 + m_LightmapParameters: {fileID: 0} + m_LightmapsBakeMode: 1 + m_TextureCompression: 1 + m_FinalGather: 0 + m_FinalGatherFiltering: 1 + m_FinalGatherRayCount: 256 + m_ReflectionCompression: 2 + m_MixedBakeMode: 2 + m_BakeBackend: 1 + m_PVRSampling: 1 + m_PVRDirectSampleCount: 32 + m_PVRSampleCount: 512 + m_PVRBounces: 2 + m_PVREnvironmentSampleCount: 256 + m_PVREnvironmentReferencePointCount: 2048 + m_PVRFilteringMode: 1 + m_PVRDenoiserTypeDirect: 1 + m_PVRDenoiserTypeIndirect: 1 + m_PVRDenoiserTypeAO: 1 + m_PVRFilterTypeDirect: 0 + m_PVRFilterTypeIndirect: 0 + m_PVRFilterTypeAO: 0 + m_PVREnvironmentMIS: 1 + m_PVRCulling: 1 + m_PVRFilteringGaussRadiusDirect: 1 + m_PVRFilteringGaussRadiusIndirect: 5 + m_PVRFilteringGaussRadiusAO: 2 + m_PVRFilteringAtrousPositionSigmaDirect: 0.5 + m_PVRFilteringAtrousPositionSigmaIndirect: 2 + m_PVRFilteringAtrousPositionSigmaAO: 1 + m_ExportTrainingData: 0 + m_TrainingDataDestination: TrainingData + m_LightingDataAsset: {fileID: 0} + m_UseShadowmask: 1 +--- !u!196 &4 +NavMeshSettings: + serializedVersion: 2 + m_ObjectHideFlags: 0 + m_BuildSettings: + serializedVersion: 2 + agentTypeID: 0 + agentRadius: 0.5 + agentHeight: 2 + agentSlope: 45 + agentClimb: 0.4 + ledgeDropHeight: 0 + maxJumpAcrossDistance: 0 + minRegionArea: 2 + manualCellSize: 0 + cellSize: 0.16666667 + manualTileSize: 0 + tileSize: 256 + accuratePlacement: 0 + debug: + m_Flags: 0 + m_NavMeshData: {fileID: 0} +--- !u!1 &1931119204 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1931119207} + - component: {fileID: 1931119206} + - component: {fileID: 1931119205} + m_Layer: 0 + m_Name: Main Camera + m_TagString: MainCamera + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!81 &1931119205 +AudioListener: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1931119204} + m_Enabled: 1 +--- !u!20 &1931119206 +Camera: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1931119204} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 1 + m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} + m_projectionMatrixMode: 1 + m_GateFitMode: 2 + m_FOVAxisMode: 0 + m_SensorSize: {x: 36, y: 24} + m_LensShift: {x: 0, y: 0} + m_FocalLength: 50 + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + near clip plane: 0.3 + far clip plane: 1000 + field of view: 60 + orthographic: 0 + orthographic size: 5 + m_Depth: -1 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingPath: -1 + m_TargetTexture: {fileID: 0} + m_TargetDisplay: 0 + m_TargetEye: 3 + m_HDR: 1 + m_AllowMSAA: 1 + m_AllowDynamicResolution: 0 + m_ForceIntoRT: 0 + m_OcclusionCulling: 1 + m_StereoConvergence: 10 + m_StereoSeparation: 0.022 +--- !u!4 &1931119207 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1931119204} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 1, z: -10} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &2001908821 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2001908823} + - component: {fileID: 2001908822} + m_Layer: 0 + m_Name: Directional Light + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!108 &2001908822 +Light: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2001908821} + m_Enabled: 1 + serializedVersion: 9 + m_Type: 1 + m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1} + m_Intensity: 1 + m_Range: 10 + m_SpotAngle: 30 + m_InnerSpotAngle: 21.80208 + m_CookieSize: 10 + m_Shadows: + m_Type: 2 + m_Resolution: -1 + m_CustomResolution: -1 + m_Strength: 1 + m_Bias: 0.05 + m_NormalBias: 0.4 + m_NearPlane: 0.2 + m_CullingMatrixOverride: + e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_UseCullingMatrixOverride: 0 + m_Cookie: {fileID: 0} + m_DrawHalo: 0 + m_Flare: {fileID: 0} + m_RenderMode: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingLayerMask: 1 + m_Lightmapping: 4 + m_LightShadowCasterMode: 0 + m_AreaSize: {x: 1, y: 1} + m_BounceIntensity: 1 + m_ColorTemperature: 6570 + m_UseColorTemperature: 0 + m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} + m_UseBoundingSphereOverride: 0 + m_ShadowRadius: 0 + m_ShadowAngle: 0 +--- !u!4 &2001908823 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2001908821} + m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261} + m_LocalPosition: {x: 0, y: 3, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} diff --git a/UnityProject/Assets/Scenes/Examples/KinectSkelton/Skelton.unity.meta b/UnityProject/Assets/Scenes/Examples/KinectSkelton/Skelton.unity.meta new file mode 100644 index 0000000..d8c0590 --- /dev/null +++ b/UnityProject/Assets/Scenes/Examples/KinectSkelton/Skelton.unity.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: d806b05d5be86cc4fba1e0069b672afe +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Scenes/Examples/KinectSkelton/script.meta b/UnityProject/Assets/Scenes/Examples/KinectSkelton/script.meta new file mode 100644 index 0000000..67facfd --- /dev/null +++ b/UnityProject/Assets/Scenes/Examples/KinectSkelton/script.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c243d1448347997429d91a56bbaba01c +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Scenes/Examples/KinectSkelton/script/Skelton.cs b/UnityProject/Assets/Scenes/Examples/KinectSkelton/script/Skelton.cs new file mode 100644 index 0000000..4fcdf1d --- /dev/null +++ b/UnityProject/Assets/Scenes/Examples/KinectSkelton/script/Skelton.cs @@ -0,0 +1,18 @@ +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() + { + + } +} diff --git a/UnityProject/Assets/Scenes/Examples/KinectSkelton/script/Skelton.cs.meta b/UnityProject/Assets/Scenes/Examples/KinectSkelton/script/Skelton.cs.meta new file mode 100644 index 0000000..477082a --- /dev/null +++ b/UnityProject/Assets/Scenes/Examples/KinectSkelton/script/Skelton.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: e5a7463b4de2d0e4caecea5317286d07 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Scripts/VideoInput/ComponentFactory.cs b/UnityProject/Assets/Scripts/VideoInput/ComponentFactory.cs index c3d26d3..70ca592 100644 --- a/UnityProject/Assets/Scripts/VideoInput/ComponentFactory.cs +++ b/UnityProject/Assets/Scripts/VideoInput/ComponentFactory.cs @@ -1,4 +1,4 @@ -namespace VideoInput +namespace cylvester { public class ComponentFactory { @@ -11,5 +11,6 @@ namespace VideoInput { return new InfraredCamera(); } + } } \ No newline at end of file diff --git a/UnityProject/Assets/Scripts/VideoInput/Editor/UnitTest/ComponentFactoryTestCase.cs b/UnityProject/Assets/Scripts/VideoInput/Editor/UnitTest/ComponentFactoryTestCase.cs index 6804c49..9ad2ef5 100644 --- a/UnityProject/Assets/Scripts/VideoInput/Editor/UnitTest/ComponentFactoryTestCase.cs +++ b/UnityProject/Assets/Scripts/VideoInput/Editor/UnitTest/ComponentFactoryTestCase.cs @@ -1,6 +1,6 @@ using NUnit.Framework; -namespace VideoInput.Editor.UnitTest +namespace cylvester.Editor.UnitTest { public class UnitTestComponentFactory { diff --git a/UnityProject/Assets/Scripts/VideoInput/Editor/UnitTest/KinectSensorTestCase.cs b/UnityProject/Assets/Scripts/VideoInput/Editor/UnitTest/KinectSensorTestCase.cs index 0bf11be..32dc4fd 100644 --- a/UnityProject/Assets/Scripts/VideoInput/Editor/UnitTest/KinectSensorTestCase.cs +++ b/UnityProject/Assets/Scripts/VideoInput/Editor/UnitTest/KinectSensorTestCase.cs @@ -1,7 +1,7 @@ using NUnit.Framework; using NSubstitute; -namespace VideoInput.Editor.UnitTest +namespace cylvester.Editor.UnitTest { [TestFixture] public class UnitTestKinectSensor diff --git a/UnityProject/Assets/Scripts/VideoInput/KinectFacade.cs b/UnityProject/Assets/Scripts/VideoInput/KinectFacade.cs new file mode 100644 index 0000000..3173283 --- /dev/null +++ b/UnityProject/Assets/Scripts/VideoInput/KinectFacade.cs @@ -0,0 +1,7 @@ +namespace UnityEditor +{ + public class KinectFacade + { + + } +} \ No newline at end of file diff --git a/UnityProject/Assets/Scripts/VideoInput/KinectFacade.cs.meta b/UnityProject/Assets/Scripts/VideoInput/KinectFacade.cs.meta new file mode 100644 index 0000000..30dab51 --- /dev/null +++ b/UnityProject/Assets/Scripts/VideoInput/KinectFacade.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 65a1be18ffcd5b44ea6787f744154d3b +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Scripts/VideoInput/KinectManagerBehaviour.cs b/UnityProject/Assets/Scripts/VideoInput/KinectManagerBehaviour.cs index 846339e..08fff2c 100644 --- a/UnityProject/Assets/Scripts/VideoInput/KinectManagerBehaviour.cs +++ b/UnityProject/Assets/Scripts/VideoInput/KinectManagerBehaviour.cs @@ -1,6 +1,6 @@ using UnityEngine; -namespace VideoInput +namespace cylvester { public class KinectManagerBehaviour : MonoBehaviour { diff --git a/UnityProject/Assets/Scripts/VideoInput/KinectSensor.cs b/UnityProject/Assets/Scripts/VideoInput/KinectSensor.cs index 6348b6d..5e0c11e 100644 --- a/UnityProject/Assets/Scripts/VideoInput/KinectSensor.cs +++ b/UnityProject/Assets/Scripts/VideoInput/KinectSensor.cs @@ -1,9 +1,9 @@ -namespace VideoInput +namespace cylvester { - public interface IKinectSensor + + public interface IKinectSensor : IUpdater { IInfraredCamera InfraredCamera { get; } - void Update(); } public class KinectSensor : IKinectSensor diff --git a/UnityProject/Assets/Scripts/VideoInput/SkeletonTracker.cs b/UnityProject/Assets/Scripts/VideoInput/SkeletonTracker.cs new file mode 100644 index 0000000..6b09cc6 --- /dev/null +++ b/UnityProject/Assets/Scripts/VideoInput/SkeletonTracker.cs @@ -0,0 +1,7 @@ +namespace cylvester +{ + public class SkeltonTracker + { + + } +} \ No newline at end of file diff --git a/UnityProject/Assets/Scripts/VideoInput/SkeletonTracker.cs.meta b/UnityProject/Assets/Scripts/VideoInput/SkeletonTracker.cs.meta new file mode 100644 index 0000000..b386247 --- /dev/null +++ b/UnityProject/Assets/Scripts/VideoInput/SkeletonTracker.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 42ff44fc2f2fc574c804d56e68af9bc3 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Scripts/Visualizer/IRPanelBehaviour.cs b/UnityProject/Assets/Scripts/Visualizer/IRPanelBehaviour.cs index ff1127f..ec90162 100644 --- a/UnityProject/Assets/Scripts/Visualizer/IRPanelBehaviour.cs +++ b/UnityProject/Assets/Scripts/Visualizer/IRPanelBehaviour.cs @@ -1,7 +1,6 @@ using UnityEngine; -using VideoInput; -namespace Visualizer +namespace cylvester { class IRPanelBehaviour : MonoBehaviour { @@ -18,7 +17,7 @@ namespace Visualizer void Update() { - renderer_.material.SetTexture(KinectTexture, kinectManagerBehaviour.KinectSensor.InfraredCamera.Data); + renderer_.material.SetTexture(KinectTexture, kinectManagerBehaviour.KinectSensor.InfraredCamera.InfraredTexture); } } } diff --git a/UnityProject/Assets/Scripts/Visualizer/PointCloudBehaviour.cs b/UnityProject/Assets/Scripts/Visualizer/PointCloudBehaviour.cs index f18c869..6d5deb1 100644 --- a/UnityProject/Assets/Scripts/Visualizer/PointCloudBehaviour.cs +++ b/UnityProject/Assets/Scripts/Visualizer/PointCloudBehaviour.cs @@ -1,8 +1,7 @@ using UnityEngine; using UnityEngine.Rendering; -using VideoInput; -namespace Visualizer +namespace cylvester { public class PointCloudBehaviour : MonoBehaviour { @@ -21,7 +20,7 @@ namespace Visualizer private void Start() { - var texture = kinectManagerBehaviour.KinectSensor.InfraredCamera.Data; + var texture = kinectManagerBehaviour.KinectSensor.InfraredCamera.InfraredTexture; var numPixels = texture.height * texture.width; meshFilter.mesh = new Mesh { @@ -32,7 +31,7 @@ namespace Visualizer meshFilter.mesh.SetIndices(MakeIndecies(numPixels), MeshTopology.Points, 0, false); material_ = GetComponent().material; - material_.mainTexture = kinectManagerBehaviour.KinectSensor.InfraredCamera.Data; + material_.mainTexture = kinectManagerBehaviour.KinectSensor.InfraredCamera.InfraredTexture; } private void Update()