Skip to content

Commit f885016

Browse files
committed
Merge branch 'feature/slow-down-visualizer-fade' into develop
2 parents dc8d062 + 2ac0711 commit f885016

File tree

6 files changed

+439
-3
lines changed

6 files changed

+439
-3
lines changed

Assets/FluidBehaviorTree/Editor/BehaviorTree/Printer/Graphics/ColorFader.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
namespace CleverCrow.Fluid.BTs.Trees.Editors {
44
public class ColorFader {
5-
const float FADE_DURATION = 0.5f;
5+
const float FADE_DURATION = 0.8f;
66

77
private float _fadeTime;
88
private readonly Color _startColor;
@@ -24,8 +24,8 @@ public void Update (bool reset) {
2424
}
2525

2626
CurrentColor = Color.Lerp(
27-
_startColor,
28-
_endColor,
27+
_startColor,
28+
_endColor,
2929
_fadeTime / FADE_DURATION);
3030
}
3131
}

Assets/Samples.meta

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

Assets/Samples/TreeSample.unity

Lines changed: 340 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,340 @@
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: 9
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: 0
28+
m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1}
29+
m_SkyboxMaterial: {fileID: 10304, guid: 0000000000000000f000000000000000, type: 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+
m_UseRadianceAmbientProbe: 0
43+
--- !u!157 &3
44+
LightmapSettings:
45+
m_ObjectHideFlags: 0
46+
serializedVersion: 11
47+
m_GIWorkflowMode: 1
48+
m_GISettings:
49+
serializedVersion: 2
50+
m_BounceScale: 1
51+
m_IndirectOutputScale: 1
52+
m_AlbedoBoost: 1
53+
m_EnvironmentLightingMode: 0
54+
m_EnableBakedLightmaps: 1
55+
m_EnableRealtimeLightmaps: 1
56+
m_LightmapEditorSettings:
57+
serializedVersion: 12
58+
m_Resolution: 2
59+
m_BakeResolution: 40
60+
m_AtlasSize: 1024
61+
m_AO: 0
62+
m_AOMaxDistance: 1
63+
m_CompAOExponent: 1
64+
m_CompAOExponentDirect: 0
65+
m_ExtractAmbientOcclusion: 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: 1
76+
m_PVRSampling: 1
77+
m_PVRDirectSampleCount: 32
78+
m_PVRSampleCount: 512
79+
m_PVRBounces: 2
80+
m_PVREnvironmentSampleCount: 256
81+
m_PVREnvironmentReferencePointCount: 2048
82+
m_PVRFilteringMode: 1
83+
m_PVRDenoiserTypeDirect: 1
84+
m_PVRDenoiserTypeIndirect: 1
85+
m_PVRDenoiserTypeAO: 1
86+
m_PVRFilterTypeDirect: 0
87+
m_PVRFilterTypeIndirect: 0
88+
m_PVRFilterTypeAO: 0
89+
m_PVREnvironmentMIS: 1
90+
m_PVRCulling: 1
91+
m_PVRFilteringGaussRadiusDirect: 1
92+
m_PVRFilteringGaussRadiusIndirect: 5
93+
m_PVRFilteringGaussRadiusAO: 2
94+
m_PVRFilteringAtrousPositionSigmaDirect: 0.5
95+
m_PVRFilteringAtrousPositionSigmaIndirect: 2
96+
m_PVRFilteringAtrousPositionSigmaAO: 1
97+
m_ShowResolutionOverlay: 1
98+
m_ExportTrainingData: 0
99+
m_LightingDataAsset: {fileID: 0}
100+
m_UseShadowmask: 1
101+
--- !u!196 &4
102+
NavMeshSettings:
103+
serializedVersion: 2
104+
m_ObjectHideFlags: 0
105+
m_BuildSettings:
106+
serializedVersion: 2
107+
agentTypeID: 0
108+
agentRadius: 0.5
109+
agentHeight: 2
110+
agentSlope: 45
111+
agentClimb: 0.4
112+
ledgeDropHeight: 0
113+
maxJumpAcrossDistance: 0
114+
minRegionArea: 2
115+
manualCellSize: 0
116+
cellSize: 0.16666667
117+
manualTileSize: 0
118+
tileSize: 256
119+
accuratePlacement: 0
120+
debug:
121+
m_Flags: 0
122+
m_NavMeshData: {fileID: 0}
123+
--- !u!1 &294120166
124+
GameObject:
125+
m_ObjectHideFlags: 0
126+
m_CorrespondingSourceObject: {fileID: 0}
127+
m_PrefabInstance: {fileID: 0}
128+
m_PrefabAsset: {fileID: 0}
129+
serializedVersion: 6
130+
m_Component:
131+
- component: {fileID: 294120168}
132+
- component: {fileID: 294120167}
133+
m_Layer: 0
134+
m_Name: Directional Light
135+
m_TagString: Untagged
136+
m_Icon: {fileID: 0}
137+
m_NavMeshLayer: 0
138+
m_StaticEditorFlags: 0
139+
m_IsActive: 1
140+
--- !u!108 &294120167
141+
Light:
142+
m_ObjectHideFlags: 0
143+
m_CorrespondingSourceObject: {fileID: 0}
144+
m_PrefabInstance: {fileID: 0}
145+
m_PrefabAsset: {fileID: 0}
146+
m_GameObject: {fileID: 294120166}
147+
m_Enabled: 1
148+
serializedVersion: 9
149+
m_Type: 1
150+
m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1}
151+
m_Intensity: 1
152+
m_Range: 10
153+
m_SpotAngle: 30
154+
m_InnerSpotAngle: 21.80208
155+
m_CookieSize: 10
156+
m_Shadows:
157+
m_Type: 2
158+
m_Resolution: -1
159+
m_CustomResolution: -1
160+
m_Strength: 1
161+
m_Bias: 0.05
162+
m_NormalBias: 0.4
163+
m_NearPlane: 0.2
164+
m_CullingMatrixOverride:
165+
e00: 1
166+
e01: 0
167+
e02: 0
168+
e03: 0
169+
e10: 0
170+
e11: 1
171+
e12: 0
172+
e13: 0
173+
e20: 0
174+
e21: 0
175+
e22: 1
176+
e23: 0
177+
e30: 0
178+
e31: 0
179+
e32: 0
180+
e33: 1
181+
m_UseCullingMatrixOverride: 0
182+
m_Cookie: {fileID: 0}
183+
m_DrawHalo: 0
184+
m_Flare: {fileID: 0}
185+
m_RenderMode: 0
186+
m_CullingMask:
187+
serializedVersion: 2
188+
m_Bits: 4294967295
189+
m_RenderingLayerMask: 1
190+
m_Lightmapping: 4
191+
m_LightShadowCasterMode: 0
192+
m_AreaSize: {x: 1, y: 1}
193+
m_BounceIntensity: 1
194+
m_ColorTemperature: 6570
195+
m_UseColorTemperature: 0
196+
m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0}
197+
m_UseBoundingSphereOverride: 0
198+
m_ShadowRadius: 0
199+
m_ShadowAngle: 0
200+
--- !u!4 &294120168
201+
Transform:
202+
m_ObjectHideFlags: 0
203+
m_CorrespondingSourceObject: {fileID: 0}
204+
m_PrefabInstance: {fileID: 0}
205+
m_PrefabAsset: {fileID: 0}
206+
m_GameObject: {fileID: 294120166}
207+
m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261}
208+
m_LocalPosition: {x: 0, y: 3, z: 0}
209+
m_LocalScale: {x: 1, y: 1, z: 1}
210+
m_Children: []
211+
m_Father: {fileID: 0}
212+
m_RootOrder: 1
213+
m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0}
214+
--- !u!1 &322793818
215+
GameObject:
216+
m_ObjectHideFlags: 0
217+
m_CorrespondingSourceObject: {fileID: 0}
218+
m_PrefabInstance: {fileID: 0}
219+
m_PrefabAsset: {fileID: 0}
220+
serializedVersion: 6
221+
m_Component:
222+
- component: {fileID: 322793821}
223+
- component: {fileID: 322793820}
224+
- component: {fileID: 322793819}
225+
m_Layer: 0
226+
m_Name: Main Camera
227+
m_TagString: MainCamera
228+
m_Icon: {fileID: 0}
229+
m_NavMeshLayer: 0
230+
m_StaticEditorFlags: 0
231+
m_IsActive: 1
232+
--- !u!81 &322793819
233+
AudioListener:
234+
m_ObjectHideFlags: 0
235+
m_CorrespondingSourceObject: {fileID: 0}
236+
m_PrefabInstance: {fileID: 0}
237+
m_PrefabAsset: {fileID: 0}
238+
m_GameObject: {fileID: 322793818}
239+
m_Enabled: 1
240+
--- !u!20 &322793820
241+
Camera:
242+
m_ObjectHideFlags: 0
243+
m_CorrespondingSourceObject: {fileID: 0}
244+
m_PrefabInstance: {fileID: 0}
245+
m_PrefabAsset: {fileID: 0}
246+
m_GameObject: {fileID: 322793818}
247+
m_Enabled: 1
248+
serializedVersion: 2
249+
m_ClearFlags: 1
250+
m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0}
251+
m_projectionMatrixMode: 1
252+
m_GateFitMode: 2
253+
m_FOVAxisMode: 0
254+
m_SensorSize: {x: 36, y: 24}
255+
m_LensShift: {x: 0, y: 0}
256+
m_FocalLength: 50
257+
m_NormalizedViewPortRect:
258+
serializedVersion: 2
259+
x: 0
260+
y: 0
261+
width: 1
262+
height: 1
263+
near clip plane: 0.3
264+
far clip plane: 1000
265+
field of view: 60
266+
orthographic: 0
267+
orthographic size: 5
268+
m_Depth: -1
269+
m_CullingMask:
270+
serializedVersion: 2
271+
m_Bits: 4294967295
272+
m_RenderingPath: -1
273+
m_TargetTexture: {fileID: 0}
274+
m_TargetDisplay: 0
275+
m_TargetEye: 3
276+
m_HDR: 1
277+
m_AllowMSAA: 1
278+
m_AllowDynamicResolution: 0
279+
m_ForceIntoRT: 0
280+
m_OcclusionCulling: 1
281+
m_StereoConvergence: 10
282+
m_StereoSeparation: 0.022
283+
--- !u!4 &322793821
284+
Transform:
285+
m_ObjectHideFlags: 0
286+
m_CorrespondingSourceObject: {fileID: 0}
287+
m_PrefabInstance: {fileID: 0}
288+
m_PrefabAsset: {fileID: 0}
289+
m_GameObject: {fileID: 322793818}
290+
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
291+
m_LocalPosition: {x: 0, y: 1, z: -10}
292+
m_LocalScale: {x: 1, y: 1, z: 1}
293+
m_Children: []
294+
m_Father: {fileID: 0}
295+
m_RootOrder: 0
296+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
297+
--- !u!1 &343368638
298+
GameObject:
299+
m_ObjectHideFlags: 0
300+
m_CorrespondingSourceObject: {fileID: 0}
301+
m_PrefabInstance: {fileID: 0}
302+
m_PrefabAsset: {fileID: 0}
303+
serializedVersion: 6
304+
m_Component:
305+
- component: {fileID: 343368640}
306+
- component: {fileID: 343368639}
307+
m_Layer: 0
308+
m_Name: BehaviorTree
309+
m_TagString: Untagged
310+
m_Icon: {fileID: 0}
311+
m_NavMeshLayer: 0
312+
m_StaticEditorFlags: 0
313+
m_IsActive: 1
314+
--- !u!114 &343368639
315+
MonoBehaviour:
316+
m_ObjectHideFlags: 0
317+
m_CorrespondingSourceObject: {fileID: 0}
318+
m_PrefabInstance: {fileID: 0}
319+
m_PrefabAsset: {fileID: 0}
320+
m_GameObject: {fileID: 343368638}
321+
m_Enabled: 1
322+
m_EditorHideFlags: 0
323+
m_Script: {fileID: 11500000, guid: 15c337f737b8d1a49bf9d1bb5bcb77a8, type: 3}
324+
m_Name:
325+
m_EditorClassIdentifier:
326+
_condition: 0
327+
--- !u!4 &343368640
328+
Transform:
329+
m_ObjectHideFlags: 0
330+
m_CorrespondingSourceObject: {fileID: 0}
331+
m_PrefabInstance: {fileID: 0}
332+
m_PrefabAsset: {fileID: 0}
333+
m_GameObject: {fileID: 343368638}
334+
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
335+
m_LocalPosition: {x: 0, y: 0, z: 0}
336+
m_LocalScale: {x: 1, y: 1, z: 1}
337+
m_Children: []
338+
m_Father: {fileID: 0}
339+
m_RootOrder: 2
340+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}

Assets/Samples/TreeSample.unity.meta

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

0 commit comments

Comments
 (0)