Skip to content

Commit 4473444

Browse files
committed
Added HasParameter collection
1 parent f2630f2 commit 4473444

24 files changed

+384
-4
lines changed

Assets/AdncAnimatorHelpers/Editor/Testing/AnimatorHelperRuntime.meta

Lines changed: 9 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Assets/AdncAnimatorHelpers/Editor/Testing/AnimatorStub/TestAnimatorStub.cs

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -132,5 +132,16 @@ public void PlayAdvancesToTheNextState () {
132132
var stateInfo = stub.Animator.GetCurrentAnimatorStateInfo(0);
133133
Assert.IsTrue(stateInfo.IsName(stateName));
134134
}
135+
136+
[Test]
137+
public void RuntimeControllerNameSameAsCreationName () {
138+
var stub = new AnimatorStub(_go);
139+
140+
stub.AnimatorCtrl.name = "asdf";
141+
stub.InjectCtrl();
142+
143+
Assert.AreEqual(stub.AnimatorCtrl.name, stub.Animator.runtimeAnimatorController.name);
144+
Assert.AreNotEqual(stub.Animator.gameObject.name, stub.Animator.runtimeAnimatorController.name);
145+
}
135146
}
136147
}
Lines changed: 196 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,196 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!29 &1
4+
OcclusionCullingSettings:
5+
m_ObjectHideFlags: 0
6+
serializedVersion: 2
7+
m_OcclusionBakeSettings:
8+
smallestOccluder: 5
9+
smallestHole: 0.25
10+
backfaceThreshold: 100
11+
m_SceneGUID: 00000000000000000000000000000000
12+
m_OcclusionCullingData: {fileID: 0}
13+
--- !u!104 &2
14+
RenderSettings:
15+
m_ObjectHideFlags: 0
16+
serializedVersion: 8
17+
m_Fog: 0
18+
m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
19+
m_FogMode: 3
20+
m_FogDensity: 0.01
21+
m_LinearFogStart: 0
22+
m_LinearFogEnd: 300
23+
m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1}
24+
m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1}
25+
m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1}
26+
m_AmbientIntensity: 1
27+
m_AmbientMode: 3
28+
m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1}
29+
m_SkyboxMaterial: {fileID: 0}
30+
m_HaloStrength: 0.5
31+
m_FlareStrength: 1
32+
m_FlareFadeSpeed: 3
33+
m_HaloTexture: {fileID: 0}
34+
m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0}
35+
m_DefaultReflectionMode: 0
36+
m_DefaultReflectionResolution: 128
37+
m_ReflectionBounces: 1
38+
m_ReflectionIntensity: 1
39+
m_CustomReflection: {fileID: 0}
40+
m_Sun: {fileID: 0}
41+
m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1}
42+
--- !u!157 &3
43+
LightmapSettings:
44+
m_ObjectHideFlags: 0
45+
serializedVersion: 11
46+
m_GIWorkflowMode: 1
47+
m_GISettings:
48+
serializedVersion: 2
49+
m_BounceScale: 1
50+
m_IndirectOutputScale: 1
51+
m_AlbedoBoost: 1
52+
m_TemporalCoherenceThreshold: 1
53+
m_EnvironmentLightingMode: 0
54+
m_EnableBakedLightmaps: 0
55+
m_EnableRealtimeLightmaps: 0
56+
m_LightmapEditorSettings:
57+
serializedVersion: 9
58+
m_Resolution: 2
59+
m_BakeResolution: 40
60+
m_TextureWidth: 1024
61+
m_TextureHeight: 1024
62+
m_AO: 0
63+
m_AOMaxDistance: 1
64+
m_CompAOExponent: 1
65+
m_CompAOExponentDirect: 0
66+
m_Padding: 2
67+
m_LightmapParameters: {fileID: 0}
68+
m_LightmapsBakeMode: 1
69+
m_TextureCompression: 1
70+
m_FinalGather: 0
71+
m_FinalGatherFiltering: 1
72+
m_FinalGatherRayCount: 256
73+
m_ReflectionCompression: 2
74+
m_MixedBakeMode: 2
75+
m_BakeBackend: 0
76+
m_PVRSampling: 1
77+
m_PVRDirectSampleCount: 32
78+
m_PVRSampleCount: 500
79+
m_PVRBounces: 2
80+
m_PVRFilterTypeDirect: 0
81+
m_PVRFilterTypeIndirect: 0
82+
m_PVRFilterTypeAO: 0
83+
m_PVRFilteringMode: 1
84+
m_PVRCulling: 1
85+
m_PVRFilteringGaussRadiusDirect: 1
86+
m_PVRFilteringGaussRadiusIndirect: 5
87+
m_PVRFilteringGaussRadiusAO: 2
88+
m_PVRFilteringAtrousPositionSigmaDirect: 0.5
89+
m_PVRFilteringAtrousPositionSigmaIndirect: 2
90+
m_PVRFilteringAtrousPositionSigmaAO: 1
91+
m_ShowResolutionOverlay: 1
92+
m_LightingDataAsset: {fileID: 0}
93+
m_UseShadowmask: 1
94+
--- !u!196 &4
95+
NavMeshSettings:
96+
serializedVersion: 2
97+
m_ObjectHideFlags: 0
98+
m_BuildSettings:
99+
serializedVersion: 2
100+
agentTypeID: 0
101+
agentRadius: 0.5
102+
agentHeight: 2
103+
agentSlope: 45
104+
agentClimb: 0.4
105+
ledgeDropHeight: 0
106+
maxJumpAcrossDistance: 0
107+
minRegionArea: 2
108+
manualCellSize: 0
109+
cellSize: 0.16666667
110+
manualTileSize: 0
111+
tileSize: 256
112+
accuratePlacement: 0
113+
debug:
114+
m_Flags: 0
115+
m_NavMeshData: {fileID: 0}
116+
--- !u!1 &438768990
117+
GameObject:
118+
m_ObjectHideFlags: 0
119+
m_PrefabParentObject: {fileID: 0}
120+
m_PrefabInternal: {fileID: 0}
121+
serializedVersion: 5
122+
m_Component:
123+
- component: {fileID: 438768994}
124+
- component: {fileID: 438768993}
125+
- component: {fileID: 438768992}
126+
- component: {fileID: 438768991}
127+
m_Layer: 0
128+
m_Name: Main Camera
129+
m_TagString: MainCamera
130+
m_Icon: {fileID: 0}
131+
m_NavMeshLayer: 0
132+
m_StaticEditorFlags: 0
133+
m_IsActive: 1
134+
--- !u!81 &438768991
135+
AudioListener:
136+
m_ObjectHideFlags: 0
137+
m_PrefabParentObject: {fileID: 0}
138+
m_PrefabInternal: {fileID: 0}
139+
m_GameObject: {fileID: 438768990}
140+
m_Enabled: 1
141+
--- !u!124 &438768992
142+
Behaviour:
143+
m_ObjectHideFlags: 0
144+
m_PrefabParentObject: {fileID: 0}
145+
m_PrefabInternal: {fileID: 0}
146+
m_GameObject: {fileID: 438768990}
147+
m_Enabled: 1
148+
--- !u!20 &438768993
149+
Camera:
150+
m_ObjectHideFlags: 0
151+
m_PrefabParentObject: {fileID: 0}
152+
m_PrefabInternal: {fileID: 0}
153+
m_GameObject: {fileID: 438768990}
154+
m_Enabled: 1
155+
serializedVersion: 2
156+
m_ClearFlags: 1
157+
m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0}
158+
m_NormalizedViewPortRect:
159+
serializedVersion: 2
160+
x: 0
161+
y: 0
162+
width: 1
163+
height: 1
164+
near clip plane: 0.3
165+
far clip plane: 1000
166+
field of view: 60
167+
orthographic: 1
168+
orthographic size: 5
169+
m_Depth: -1
170+
m_CullingMask:
171+
serializedVersion: 2
172+
m_Bits: 4294967295
173+
m_RenderingPath: -1
174+
m_TargetTexture: {fileID: 0}
175+
m_TargetDisplay: 0
176+
m_TargetEye: 3
177+
m_HDR: 1
178+
m_AllowMSAA: 1
179+
m_AllowDynamicResolution: 0
180+
m_ForceIntoRT: 0
181+
m_OcclusionCulling: 1
182+
m_StereoConvergence: 10
183+
m_StereoSeparation: 0.022
184+
--- !u!4 &438768994
185+
Transform:
186+
m_ObjectHideFlags: 0
187+
m_PrefabParentObject: {fileID: 0}
188+
m_PrefabInternal: {fileID: 0}
189+
m_GameObject: {fileID: 438768990}
190+
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
191+
m_LocalPosition: {x: 0, y: 0, z: -10}
192+
m_LocalScale: {x: 1, y: 1, z: 1}
193+
m_Children: []
194+
m_Father: {fileID: 0}
195+
m_RootOrder: 0
196+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}

Assets/AdncAnimatorHelpers/Examples/AnimatorHas/AnimatorHas.unity.meta

Lines changed: 9 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Assets/AdncAnimatorHelpers/Scripts/AnimatorHelperManager/AnimatorHelperManager.cs

Lines changed: 0 additions & 4 deletions
This file was deleted.
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
using Adnc.AnimatorHelpers.HasParameters;
2+
3+
namespace Adnc.AnimatorHelpers {
4+
public class AnimatorHelperRuntime : Singleton<AnimatorHelperRuntime> {
5+
public AnimatorParametersCollection parameters = new AnimatorParametersCollection();
6+
}
7+
}

0 commit comments

Comments
 (0)