Skip to content

Commit cfa0f26

Browse files
committed
Cleanup in preparation for asset store
1 parent 4f208b7 commit cfa0f26

9 files changed

+315
-20
lines changed

Diff for: UnityProject/Assets/AsyncUtil/Tests/AsyncUtilTests.cs

-20
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
using System.Diagnostics;
55
using System.Threading;
66
using System.Threading.Tasks;
7-
using UniRx;
87
using UnityEngine;
98
using UnityEngine.Networking;
109
using Debug = UnityEngine.Debug;
@@ -16,8 +15,6 @@ public class AsyncUtilTests : MonoBehaviour
1615
const string AssetBundleSampleUrl = "http://www.stevevermeulen.com/wp-content/uploads/2017/09/teapot.unity3d";
1716
const string AssetBundleSampleAssetName = "Teapot";
1817

19-
Subject<string> _signal = new Subject<string>();
20-
2118
[SerializeField]
2219
TestButtonHandler.Settings _buttonSettings = null;
2320

@@ -83,16 +80,6 @@ public void OnGUI()
8380
RunAsyncOperationAsync().WrapErrors();
8481
}
8582

86-
if (_buttonHandler.Display("Test UniRx observable"))
87-
{
88-
RunUniRxTestAsync().WrapErrors();
89-
}
90-
91-
if (_buttonHandler.Display("Trigger UniRx observable"))
92-
{
93-
_signal.OnNext("zcvd");
94-
}
95-
9683
if (_buttonHandler.Display("Test opening notepad"))
9784
{
9885
RunOpenNotepadTestAsync().WrapErrors();
@@ -297,13 +284,6 @@ IEnumerator WaitABit()
297284
yield return new WaitForSeconds(1.5f);
298285
}
299286

300-
async Task RunUniRxTestAsync()
301-
{
302-
Debug.Log("Waiting for UniRx trigger...");
303-
var result = await _signal;
304-
Debug.Log("Received UniRx trigger with value: " + result);
305-
}
306-
307287
async Task RunReturnValueTestAsync()
308288
{
309289
Debug.Log("Waiting to get value...");

Diff for: UnityProject/Assets/AsyncUtil/UniRx.meta

+9
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: UnityProject/Assets/AsyncUtil/UniRx/Tests.meta

+9
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
+38
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
using System;
2+
using System.Collections;
3+
using System.Collections.Generic;
4+
using System.Diagnostics;
5+
using System.Threading;
6+
using System.Threading.Tasks;
7+
using UniRx;
8+
using UnityEngine;
9+
using UnityEngine.Networking;
10+
using Debug = UnityEngine.Debug;
11+
12+
namespace UnityAsyncAwaitUtil
13+
{
14+
public class UniRxTests : MonoBehaviour
15+
{
16+
Subject<string> _signal = new Subject<string>();
17+
18+
public void OnGUI()
19+
{
20+
if (GUI.Button(new Rect(100, 100, 500, 100), "Test UniRx observable"))
21+
{
22+
RunUniRxTestAsync().WrapErrors();
23+
}
24+
25+
if (GUI.Button(new Rect(100, 300, 500, 100), "Trigger UniRx observable"))
26+
{
27+
_signal.OnNext("zcvd");
28+
}
29+
}
30+
31+
async Task RunUniRxTestAsync()
32+
{
33+
Debug.Log("Waiting for UniRx trigger...");
34+
var result = await _signal;
35+
Debug.Log("Received UniRx trigger with value: " + result);
36+
}
37+
}
38+
}

Diff for: UnityProject/Assets/AsyncUtil/UniRx/Tests/UniRxTests.cs.meta

+12
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
+239
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,239 @@
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: 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.37311992, g: 0.38074034, b: 0.35872713, a: 1}
42+
--- !u!157 &3
43+
LightmapSettings:
44+
m_ObjectHideFlags: 0
45+
serializedVersion: 11
46+
m_GIWorkflowMode: 0
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: 1
55+
m_EnableRealtimeLightmaps: 1
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_PVRFiltering: 0
81+
m_PVRFilteringMode: 1
82+
m_PVRCulling: 1
83+
m_PVRFilteringGaussRadiusDirect: 1
84+
m_PVRFilteringGaussRadiusIndirect: 5
85+
m_PVRFilteringGaussRadiusAO: 2
86+
m_PVRFilteringAtrousColorSigma: 1
87+
m_PVRFilteringAtrousNormalSigma: 1
88+
m_PVRFilteringAtrousPositionSigma: 1
89+
m_LightingDataAsset: {fileID: 0}
90+
m_UseShadowmask: 1
91+
--- !u!196 &4
92+
NavMeshSettings:
93+
serializedVersion: 2
94+
m_ObjectHideFlags: 0
95+
m_BuildSettings:
96+
serializedVersion: 2
97+
agentTypeID: 0
98+
agentRadius: 0.5
99+
agentHeight: 2
100+
agentSlope: 45
101+
agentClimb: 0.4
102+
ledgeDropHeight: 0
103+
maxJumpAcrossDistance: 0
104+
minRegionArea: 2
105+
manualCellSize: 0
106+
cellSize: 0.16666667
107+
manualTileSize: 0
108+
tileSize: 256
109+
accuratePlacement: 0
110+
m_NavMeshData: {fileID: 0}
111+
--- !u!1 &872110973
112+
GameObject:
113+
m_ObjectHideFlags: 0
114+
m_PrefabParentObject: {fileID: 0}
115+
m_PrefabInternal: {fileID: 0}
116+
serializedVersion: 5
117+
m_Component:
118+
- component: {fileID: 872110978}
119+
- component: {fileID: 872110977}
120+
- component: {fileID: 872110976}
121+
- component: {fileID: 872110975}
122+
- component: {fileID: 872110974}
123+
m_Layer: 0
124+
m_Name: Camera
125+
m_TagString: Untagged
126+
m_Icon: {fileID: 0}
127+
m_NavMeshLayer: 0
128+
m_StaticEditorFlags: 0
129+
m_IsActive: 1
130+
--- !u!81 &872110974
131+
AudioListener:
132+
m_ObjectHideFlags: 0
133+
m_PrefabParentObject: {fileID: 0}
134+
m_PrefabInternal: {fileID: 0}
135+
m_GameObject: {fileID: 872110973}
136+
m_Enabled: 1
137+
--- !u!92 &872110975
138+
Behaviour:
139+
m_ObjectHideFlags: 0
140+
m_PrefabParentObject: {fileID: 0}
141+
m_PrefabInternal: {fileID: 0}
142+
m_GameObject: {fileID: 872110973}
143+
m_Enabled: 1
144+
--- !u!124 &872110976
145+
Behaviour:
146+
m_ObjectHideFlags: 0
147+
m_PrefabParentObject: {fileID: 0}
148+
m_PrefabInternal: {fileID: 0}
149+
m_GameObject: {fileID: 872110973}
150+
m_Enabled: 1
151+
--- !u!20 &872110977
152+
Camera:
153+
m_ObjectHideFlags: 0
154+
m_PrefabParentObject: {fileID: 0}
155+
m_PrefabInternal: {fileID: 0}
156+
m_GameObject: {fileID: 872110973}
157+
m_Enabled: 1
158+
serializedVersion: 2
159+
m_ClearFlags: 2
160+
m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0}
161+
m_NormalizedViewPortRect:
162+
serializedVersion: 2
163+
x: 0
164+
y: 0
165+
width: 1
166+
height: 1
167+
near clip plane: 0.3
168+
far clip plane: 1000
169+
field of view: 60
170+
orthographic: 0
171+
orthographic size: 5
172+
m_Depth: 0
173+
m_CullingMask:
174+
serializedVersion: 2
175+
m_Bits: 4294967295
176+
m_RenderingPath: -1
177+
m_TargetTexture: {fileID: 0}
178+
m_TargetDisplay: 0
179+
m_TargetEye: 3
180+
m_HDR: 1
181+
m_AllowMSAA: 1
182+
m_ForceIntoRT: 0
183+
m_OcclusionCulling: 1
184+
m_StereoConvergence: 10
185+
m_StereoSeparation: 0.022
186+
m_StereoMirrorMode: 0
187+
--- !u!4 &872110978
188+
Transform:
189+
m_ObjectHideFlags: 0
190+
m_PrefabParentObject: {fileID: 0}
191+
m_PrefabInternal: {fileID: 0}
192+
m_GameObject: {fileID: 872110973}
193+
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
194+
m_LocalPosition: {x: 0, y: 0, z: 0}
195+
m_LocalScale: {x: 1, y: 1, z: 1}
196+
m_Children: []
197+
m_Father: {fileID: 0}
198+
m_RootOrder: 1
199+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
200+
--- !u!1 &1790199439
201+
GameObject:
202+
m_ObjectHideFlags: 0
203+
m_PrefabParentObject: {fileID: 0}
204+
m_PrefabInternal: {fileID: 0}
205+
serializedVersion: 5
206+
m_Component:
207+
- component: {fileID: 1790199441}
208+
- component: {fileID: 1790199440}
209+
m_Layer: 0
210+
m_Name: Runner
211+
m_TagString: Untagged
212+
m_Icon: {fileID: 0}
213+
m_NavMeshLayer: 0
214+
m_StaticEditorFlags: 0
215+
m_IsActive: 1
216+
--- !u!114 &1790199440
217+
MonoBehaviour:
218+
m_ObjectHideFlags: 0
219+
m_PrefabParentObject: {fileID: 0}
220+
m_PrefabInternal: {fileID: 0}
221+
m_GameObject: {fileID: 1790199439}
222+
m_Enabled: 1
223+
m_EditorHideFlags: 0
224+
m_Script: {fileID: 11500000, guid: d0affef7a52498148a7d7e98cdaa523a, type: 3}
225+
m_Name:
226+
m_EditorClassIdentifier:
227+
--- !u!4 &1790199441
228+
Transform:
229+
m_ObjectHideFlags: 0
230+
m_PrefabParentObject: {fileID: 0}
231+
m_PrefabInternal: {fileID: 0}
232+
m_GameObject: {fileID: 1790199439}
233+
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
234+
m_LocalPosition: {x: 0, y: 0, z: 0}
235+
m_LocalScale: {x: 1, y: 1, z: 1}
236+
m_Children: []
237+
m_Father: {fileID: 0}
238+
m_RootOrder: 0
239+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}

Diff for: UnityProject/Assets/AsyncUtil/UniRx/Tests/UniRxTests.unity.meta

+8
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)