Commit ed3a1d8e authored by 16이상민's avatar 16이상민

Fix malfunctions

parent 2e76df20
......@@ -37,4 +37,4 @@ Material:
m_Floats:
- _Cutoff: 0
m_Colors:
- _Color: {r: 0, g: 1, b: 0, a: 0}
- _Color: {r: 0, g: 1, b: 0, a: 1}
......@@ -77,15 +77,18 @@ LightmapSettings:
m_PVRDirectSampleCount: 32
m_PVRSampleCount: 500
m_PVRBounces: 2
m_PVRFiltering: 0
m_PVRFilterTypeDirect: 0
m_PVRFilterTypeIndirect: 0
m_PVRFilterTypeAO: 0
m_PVRFilteringMode: 1
m_PVRCulling: 1
m_PVRFilteringGaussRadiusDirect: 1
m_PVRFilteringGaussRadiusIndirect: 5
m_PVRFilteringGaussRadiusAO: 2
m_PVRFilteringAtrousColorSigma: 1
m_PVRFilteringAtrousNormalSigma: 1
m_PVRFilteringAtrousPositionSigma: 1
m_PVRFilteringAtrousPositionSigmaDirect: 0.5
m_PVRFilteringAtrousPositionSigmaIndirect: 2
m_PVRFilteringAtrousPositionSigmaAO: 1
m_ShowResolutionOverlay: 1
m_LightingDataAsset: {fileID: 0}
m_UseShadowmask: 1
--- !u!196 &4
......@@ -107,6 +110,8 @@ NavMeshSettings:
manualTileSize: 0
tileSize: 256
accuratePlacement: 0
debug:
m_Flags: 0
m_NavMeshData: {fileID: 0}
--- !u!4 &37266108 stripped
Transform:
......@@ -267,20 +272,6 @@ Light:
m_Lightmapping: 4
m_AreaSize: {x: 1, y: 1}
m_BounceIntensity: 1
m_FalloffTable:
m_Table[0]: 0
m_Table[1]: 0
m_Table[2]: 0
m_Table[3]: 0
m_Table[4]: 0
m_Table[5]: 0
m_Table[6]: 0
m_Table[7]: 0
m_Table[8]: 0
m_Table[9]: 0
m_Table[10]: 0
m_Table[11]: 0
m_Table[12]: 0
m_ColorTemperature: 6570
m_UseColorTemperature: 0
m_ShadowRadius: 0
......@@ -653,24 +644,119 @@ Light:
m_Lightmapping: 4
m_AreaSize: {x: 1, y: 1}
m_BounceIntensity: 1
m_FalloffTable:
m_Table[0]: 0
m_Table[1]: 0
m_Table[2]: 0
m_Table[3]: 0
m_Table[4]: 0
m_Table[5]: 0
m_Table[6]: 0
m_Table[7]: 0
m_Table[8]: 0
m_Table[9]: 0
m_Table[10]: 0
m_Table[11]: 0
m_Table[12]: 0
m_ColorTemperature: 6570
m_UseColorTemperature: 0
m_ShadowRadius: 0
m_ShadowAngle: 0
--- !u!1 &410373230
GameObject:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
serializedVersion: 5
m_Component:
- component: {fileID: 410373232}
- component: {fileID: 410373231}
m_Layer: 0
m_Name: Test
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!82 &410373231
AudioSource:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 410373230}
m_Enabled: 1
serializedVersion: 4
OutputAudioMixerGroup: {fileID: 0}
m_audioClip: {fileID: 8300000, guid: b73811e29a52aa5479bda65218988e63, type: 3}
m_PlayOnAwake: 1
m_Volume: 1
m_Pitch: 1
Loop: 0
Mute: 0
Spatialize: 0
SpatializePostEffects: 0
Priority: 128
DopplerLevel: 1
MinDistance: 1
MaxDistance: 500
Pan2D: 0
rolloffMode: 0
BypassEffects: 0
BypassListenerEffects: 0
BypassReverbZones: 0
rolloffCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 2
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
- serializedVersion: 2
time: 1
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
panLevelCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 2
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 0
spreadCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 2
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
reverbZoneMixCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 2
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 0
--- !u!4 &410373232
Transform:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 410373230}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -985, y: -540, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 1441728456}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &420057529
Prefab:
m_ObjectHideFlags: 0
......@@ -764,6 +850,7 @@ MeshRenderer:
m_Enabled: 1
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
......@@ -779,6 +866,7 @@ MeshRenderer:
m_PreserveUVs: 1
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 0
m_SelectedEditorRenderState: 3
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
......@@ -871,20 +959,6 @@ Light:
m_Lightmapping: 4
m_AreaSize: {x: 1, y: 1}
m_BounceIntensity: 1
m_FalloffTable:
m_Table[0]: 0
m_Table[1]: 0
m_Table[2]: 0
m_Table[3]: 0
m_Table[4]: 0
m_Table[5]: 0
m_Table[6]: 0
m_Table[7]: 0
m_Table[8]: 0
m_Table[9]: 0
m_Table[10]: 0
m_Table[11]: 0
m_Table[12]: 0
m_ColorTemperature: 6570
m_UseColorTemperature: 0
m_ShadowRadius: 0
......@@ -971,20 +1045,6 @@ Light:
m_Lightmapping: 4
m_AreaSize: {x: 1, y: 1}
m_BounceIntensity: 1
m_FalloffTable:
m_Table[0]: 0
m_Table[1]: 0
m_Table[2]: 0
m_Table[3]: 0
m_Table[4]: 0
m_Table[5]: 0
m_Table[6]: 0
m_Table[7]: 0
m_Table[8]: 0
m_Table[9]: 0
m_Table[10]: 0
m_Table[11]: 0
m_Table[12]: 0
m_ColorTemperature: 6570
m_UseColorTemperature: 0
m_ShadowRadius: 0
......@@ -1037,6 +1097,115 @@ Transform:
m_Father: {fileID: 0}
m_RootOrder: 16
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &678503478
GameObject:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
serializedVersion: 5
m_Component:
- component: {fileID: 678503480}
- component: {fileID: 678503479}
m_Layer: 0
m_Name: Proghouse
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!82 &678503479
AudioSource:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 678503478}
m_Enabled: 1
serializedVersion: 4
OutputAudioMixerGroup: {fileID: 0}
m_audioClip: {fileID: 8300000, guid: 1c70ab05457a8484aaa357ee8fa34f27, type: 3}
m_PlayOnAwake: 1
m_Volume: 1
m_Pitch: 1
Loop: 0
Mute: 0
Spatialize: 0
SpatializePostEffects: 0
Priority: 128
DopplerLevel: 1
MinDistance: 1
MaxDistance: 500
Pan2D: 0
rolloffMode: 0
BypassEffects: 0
BypassListenerEffects: 0
BypassReverbZones: 0
rolloffCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 2
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
- serializedVersion: 2
time: 1
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
panLevelCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 2
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 0
spreadCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 2
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
reverbZoneMixCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 2
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 0
--- !u!4 &678503480
Transform:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 678503478}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -985, y: -540, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 1441728456}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &718308452
Prefab:
m_ObjectHideFlags: 0
......@@ -1160,20 +1329,6 @@ Light:
m_Lightmapping: 4
m_AreaSize: {x: 1, y: 1}
m_BounceIntensity: 1
m_FalloffTable:
m_Table[0]: 0
m_Table[1]: 0
m_Table[2]: 0
m_Table[3]: 0
m_Table[4]: 0
m_Table[5]: 0
m_Table[6]: 0
m_Table[7]: 0
m_Table[8]: 0
m_Table[9]: 0
m_Table[10]: 0
m_Table[11]: 0
m_Table[12]: 0
m_ColorTemperature: 6570
m_UseColorTemperature: 0
m_ShadowRadius: 0
......@@ -1192,7 +1347,7 @@ GameObject:
- component: {fileID: 750753107}
- component: {fileID: 750753108}
m_Layer: 5
m_Name: Managers
m_Name: InGameManagers
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
......@@ -1249,6 +1404,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: a9d22e7eb4921ca47b18c68e43c0eb6e, type: 3}
m_Name:
m_EditorClassIdentifier:
defaultSound: $
--- !u!114 &750753107
MonoBehaviour:
m_ObjectHideFlags: 0
......@@ -1260,7 +1416,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 510da3d4303d77441a0367665b5a4ae3, type: 3}
m_Name:
m_EditorClassIdentifier:
CoordinateMapperManager: {fileID: 750753102}
--- !u!114 &750753108
MonoBehaviour:
m_ObjectHideFlags: 0
......@@ -1543,6 +1698,115 @@ Prefab:
m_RemovedComponents: []
m_ParentPrefab: {fileID: 100100000, guid: 4428a4d47b3582c4b90ee7163c0223da, type: 3}
m_IsPrefabParent: 0
--- !u!1 &993657580
GameObject:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
serializedVersion: 5
m_Component:
- component: {fileID: 993657582}
- component: {fileID: 993657581}
m_Layer: 0
m_Name: Bigroom1
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!82 &993657581
AudioSource:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 993657580}
m_Enabled: 1
serializedVersion: 4
OutputAudioMixerGroup: {fileID: 0}
m_audioClip: {fileID: 8300000, guid: aab699f5bc8ef2c4780b4523de541e70, type: 3}
m_PlayOnAwake: 1
m_Volume: 1
m_Pitch: 1
Loop: 0
Mute: 0
Spatialize: 0
SpatializePostEffects: 0
Priority: 128
DopplerLevel: 1
MinDistance: 1
MaxDistance: 500
Pan2D: 0
rolloffMode: 0
BypassEffects: 0
BypassListenerEffects: 0
BypassReverbZones: 0
rolloffCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 2
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
- serializedVersion: 2
time: 1
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
panLevelCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 2
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 0
spreadCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 2
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
reverbZoneMixCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 2
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 0
--- !u!4 &993657582
Transform:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 993657580}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -985, y: -540, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 1441728456}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1073141666
GameObject:
m_ObjectHideFlags: 0
......@@ -2024,20 +2288,6 @@ Light:
m_Lightmapping: 4
m_AreaSize: {x: 1, y: 1}
m_BounceIntensity: 1
m_FalloffTable:
m_Table[0]: 0
m_Table[1]: 0
m_Table[2]: 0
m_Table[3]: 0
m_Table[4]: 0
m_Table[5]: 0
m_Table[6]: 0
m_Table[7]: 0
m_Table[8]: 0
m_Table[9]: 0
m_Table[10]: 0
m_Table[11]: 0
m_Table[12]: 0
m_ColorTemperature: 6570
m_UseColorTemperature: 0
m_ShadowRadius: 0
......@@ -2113,11 +2363,11 @@ Camera:
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
m_StereoMirrorMode: 0
--- !u!4 &1217935570
Transform:
m_ObjectHideFlags: 0
......@@ -2255,20 +2505,6 @@ Light:
m_Lightmapping: 4
m_AreaSize: {x: 1, y: 1}
m_BounceIntensity: 1
m_FalloffTable:
m_Table[0]: 0
m_Table[1]: 0
m_Table[2]: 0
m_Table[3]: 0
m_Table[4]: 0
m_Table[5]: 0
m_Table[6]: 0
m_Table[7]: 0
m_Table[8]: 0
m_Table[9]: 0
m_Table[10]: 0
m_Table[11]: 0
m_Table[12]: 0
m_ColorTemperature: 6570
m_UseColorTemperature: 0
m_ShadowRadius: 0
......@@ -2353,24 +2589,42 @@ Light:
m_Lightmapping: 4
m_AreaSize: {x: 1, y: 1}
m_BounceIntensity: 1
m_FalloffTable:
m_Table[0]: 0
m_Table[1]: 0
m_Table[2]: 0
m_Table[3]: 0
m_Table[4]: 0
m_Table[5]: 0
m_Table[6]: 0
m_Table[7]: 0
m_Table[8]: 0
m_Table[9]: 0
m_Table[10]: 0
m_Table[11]: 0
m_Table[12]: 0
m_ColorTemperature: 6570
m_UseColorTemperature: 0
m_ShadowRadius: 0
m_ShadowAngle: 0
--- !u!1 &1441728455
GameObject:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
serializedVersion: 5
m_Component:
- component: {fileID: 1441728456}
m_Layer: 0
m_Name: Sounds
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1441728456
Transform:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1441728455}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 985, y: 540, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 993657582}
- {fileID: 1834994979}
- {fileID: 678503480}
- {fileID: 410373232}
m_Father: {fileID: 0}
m_RootOrder: 18
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &1443188302
Prefab:
m_ObjectHideFlags: 0
......@@ -2810,6 +3064,115 @@ Prefab:
m_RemovedComponents: []
m_ParentPrefab: {fileID: 100100000, guid: 4428a4d47b3582c4b90ee7163c0223da, type: 3}
m_IsPrefabParent: 0
--- !u!1 &1834994977
GameObject:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
serializedVersion: 5
m_Component:
- component: {fileID: 1834994979}
- component: {fileID: 1834994978}
m_Layer: 0
m_Name: Bigroom2
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!82 &1834994978
AudioSource:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1834994977}
m_Enabled: 1
serializedVersion: 4
OutputAudioMixerGroup: {fileID: 0}
m_audioClip: {fileID: 8300000, guid: b860d8e984bce644eb2dde19833024c8, type: 3}
m_PlayOnAwake: 1
m_Volume: 1
m_Pitch: 1
Loop: 0
Mute: 0
Spatialize: 0
SpatializePostEffects: 0
Priority: 128
DopplerLevel: 1
MinDistance: 1
MaxDistance: 500
Pan2D: 0
rolloffMode: 0
BypassEffects: 0
BypassListenerEffects: 0
BypassReverbZones: 0
rolloffCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 2
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
- serializedVersion: 2
time: 1
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
panLevelCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 2
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 0
spreadCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 2
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
reverbZoneMixCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 2
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 0
--- !u!4 &1834994979
Transform:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1834994977}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -985, y: -540, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 1441728456}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1843623467
GameObject:
m_ObjectHideFlags: 0
......@@ -2837,6 +3200,7 @@ MeshRenderer:
m_Enabled: 1
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
......@@ -2852,6 +3216,7 @@ MeshRenderer:
m_PreserveUVs: 1
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 0
m_SelectedEditorRenderState: 3
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
......@@ -2919,6 +3284,7 @@ MeshRenderer:
m_Enabled: 1
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
......@@ -2934,6 +3300,7 @@ MeshRenderer:
m_PreserveUVs: 1
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 0
m_SelectedEditorRenderState: 3
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
......@@ -3054,20 +3421,6 @@ Light:
m_Lightmapping: 4
m_AreaSize: {x: 1, y: 1}
m_BounceIntensity: 1
m_FalloffTable:
m_Table[0]: 0
m_Table[1]: 0
m_Table[2]: 0
m_Table[3]: 0
m_Table[4]: 0
m_Table[5]: 0
m_Table[6]: 0
m_Table[7]: 0
m_Table[8]: 0
m_Table[9]: 0
m_Table[10]: 0
m_Table[11]: 0
m_Table[12]: 0
m_ColorTemperature: 6570
m_UseColorTemperature: 0
m_ShadowRadius: 0
......@@ -3221,6 +3574,7 @@ MeshRenderer:
m_Enabled: 1
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_MotionVectors: 1
m_LightProbeUsage: 0
m_ReflectionProbeUsage: 1
......@@ -3236,6 +3590,7 @@ MeshRenderer:
m_PreserveUVs: 1
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 0
m_SelectedEditorRenderState: 3
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
......@@ -3254,9 +3609,9 @@ MeshCollider:
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 2
serializedVersion: 3
m_Convex: 0
m_InflateMesh: 0
m_CookingOptions: 14
m_SkinWidth: 0.01
m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0}
--- !u!33 &2093461956
......@@ -3292,7 +3647,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 8503e604fd3a9d44ba58c6fcc10a96ba, type: 3}
m_Name:
m_EditorClassIdentifier:
CoordinateMapperManager: {fileID: 750753102}
--- !u!1001 &2097896204
Prefab:
m_ObjectHideFlags: 0
......
......@@ -77,15 +77,18 @@ LightmapSettings:
m_PVRDirectSampleCount: 32
m_PVRSampleCount: 500
m_PVRBounces: 2
m_PVRFiltering: 0
m_PVRFilterTypeDirect: 0
m_PVRFilterTypeIndirect: 0
m_PVRFilterTypeAO: 0
m_PVRFilteringMode: 1
m_PVRCulling: 1
m_PVRFilteringGaussRadiusDirect: 1
m_PVRFilteringGaussRadiusIndirect: 5
m_PVRFilteringGaussRadiusAO: 2
m_PVRFilteringAtrousColorSigma: 1
m_PVRFilteringAtrousNormalSigma: 1
m_PVRFilteringAtrousPositionSigma: 1
m_PVRFilteringAtrousPositionSigmaDirect: 0.5
m_PVRFilteringAtrousPositionSigmaIndirect: 2
m_PVRFilteringAtrousPositionSigmaAO: 1
m_ShowResolutionOverlay: 1
m_LightingDataAsset: {fileID: 0}
m_UseShadowmask: 1
--- !u!196 &4
......@@ -107,6 +110,8 @@ NavMeshSettings:
manualTileSize: 0
tileSize: 256
accuratePlacement: 0
debug:
m_Flags: 0
m_NavMeshData: {fileID: 0}
--- !u!1 &135533173
GameObject:
......@@ -484,7 +489,6 @@ GameObject:
m_Component:
- component: {fileID: 609057691}
- component: {fileID: 609057690}
- component: {fileID: 609057692}
- component: {fileID: 609057689}
m_Layer: 0
m_Name: Managers
......@@ -526,6 +530,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: a9d22e7eb4921ca47b18c68e43c0eb6e, type: 3}
m_Name:
m_EditorClassIdentifier:
defaultSound: {fileID: 0}
--- !u!4 &609057691
Transform:
m_ObjectHideFlags: 0
......@@ -539,17 +544,6 @@ Transform:
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &609057692
MonoBehaviour:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 609057688}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 6e697643158480b4ba850d906eac1bc2, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &634338382
GameObject:
m_ObjectHideFlags: 0
......@@ -598,20 +592,6 @@ Light:
m_Lightmapping: 4
m_AreaSize: {x: 1, y: 1}
m_BounceIntensity: 1
m_FalloffTable:
m_Table[0]: 0
m_Table[1]: 0
m_Table[2]: 0
m_Table[3]: 0
m_Table[4]: 0
m_Table[5]: 0
m_Table[6]: 0
m_Table[7]: 0
m_Table[8]: 0
m_Table[9]: 0
m_Table[10]: 0
m_Table[11]: 0
m_Table[12]: 0
m_ColorTemperature: 6570
m_UseColorTemperature: 0
m_ShadowRadius: 0
......@@ -830,11 +810,11 @@ Camera:
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
m_StereoMirrorMode: 0
--- !u!4 &1050043563
Transform:
m_ObjectHideFlags: 0
......
%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: 8
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.37311953, g: 0.38074014, b: 0.3587274, a: 1}
--- !u!157 &3
LightmapSettings:
m_ObjectHideFlags: 0
serializedVersion: 11
m_GIWorkflowMode: 0
m_GISettings:
serializedVersion: 2
m_BounceScale: 1
m_IndirectOutputScale: 1
m_AlbedoBoost: 1
m_TemporalCoherenceThreshold: 1
m_EnvironmentLightingMode: 0
m_EnableBakedLightmaps: 1
m_EnableRealtimeLightmaps: 1
m_LightmapEditorSettings:
serializedVersion: 9
m_Resolution: 2
m_BakeResolution: 40
m_TextureWidth: 1024
m_TextureHeight: 1024
m_AO: 0
m_AOMaxDistance: 1
m_CompAOExponent: 1
m_CompAOExponentDirect: 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: 0
m_PVRSampling: 1
m_PVRDirectSampleCount: 32
m_PVRSampleCount: 500
m_PVRBounces: 2
m_PVRFilterTypeDirect: 0
m_PVRFilterTypeIndirect: 0
m_PVRFilterTypeAO: 0
m_PVRFilteringMode: 1
m_PVRCulling: 1
m_PVRFilteringGaussRadiusDirect: 1
m_PVRFilteringGaussRadiusIndirect: 5
m_PVRFilteringGaussRadiusAO: 2
m_PVRFilteringAtrousPositionSigmaDirect: 0.5
m_PVRFilteringAtrousPositionSigmaIndirect: 2
m_PVRFilteringAtrousPositionSigmaAO: 1
m_ShowResolutionOverlay: 1
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 &554916356
GameObject:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
serializedVersion: 5
m_Component:
- component: {fileID: 554916358}
- component: {fileID: 554916357}
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 &554916357
Light:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 554916356}
m_Enabled: 0
serializedVersion: 8
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_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_Cookie: {fileID: 0}
m_DrawHalo: 0
m_Flare: {fileID: 0}
m_RenderMode: 0
m_CullingMask:
serializedVersion: 2
m_Bits: 4294967295
m_Lightmapping: 4
m_AreaSize: {x: 1, y: 1}
m_BounceIntensity: 1
m_ColorTemperature: 6570
m_UseColorTemperature: 0
m_ShadowRadius: 0
m_ShadowAngle: 0
--- !u!4 &554916358
Transform:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 554916356}
m_LocalRotation: {x: 0.41869327, y: -0.5556666, z: -0.05746365, w: 0.71598077}
m_LocalPosition: {x: -27.24, y: 7.34, z: -9.75}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 32.391003, y: -87.838005, z: -40.428}
--- !u!1 &750753102
GameObject:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
serializedVersion: 5
m_Component:
- component: {fileID: 750753103}
- component: {fileID: 750753108}
- component: {fileID: 750753104}
m_Layer: 5
m_Name: tmpManagers
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &750753103
RectTransform:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 750753102}
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: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &750753104
MonoBehaviour:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 750753102}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: a9d22e7eb4921ca47b18c68e43c0eb6e, type: 3}
m_Name:
m_EditorClassIdentifier:
defaultSound: {fileID: 0}
--- !u!114 &750753108
MonoBehaviour:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 750753102}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 397b5aecede4d754abd2fba781e08f97, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &1217935565
GameObject:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
serializedVersion: 5
m_Component:
- component: {fileID: 1217935570}
- component: {fileID: 1217935569}
- component: {fileID: 1217935568}
- component: {fileID: 1217935567}
- component: {fileID: 1217935566}
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 &1217935566
AudioListener:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1217935565}
m_Enabled: 1
--- !u!124 &1217935567
Behaviour:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1217935565}
m_Enabled: 1
--- !u!92 &1217935568
Behaviour:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1217935565}
m_Enabled: 1
--- !u!20 &1217935569
Camera:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1217935565}
m_Enabled: 1
serializedVersion: 2
m_ClearFlags: 1
m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0}
m_NormalizedViewPortRect:
serializedVersion: 2
x: 0
y: 0
width: 1
height: 1
near clip plane: 0.3
far clip plane: 1000
field of view: 40
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 &1217935570
Transform:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1217935565}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 5.38, z: -7.204}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &2093461952
GameObject:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 1732681758430954, guid: 3085a63069dbd4449a4a4b89505ca911,
type: 2}
m_PrefabInternal: {fileID: 0}
serializedVersion: 5
m_Component:
- component: {fileID: 2093461957}
- component: {fileID: 2093461956}
- component: {fileID: 2093461955}
- component: {fileID: 2093461954}
- component: {fileID: 2093461959}
m_Layer: 8
m_Name: CoordinateMapView
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!23 &2093461954
MeshRenderer:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 23217812345501134, guid: 3085a63069dbd4449a4a4b89505ca911,
type: 2}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 2093461952}
m_Enabled: 1
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_MotionVectors: 1
m_LightProbeUsage: 0
m_ReflectionProbeUsage: 1
m_Materials:
- {fileID: 2100000, guid: 6805a505ebdaf35449ded07154e29f1c, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_PreserveUVs: 1
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 0
m_SelectedEditorRenderState: 3
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
--- !u!64 &2093461955
MeshCollider:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 64901308897744178, guid: 3085a63069dbd4449a4a4b89505ca911,
type: 2}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 2093461952}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 3
m_Convex: 0
m_CookingOptions: 14
m_SkinWidth: 0.01
m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0}
--- !u!33 &2093461956
MeshFilter:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 33991962367129348, guid: 3085a63069dbd4449a4a4b89505ca911,
type: 2}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 2093461952}
m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0}
--- !u!4 &2093461957
Transform:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 4998421378210108, guid: 3085a63069dbd4449a4a4b89505ca911,
type: 2}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 2093461952}
m_LocalRotation: {x: -0.7071068, y: 0, z: 0, w: 0.7071068}
m_LocalPosition: {x: 0, y: 5.52, z: -1.66}
m_LocalScale: {x: 0.5942318, y: 0.74278957, z: 0.33425528}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0}
--- !u!114 &2093461959
MonoBehaviour:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 2093461952}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 8503e604fd3a9d44ba58c6fcc10a96ba, type: 3}
m_Name:
m_EditorClassIdentifier:
fileFormatVersion: 2
guid: bd1125abc59508941a9858dc3f08c1b7
timeCreated: 1516864014
licenseType: Free
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
......@@ -131,14 +131,14 @@ namespace KinectModule
public class SourceBuffer
{
private byte[] _ColorBuffer = new byte[KinectConstants.ColorWidth *
private byte[] _ColorBuffer = new byte [KinectConstants.ColorWidth *
KinectConstants.ColorHeight *
KinectConstants.ColorCount],
_BodyIndexBuffer = new byte[KinectConstants.DepthWidth *
_BodyIndexBuffer = new byte [KinectConstants.DepthWidth *
KinectConstants.DepthHeight];
private ushort[] _DepthBuffer = new ushort[KinectConstants.DepthWidth *
KinectConstants.DepthHeight];
private IBody[] _BodyBuffer = new IBody[KinectConstants.BodyCount];
private IBody[] _BodyBuffer = new IBody [KinectConstants.BodyCount];
public byte[] ColorBuffer
{ get { return _ColorBuffer; } }
......
......@@ -4,6 +4,8 @@ using Windows.Kinect;
public class CoordinateMapperView : MonoBehaviour
{
private GameObject manager;
private ComputeBuffer DepthBuffer,
BodyIndexBuffer;
......@@ -12,8 +14,7 @@ public class CoordinateMapperView : MonoBehaviour
void Start ()
{
var CoordinateMapperManager = GameObject.Find("Managers").GetComponent<CoordinateMapperManager>();
CoordinateMapperManager.enabled = true;
var CoordinateMapperManager = GameObject.Find("InGameManagers").GetComponent<CoordinateMapperManager>();
var material = GetComponent<Renderer>().material;
......@@ -34,6 +35,8 @@ public class CoordinateMapperView : MonoBehaviour
void Update()
{
//TODO: fix perf on this call.
DepthBuffer.SetData(DepthPoints);
......
......@@ -25,7 +25,7 @@ public class GameManager : MonoBehaviour {
}
[SerializeField]
public AudioSource defaultSound;
public string defaultSound;
public TrackInfo CurrentTrack { get; set; }
......
using System;
using UnityEngine;
public class InputManager : MonoBehaviour {
private static InputManager instance;
public static InputManager Instance
{
get
{
if (instance == null)
{
instance = FindObjectOfType(typeof(InputManager))
as InputManager;
}
return instance;
}
}
public class InputManager : MonoBehaviour
{
private bool IsButtonDownPrev { get; set; }
private bool IsButtonDown
{
get { return Input.GetKey(KeyCode.Space) || Input.GetKey(KeyCode.Joystick1Button0); }
}
{ get { return Input.GetKey(KeyCode.Space) || Input.GetKey(KeyCode.Joystick1Button0); } }
private MotionState PrevMotionState { get; set; }
public MotionState CurrentMotionState { get; set; }
public ButtonStatus ButtonStat
{
get
{
if (!IsButtonDown)
return ButtonStatus.Released;
if (IsButtonDownPrev)
return ButtonStatus.Holding;
return ButtonStatus.Pressed;
}
}
public InputStatus ShortButtonStat
{
get
......@@ -118,8 +89,7 @@ public class InputManager : MonoBehaviour {
}
}
// Update is called once per frame
void Update()
private void Update()
{
IsButtonDownPrev = IsButtonDown;
PrevMotionState = CurrentMotionState;
......@@ -129,7 +99,7 @@ public class InputManager : MonoBehaviour {
{
if (name.Contains("Both"))
{
var tmpname = name.Substring(name.IndexOf("Both"));
var tmpname = name.Substring(0, name.IndexOf("Both"));
var left = LongMotionToInput(tmpname + "Left");
var right = LongMotionToInput(tmpname + "Right");
......@@ -161,7 +131,7 @@ public class InputManager : MonoBehaviour {
{
if (name.Contains("Both"))
{
var tmpname = name.Substring(name.IndexOf("Both"));
var tmpname = name.Substring(0, name.IndexOf("Both"));
var left = ShortMotionToInput(tmpname + "Left");
var right = ShortMotionToInput(tmpname + "Right");
......@@ -403,3 +373,13 @@ public enum InputStatus
Stopped,
None
}
internal interface IButtonDownGetter
{
bool IsButtonDown
{ get; }
}
internal class ButtonDownGetter
{
}
......@@ -7,29 +7,16 @@ using UnityEngine.UI;
public class JudgeManager : MonoBehaviour
{
private static JudgeManager instance;
public static JudgeManager Instance
{
get
{
if (instance == null)
{
instance = FindObjectOfType(typeof(JudgeManager))
as JudgeManager;
}
return instance;
}
}
float latency = 225f;
float scrollMultiplier = 1.0f;
float startOffset = -5f;
float baseTime;
bool IsInitTime;
bool IsGameEnd;
private GameObject offset;
private GameObject noteobj, smobj, lmobj;
private GameObject noteobj;
private MotionGageManager motionGageManager;
private GameObject judgeText;
......@@ -53,13 +40,16 @@ public class JudgeManager : MonoBehaviour
}
}
private InputManager input;
private NoteCondition condition;
void SetObjectRef()
{
offset = GameObject.Find("Offset");
noteobj = GameObject.Find("Noteobj");
smobj = GameObject.Find("SMobj");
lmobj = GameObject.Find("LMobj");
judgeText = GameObject.Find("Judge");
input = GameObject.Find("InGameManagers").GetComponent<InputManager>();
condition = new NoteCondition(input);
motionGageManager = new MotionGageManager
{ motionGuage = GameObject.Find("Motion Guage") };
}
......@@ -70,13 +60,23 @@ public class JudgeManager : MonoBehaviour
judgeText.SetActive(false);
motionGageManager.ResetGuage();
IsGameEnd = false;
baseTime = 0f;
IsInitTime = false;
}
void LoadGameObjects()
{
motionSampleDisplayPrefab = Resources.Load("Motion Sample Display") as GameObject;
GameManager.Instance.CurrentTrack.Notes.ForEach(LoadNote);
Instantiate(GameManager.Instance.defaultSound);
//if (GameManager.Instance.defaultSound != null)
// Instantiate(GameManager.Instance.defaultSound);
var sounds = GameObject.Find("Sounds");
sounds.transform.Cast<Transform>()
.ToList()
.ForEach(x => x.gameObject.SetActive(false));
if (GameManager.Instance.CurrentTrack.BGM != null)
sounds.transform.Find(GameManager.Instance.CurrentTrack.BGM)
.gameObject.SetActive(true);
}
// Use this for initialization
......@@ -90,9 +90,16 @@ public class JudgeManager : MonoBehaviour
// Update is called once per frame
void Update()
{
float timing = motionGageManager.UpdateTime(); ;
float current = motionGageManager.UpdateTime();
if (!IsInitTime)
{
baseTime = current;
IsInitTime = true;
}
float timing = current - baseTime;
offset.transform.position = Vector3.left * timing * ScrollSpeed;
offset.transform.position = Vector3.left * current * ScrollSpeed;
motionGageManager.UpdateGuage();
......@@ -132,23 +139,23 @@ public class JudgeManager : MonoBehaviour
void JudgeShortNote(Note note, float timing)
{
if (NoteCondition.IsWrongInput(note))
if (condition.IsWrongInput(note))
WrongNoteProc(note);
else if (NoteCondition.IsShortNoteEntered(note))
else if (condition.IsShortNoteEntered(note))
EnteredNoteProc(note, timing);
}
void JudgeLongNote(Note note, float timing)
{
if (NoteCondition.IsWrongInput(note))
if (condition.IsWrongInput(note))
WrongNoteProc(note);
else if (NoteCondition.IsLongNoteStartCorrectly(note))
else if (condition.IsLongNoteStartCorrectly(note))
EnteredNoteProc(note, timing);
else if (NoteCondition.IsLongNoteHoldCorrectly(note))
else if (condition.IsLongNoteHoldCorrectly(note))
ContinuingNoteProc(note, timing);
else if (NoteCondition.IsLongNoteFinishCorrectly(note, timing))
else if (condition.IsLongNoteFinishCorrectly(note, timing))
CorrectlyStoppedNoteProc(note, timing);
else if (NoteCondition.IsLongNoteFinishIncorrectly(note, timing))
else if (condition.IsLongNoteFinishIncorrectly(note, timing))
IncorrectlyStoppedNoteProc(note, timing);
}
......@@ -179,7 +186,7 @@ public class JudgeManager : MonoBehaviour
SetJudge(judge);
if (isNoteEnd ||
NoteCondition.IsNoteBroken(note, timing, judge))
condition.IsNoteBroken(note, timing, judge))
DeactivateNote(note);
}
......@@ -259,55 +266,66 @@ public class JudgeManager : MonoBehaviour
{
if (!onResult)
{
GameManager.Instance.SceneTransition("Result", true);
Destroy(GetComponent<InputManager>());
Destroy(GetComponent<MotionView>());
Destroy(GetComponent<CoordinateMapperManager>());
Destroy(this);
GameManager.Instance.SceneTransition("Result");
onResult = true;
}
}
private class NoteCondition
{
public static Dictionary<string, InputStatus> WrongInput(Note note)
private InputManager manager;
public NoteCondition(InputManager inputManager)
{
manager = inputManager;
}
public Dictionary<string, InputStatus> WrongInput(Note note)
{
if (note is MotionNote)
return new Dictionary<string, InputStatus>
{
{ "short", InputManager.Instance.ShortMotionStat },
{ "long", InputManager.Instance.LongMotionStat }
{ "short", manager.ShortButtonStat },
{ "long", manager.LongButtonStat }
};
return new Dictionary<string, InputStatus>
{
{ "short", InputManager.Instance.ShortButtonStat },
{ "long", InputManager.Instance.LongButtonStat }
{ "short", manager.ShortMotionStat },
{ "long", manager.LongMotionStat }
};
}
public static Dictionary<string, InputStatus> JudgeInput(Note note)
public Dictionary<string, InputStatus> JudgeInput(Note note)
{
if (note is MotionNote)
return new Dictionary<string, InputStatus>
{
{ "short", InputManager.Instance.ShortMotionToInput((note as MotionNote).MotionName) },
{ "long", InputManager.Instance.LongMotionToInput((note as MotionNote).MotionName) }
{ "short", manager.ShortMotionToInput((note as MotionNote).MotionName) },
{ "long", manager.LongMotionToInput((note as MotionNote).MotionName) }
};
return new Dictionary<string, InputStatus>
{
{ "short", InputManager.Instance.ShortButtonStat },
{ "long", InputManager.Instance.LongButtonStat }
{ "short", manager.ShortButtonStat },
{ "long", manager.LongButtonStat }
};
}
public static bool IsShortNoteEntered(Note note)
public bool IsShortNoteEntered(Note note)
{
return JudgeInput(note)["short"] == InputStatus.Entered;
}
public static bool IsLongNoteStartCorrectly(Note note)
public bool IsLongNoteStartCorrectly(Note note)
{
return JudgeInput(note)["long"] == InputStatus.Entered &&
!note.Activated;
}
public static bool IsLongNoteHoldCorrectly(Note note)
public bool IsLongNoteHoldCorrectly(Note note)
{
var stat = JudgeInput(note);
return (
......@@ -317,14 +335,14 @@ public class JudgeManager : MonoBehaviour
note.Activated;
}
public static bool IsLongNoteFinishCorrectly(Note note, float timing)
public bool IsLongNoteFinishCorrectly(Note note, float timing)
{
return JudgeInput(note)["long"] == InputStatus.Stopped &&
note.Activated &&
Judge.IsNoteEnd(note, timing);
}
public static bool IsLongNoteFinishIncorrectly(Note note, float timing)
public bool IsLongNoteFinishIncorrectly(Note note, float timing)
{
var stat = JudgeInput(note);
return stat["long"] == InputStatus.Stopped &&
......@@ -334,7 +352,7 @@ public class JudgeManager : MonoBehaviour
);
}
public static bool IsWrongInput(Note note)
public bool IsWrongInput(Note note)
{
var stat = WrongInput(note);
return stat["short"] == InputStatus.Entered ||
......@@ -342,7 +360,7 @@ public class JudgeManager : MonoBehaviour
stat["long"] == InputStatus.Continuing;
}
public static bool IsNoteBroken(Note note, float timing, Judge judge)
public bool IsNoteBroken(Note note, float timing, Judge judge)
{
return note.IsLong &&
!Judge.IsNoteEnd(note, timing) &&
......@@ -384,7 +402,7 @@ class MotionGageManager
public float UpdateTime()
{
elapsedTime += Time.deltaTime * 1000;
elapsedTime += (Time.deltaTime * 1000);
return elapsedTime;
}
......
......@@ -6,21 +6,39 @@ using System.Linq;
public class MotionView : MonoBehaviour
{
CoordinateMapperManager manager;
InputManager input;
IEnumerable<KinectModule.IBody> body;
MotionDiscriminator discriminator = new MotionDiscriminator();
bool IsInit;
// Use this for initialization
void Start ()
{
body = GameObject.Find("Managers").GetComponent<CoordinateMapperManager>().BodyBuffer;
IsInit = false;
discriminator.Preset(body.ToList()[0]);
var ingameManager = GameObject.Find("InGameManagers");
manager = ingameManager.GetComponent<CoordinateMapperManager>();
input = ingameManager.GetComponent<InputManager>();
}
// Update is called once per frame
void Update ()
{
InputManager.Instance.CurrentMotionState = DetermineState();
if (IsInit)
{
input.CurrentMotionState = DetermineState();
return;
}
body = manager.BodyBuffer;
var tmp = body.ToList()[0];
if (tmp != null)
{
discriminator.Preset(body.ToList()[0]);
IsInit = true;
}
}
MotionState DetermineState()
......
......@@ -9,33 +9,6 @@ using System;
// TODO: Change IMGUI to uGUI
public class CoordinateMapperManagerTests
{
// A UnityTest behaves like a coroutine in PlayMode
// and allows you to yield null to skip a frame in EditMode
[UnityTest]
public IEnumerator EmptyTest() {
// Use the Assert class to test conditions.
// yield to skip a frame
yield return null;
}
[UnityTest]
public IEnumerator NullFrame_GUI_Show_When_Kinect_Disconnected()
{
yield return null;
}
[UnityTest]
public IEnumerator FPS_GUI_Show_When_Kinect_Disconnected()
{
yield return null;
}
[UnityTest]
public IEnumerator FPS_GUI_Show_When_Kinect_Connected()
{
yield return null;
}
[UnityTest]
public IEnumerator ColorTexture_Not_Equal_Null_When_Kinect_Disconnected()
{
......
......@@ -41,7 +41,7 @@ class CoordinateMapperViewTests
CoordinateMapperManager CreateManager()
{
var manager = new GameObject("Managers");
var manager = new GameObject("InGameManagers");
return manager.AddComponent<CoordinateMapperManager>();
}
......
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using UnityEngine;
using UnityEngine.TestTools;
using NUnit.Framework;
using System.Collections;
// keyboard event => next frame => ButtonStat
class InputManagerTests
{
// A UnityTest behaves like a coroutine in PlayMode
// and allows you to yield null to skip a frame in EditMode
[UnityTest]
public IEnumerator EmptyTest()
{
// Use the Assert class to test conditions.
// yield to skip a frame
yield return null;
yield return null;
yield return null;
}
[UnityTest]
public IEnumerator ShortButtonStat_Equal_None_When_After_One_Keyboard_Event()
{
var obj = new GameObject();
yield return null;
}
}
fileFormatVersion: 2
guid: 6e827d1ccd3c1ee44931742328a640b3
timeCreated: 1516873575
licenseType: Free
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
......@@ -16,7 +16,7 @@ public class TrackInfo
public float BeatInterval
{ get { return 4 * 60 * 1000f / BPM; } }
public AudioSource BGM { get; private set; }
public string BGM { get; private set; }
public List<string> TrackList { get; private set; }
......@@ -151,7 +151,7 @@ internal class TrackHeader
public string Genre { get; private set; }
public float BPM { get; private set; }
public int Level { get; private set; }
public AudioSource BGM { get; private set; }
public string BGM { get; private set; }
public List<string> TrackList { get; private set; }
public
......@@ -175,11 +175,9 @@ internal class TrackHeader
TrackList = ExtractMetaList(
parseResult,
"#TRACKLIST");
BGM = Resources.Load(
ExtractMetaString(
BGM = ExtractMetaString(
parseResult,
"#WAV"))
as AudioSource;
"#WAV");
}
private
......
......@@ -41,7 +41,7 @@ public class TrackManager : MonoBehaviour {
}
bool IsPressedStart
{ get { return InputManager.Instance.ButtonStat == ButtonStatus.Pressed; } }
{ get { return Input.GetKey(KeyCode.Space); } }
// Use this for initialization
void Start()
......@@ -136,7 +136,6 @@ public class TrackManager : MonoBehaviour {
GameManager.Instance.CurrentTrack = selected.GetComponent<TrackInfoHolder>().trackInfo;
Destroy(GetComponent<InputManager>());
Destroy(this);
GameManager.Instance.SceneTransition("InGame");
......
......@@ -4,6 +4,8 @@
#BPM 128
#PLAYLEVEL 0
#WAV Bigroom1
#000SBT AA00
#004SBT AAAAAAAA
#005SBT AAAAAAAA
......
......@@ -8,5 +8,7 @@
#TRACKLIST Probably - Amumal
#TRACKLIST PARANOiA - Revolution
#WAV REC001
#002SMO JPJPJPJP
#003SMO JPJPJPJP
#TITLE test
#ARTIST asdf
#GENRE asdf
#BPM 120
#PLAYLEVEL 0
#000SBT 00AA00AA
#001SBT 00AA00AA
#002SBT 00AA00AA
#003SBT 00AA00AA
#004SBT 00AA00AA
#015SBT 00AA00AA
#025SBT 00AA00AA
#035SBT 00AA00AA
#045SBT 00AA00AA
#055SBT 00AA00AA
#065SBT 00AA00AA
#075SBT 00AA00AA
#085SBT 00AA00AA
#095SBT 00AA00AA
#105SBT 00AA00AA
#115SBT 00AA00AA
#125SBT 00AA00AA
#135SBT 00AA00AA
#145SBT 00AA00AA
#155SBT 00AA00AA
\ No newline at end of file
fileFormatVersion: 2
guid: 28b00014f89894a4b9eff7574541cf9c
timeCreated: 1516862638
licenseType: Free
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
......@@ -20,3 +20,6 @@ EditorBuildSettings:
- enabled: 1
path: Assets/Scene/Result.unity
guid: 610cc3a14d437e44bb9e6ba385e05136
- enabled: 1
path: Assets/Scene/tmp.unity
guid: bd1125abc59508941a9858dc3f08c1b7
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment