Skip to content
This repository has been archived by the owner on Jan 5, 2022. It is now read-only.

Commit

Permalink
Hopefully fixed the weird 0.5 returns on triggers in OS X for once an…
Browse files Browse the repository at this point in the history
…d for all. See Issue #16
  • Loading branch information
Jibran Ibrahim Syed committed Jan 29, 2016
1 parent 57c0737 commit 146c006
Show file tree
Hide file tree
Showing 3 changed files with 189 additions and 130 deletions.
68 changes: 31 additions & 37 deletions XboxCtrlrInput/Assets/XboxCtrlrInput/Example/XCI_Test_Room.unity
100755 → 100644
Original file line number Diff line number Diff line change
Expand Up @@ -8,25 +8,25 @@ SceneSettings:
m_PVSPortalsArray: []
m_OcclusionBakeSettings:
smallestOccluder: 5
smallestHole: 0.25
smallestHole: .25
backfaceThreshold: 100
--- !u!104 &2
RenderSettings:
m_ObjectHideFlags: 0
serializedVersion: 6
m_Fog: 0
m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
m_FogColor: {r: .5, g: .5, b: .5, a: 1}
m_FogMode: 3
m_FogDensity: 0.01
m_FogDensity: .00999999978
m_LinearFogStart: 0
m_LinearFogEnd: 300
m_AmbientSkyColor: {r: 0.2, g: 0.2, b: 0.2, a: 1}
m_AmbientEquatorColor: {r: 0.2, g: 0.2, b: 0.2, a: 1}
m_AmbientGroundColor: {r: 0.2, g: 0.2, b: 0.2, a: 1}
m_AmbientSkyColor: {r: .200000003, g: .200000003, b: .200000003, a: 1}
m_AmbientEquatorColor: {r: .200000003, g: .200000003, b: .200000003, a: 1}
m_AmbientGroundColor: {r: .200000003, g: .200000003, b: .200000003, a: 1}
m_AmbientIntensity: 1
m_AmbientMode: 3
m_SkyboxMaterial: {fileID: 0}
m_HaloStrength: 0.5
m_HaloStrength: .5
m_FlareStrength: 1
m_FlareFadeSpeed: 3
m_HaloTexture: {fileID: 0}
Expand All @@ -40,7 +40,7 @@ RenderSettings:
--- !u!157 &4
LightmapSettings:
m_ObjectHideFlags: 0
serializedVersion: 6
serializedVersion: 5
m_GIWorkflowMode: 1
m_LightmapsMode: 1
m_GISettings:
Expand All @@ -66,23 +66,23 @@ LightmapSettings:
m_FinalGather: 0
m_FinalGatherRayCount: 1024
m_ReflectionCompression: 2
m_LightingDataAsset: {fileID: 0}
m_LightmapSnapshot: {fileID: 0}
m_RuntimeCPUUsage: 25
--- !u!196 &5
NavMeshSettings:
serializedVersion: 2
m_ObjectHideFlags: 0
m_BuildSettings:
serializedVersion: 2
agentRadius: 0.5
agentRadius: .5
agentHeight: 2
agentSlope: 45
agentClimb: 0.4
agentClimb: .400000006
ledgeDropHeight: 0
maxJumpAcrossDistance: 0
accuratePlacement: 0
minRegionArea: 2
cellSize: 0.16666666
cellSize: .166666657
manualCellSize: 0
m_NavMeshData: {fileID: 0}
--- !u!1 &33521087
Expand All @@ -107,8 +107,8 @@ Transform:
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 33521087}
m_LocalRotation: {x: 0.40821794, y: -0.23456973, z: 0.10938166, w: 0.8754261}
m_LocalPosition: {x: -16.396423, y: 12.6382885, z: 2.1403723}
m_LocalRotation: {x: .408217937, y: -.234569728, z: .109381661, w: .875426114}
m_LocalPosition: {x: -16.3964233, y: 12.6382885, z: 2.14037228}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 1147984942}
Expand All @@ -123,17 +123,16 @@ Light:
serializedVersion: 6
m_Type: 1
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_Intensity: 0.5
m_Intensity: .5
m_Range: 10
m_SpotAngle: 30
m_CookieSize: 10
m_Shadows:
m_Type: 0
m_Resolution: -1
m_Strength: 1
m_Bias: 0.05
m_NormalBias: 0.4
m_NearPlane: 0.2
m_Bias: .0500000007
m_NormalBias: .400000006
m_Cookie: {fileID: 0}
m_DrawHalo: 0
m_Flare: {fileID: 0}
Expand Down Expand Up @@ -195,14 +194,14 @@ Camera:
m_Enabled: 1
serializedVersion: 2
m_ClearFlags: 1
m_BackGroundColor: {r: 0.19852942, g: 0.19852942, b: 0.19852942, a: 0.019607844}
m_BackGroundColor: {r: .198529422, g: .198529422, b: .198529422, a: .0196078438}
m_NormalizedViewPortRect:
serializedVersion: 2
x: 0
y: 0
width: 1
height: 1
near clip plane: 0.3
near clip plane: .300000012
far clip plane: 1000
field of view: 60
orthographic: 0
Expand All @@ -218,16 +217,16 @@ Camera:
m_HDR: 0
m_OcclusionCulling: 1
m_StereoConvergence: 10
m_StereoSeparation: 0.022
m_StereoSeparation: .0219999999
m_StereoMirrorMode: 0
--- !u!4 &302288837
Transform:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 302288832}
m_LocalRotation: {x: 0.39347175, y: 0, z: 0, w: 0.91933674}
m_LocalPosition: {x: 0, y: 11.935877, z: -15.6521845}
m_LocalRotation: {x: .393471748, y: 0, z: 0, w: .919336736}
m_LocalPosition: {x: 0, y: 11.9358768, z: -15.6521845}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 1147984942}
Expand Down Expand Up @@ -448,8 +447,8 @@ Transform:
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1213290086}
m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068}
m_LocalPosition: {x: -13.679663, y: 13.797859, z: -0.7103462}
m_LocalRotation: {x: .707106829, y: 0, z: 0, w: .707106829}
m_LocalPosition: {x: -13.6796627, y: 13.7978592, z: -.710346222}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 1147984942}
Expand All @@ -464,7 +463,7 @@ Light:
serializedVersion: 6
m_Type: 1
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_Intensity: 0.2
m_Intensity: .200000003
m_Range: 10
m_SpotAngle: 30
m_CookieSize: 10
Expand All @@ -473,8 +472,7 @@ Light:
m_Resolution: -1
m_Strength: 1
m_Bias: 0
m_NormalBias: 0.4
m_NearPlane: 0.2
m_NormalBias: .400000006
m_Cookie: {fileID: 0}
m_DrawHalo: 0
m_Flare: {fileID: 0}
Expand Down Expand Up @@ -512,8 +510,8 @@ Transform:
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1373158983}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: -11.711365, z: 0}
m_LocalScale: {x: 100, y: 0.5, z: 100}
m_LocalPosition: {x: 0, y: -11.7113647, z: 0}
m_LocalScale: {x: 100, y: .5, z: 100}
m_Children: []
m_Father: {fileID: 1147984942}
m_RootOrder: 3
Expand All @@ -535,10 +533,8 @@ MeshRenderer:
m_ProbeAnchor: {fileID: 0}
m_ScaleInLightmap: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxDistance: .5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
Expand Down Expand Up @@ -638,7 +634,7 @@ Transform:
m_GameObject: {fileID: 2007729798}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 20, y: 0.5, z: 20}
m_LocalScale: {x: 20, y: .5, z: 20}
m_Children: []
m_Father: {fileID: 1147984942}
m_RootOrder: 4
Expand All @@ -660,10 +656,8 @@ MeshRenderer:
m_ProbeAnchor: {fileID: 0}
m_ScaleInLightmap: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxDistance: .5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
Expand Down
Loading

0 comments on commit 146c006

Please sign in to comment.