Skip to content

Commit 9ea3269

Browse files
committed
fixed namespaces
1 parent 9b8c58a commit 9ea3269

File tree

3 files changed

+59
-54
lines changed

3 files changed

+59
-54
lines changed
Lines changed: 25 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,42 @@
1-
using System.Collections;
2-
using System.Collections.Generic;
1+
using System.Collections.Generic;
32
using CustomTools.ObjectPooling.Scripts.ObjectPool;
43
using UnityEngine;
54
using Zenject;
65

7-
public class PoolSpawner : MonoBehaviour
6+
namespace CustomTools.ObjectPooling.DEMO
87
{
8+
public class PoolSpawner : MonoBehaviour
9+
{
910

10-
private List<IPooledObject> _cubes = new List<IPooledObject>();
11-
private ObjectPooler _pooler;
11+
private List<IPooledObject> _cubes = new List<IPooledObject>();
12+
private ObjectPooler _pooler;
1213

13-
[SerializeField] private Transform _spawnPosition;
14+
[SerializeField] private Transform _spawnPosition;
1415

15-
[Inject]
16-
private void Construct(ObjectPooler pooler)
17-
{
18-
_pooler = pooler;
19-
}
16+
[Inject]
17+
private void Construct(ObjectPooler pooler)
18+
{
19+
_pooler = pooler;
20+
}
2021

2122

22-
public void SpawnCube()
23-
{
24-
GameObject obj = _pooler.SpawnFromPool(PooledObjectType.Cube,
25-
_spawnPosition.position, Quaternion.identity);
23+
public void SpawnCube()
24+
{
25+
GameObject obj = _pooler.SpawnFromPool(PooledObjectType.Cube,
26+
_spawnPosition.position, Quaternion.identity);
2627

27-
_cubes.Add(obj.GetComponent<IPooledObject>());
28-
}
28+
_cubes.Add(obj.GetComponent<IPooledObject>());
29+
}
2930

30-
public void DespawnAnyCube()
31-
{
32-
if (_cubes.Count>0)
31+
public void DespawnAnyCube()
3332
{
33+
if (_cubes.Count>0)
34+
{
3435

35-
_cubes[0].Despawn();
36-
_cubes.RemoveAt(0);
36+
_cubes[0].Despawn();
37+
_cubes.RemoveAt(0);
38+
}
3739
}
38-
}
3940

41+
}
4042
}
Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
1-
using CustomTools.ObjectPooling.Scripts.ObjectPool;
2-
using UnityEngine;
3-
using Zenject;
1+
using Zenject;
42

5-
public interface IPooledObject
3+
namespace CustomTools.ObjectPooling.Scripts.ObjectPool
64
{
7-
PooledObjectType PoolType { get; set; }
5+
public interface IPooledObject
6+
{
7+
PooledObjectType PoolType { get; set; }
88

9-
ObjectPooler Pooler { get; }
9+
ObjectPooler Pooler { get; }
1010

11-
[Inject]
12-
void Construct(ObjectPooler pooler);
13-
void OnObjectSpawn();
14-
void OnObjectDespawn();
15-
void Despawn();
11+
[Inject]
12+
void Construct(ObjectPooler pooler);
13+
void OnObjectSpawn();
14+
void OnObjectDespawn();
15+
void Despawn();
16+
}
1617
}
Lines changed: 22 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,35 @@
1-
using CustomTools.ObjectPooling.Scripts.ObjectPool;
2-
using UnityEngine;
1+
using UnityEngine;
32
using Zenject;
43

5-
public class PooledObject : MonoBehaviour, IPooledObject
4+
namespace CustomTools.ObjectPooling.Scripts.ObjectPool
65
{
6+
public class PooledObject : MonoBehaviour, IPooledObject
7+
{
78

8-
public PooledObjectType PoolType { get; set; }
9-
public ObjectPooler Pooler { get; private set; }
9+
public PooledObjectType PoolType { get; set; }
10+
public ObjectPooler Pooler { get; private set; }
1011

11-
[Inject]
12-
public virtual void Construct(ObjectPooler pooler)
13-
{
14-
Pooler = pooler;
15-
}
12+
[Inject]
13+
public virtual void Construct(ObjectPooler pooler)
14+
{
15+
Pooler = pooler;
16+
}
1617

17-
public virtual void OnObjectSpawn()
18-
{
18+
public virtual void OnObjectSpawn()
19+
{
1920

20-
}
21+
}
2122

22-
public virtual void OnObjectDespawn()
23-
{
23+
public virtual void OnObjectDespawn()
24+
{
2425

25-
}
26+
}
2627

27-
public void Despawn()
28-
{
29-
Pooler.Despawn(gameObject);
30-
}
28+
public void Despawn()
29+
{
30+
Pooler.Despawn(gameObject);
31+
}
3132

3233

34+
}
3335
}

0 commit comments

Comments
 (0)