From 79ac8bbe47544fabb89968b616773d8e01e18828 Mon Sep 17 00:00:00 2001 From: Naliwe GS Date: Sun, 31 Jul 2016 23:31:54 +0200 Subject: [PATCH] Basics --- .idea.igem-quantifly/.idea/workspace.xml | 253 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------- Assets/Materials.meta | 9 +++++++++ Assets/Materials/Coin.mat | Bin 0 -> 5016 bytes Assets/Materials/Coin.mat.meta | 8 ++++++++ Assets/Materials/Ground - Basic.mat | Bin 0 -> 5028 bytes Assets/Materials/Ground - Basic.mat.meta | 8 ++++++++ Assets/Prefabs.meta | 9 +++++++++ Assets/Prefabs/BasicGround.prefab | Bin 0 -> 6720 bytes Assets/Prefabs/BasicGround.prefab.meta | 8 ++++++++ Assets/Prefabs/GameController.prefab | Bin 0 -> 4468 bytes Assets/Prefabs/GameController.prefab.meta | 8 ++++++++ Assets/Prefabs/Player.prefab | Bin 0 -> 6784 bytes Assets/Prefabs/Player.prefab.meta | 8 ++++++++ Assets/Scripts/GameController.cs | 25 +++++++++++++++++++++++++ Assets/Scripts/GameController.cs.meta | 12 ++++++++++++ Assets/Scripts/GameManager.cs | 17 ----------------- Assets/Scripts/GameManager.cs.meta | 12 ------------ Assets/Scripts/Player.cs | 22 ++++++++++++++++++++++ Assets/Scripts/Player.cs.meta | 12 ++++++++++++ Assets/Scripts/Utils.meta | 9 +++++++++ Assets/Scripts/Utils/ObjectPool.cs | 43 +++++++++++++++++++++++++++++++++++++++++++ Assets/Scripts/Utils/ObjectPool.cs.meta | 12 ++++++++++++ ProjectSettings/EditorBuildSettings.asset | Bin 4104 -> 0 bytes ProjectSettings/ProjectSettings.asset | Bin 44049 -> 0 bytes 24 files changed, 409 insertions(+), 66 deletions(-) create mode 100644 Assets/Materials.meta create mode 100644 Assets/Materials/Coin.mat create mode 100644 Assets/Materials/Coin.mat.meta create mode 100644 Assets/Materials/Ground - Basic.mat create mode 100644 Assets/Materials/Ground - Basic.mat.meta create mode 100644 Assets/Prefabs.meta create mode 100644 Assets/Prefabs/BasicGround.prefab create mode 100644 Assets/Prefabs/BasicGround.prefab.meta create mode 100644 Assets/Prefabs/GameController.prefab create mode 100644 Assets/Prefabs/GameController.prefab.meta create mode 100644 Assets/Prefabs/Player.prefab create mode 100644 Assets/Prefabs/Player.prefab.meta create mode 100644 Assets/Scripts/GameController.cs create mode 100644 Assets/Scripts/GameController.cs.meta delete mode 100644 Assets/Scripts/GameManager.cs delete mode 100644 Assets/Scripts/GameManager.cs.meta create mode 100644 Assets/Scripts/Player.cs create mode 100644 Assets/Scripts/Player.cs.meta create mode 100644 Assets/Scripts/Utils.meta create mode 100644 Assets/Scripts/Utils/ObjectPool.cs create mode 100644 Assets/Scripts/Utils/ObjectPool.cs.meta diff --git a/.idea.igem-quantifly/.idea/workspace.xml b/.idea.igem-quantifly/.idea/workspace.xml index cc81e2f..6e07fd2 100644 --- a/.idea.igem-quantifly/.idea/workspace.xml +++ b/.idea.igem-quantifly/.idea/workspace.xml @@ -2,7 +2,11 @@ - + + + + + @@ -22,19 +26,50 @@ - - - + + + + + + + + + + + + + + + + + + + + - + - - - - - - + + + + + + + + + + + + + + + + + + + + @@ -49,14 +84,36 @@ - + + + + + + + + + General + + + + + General + + + + @@ -120,6 +177,32 @@ + + @@ -164,11 +249,14 @@ - @@ -180,27 +268,27 @@ - - + + - + - - - - - - + + + + + + - - + + - - + + @@ -217,21 +305,112 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - - - - + + + + diff --git a/Assets/Materials.meta b/Assets/Materials.meta new file mode 100644 index 0000000..70fc3f2 --- /dev/null +++ b/Assets/Materials.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 22e0d8b57f789ce49ba2a2adae9dadec +folderAsset: yes +timeCreated: 1469997140 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Materials/Coin.mat b/Assets/Materials/Coin.mat new file mode 100644 index 0000000..bdbf741 Binary files /dev/null and b/Assets/Materials/Coin.mat differ diff --git a/Assets/Materials/Coin.mat.meta b/Assets/Materials/Coin.mat.meta new file mode 100644 index 0000000..386396f --- /dev/null +++ b/Assets/Materials/Coin.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 02bdda2559eb6e0478bba7e6b8aa88fb +timeCreated: 1469997363 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Materials/Ground - Basic.mat b/Assets/Materials/Ground - Basic.mat new file mode 100644 index 0000000..c319afd Binary files /dev/null and b/Assets/Materials/Ground - Basic.mat differ diff --git a/Assets/Materials/Ground - Basic.mat.meta b/Assets/Materials/Ground - Basic.mat.meta new file mode 100644 index 0000000..a0697f6 --- /dev/null +++ b/Assets/Materials/Ground - Basic.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2632aef584ea8314299444ce97d7f32c +timeCreated: 1469997168 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs.meta b/Assets/Prefabs.meta new file mode 100644 index 0000000..1922c48 --- /dev/null +++ b/Assets/Prefabs.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 1a5b4426128661346a5fcfc7f0b388e7 +folderAsset: yes +timeCreated: 1469996963 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/BasicGround.prefab b/Assets/Prefabs/BasicGround.prefab new file mode 100644 index 0000000..6c25b32 Binary files /dev/null and b/Assets/Prefabs/BasicGround.prefab differ diff --git a/Assets/Prefabs/BasicGround.prefab.meta b/Assets/Prefabs/BasicGround.prefab.meta new file mode 100644 index 0000000..8efa38d --- /dev/null +++ b/Assets/Prefabs/BasicGround.prefab.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f3f15d4f7beb8af49adebe524bed6179 +timeCreated: 1469997332 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/GameController.prefab b/Assets/Prefabs/GameController.prefab new file mode 100644 index 0000000..8c55011 Binary files /dev/null and b/Assets/Prefabs/GameController.prefab differ diff --git a/Assets/Prefabs/GameController.prefab.meta b/Assets/Prefabs/GameController.prefab.meta new file mode 100644 index 0000000..5cdff37 --- /dev/null +++ b/Assets/Prefabs/GameController.prefab.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 534578d7e4746704894da74561f7198e +timeCreated: 1469996969 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Player.prefab b/Assets/Prefabs/Player.prefab new file mode 100644 index 0000000..84cafe0 Binary files /dev/null and b/Assets/Prefabs/Player.prefab differ diff --git a/Assets/Prefabs/Player.prefab.meta b/Assets/Prefabs/Player.prefab.meta new file mode 100644 index 0000000..8918377 --- /dev/null +++ b/Assets/Prefabs/Player.prefab.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a0438dee19db39d4f8e47a6a83709b0e +timeCreated: 1469997714 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/GameController.cs b/Assets/Scripts/GameController.cs new file mode 100644 index 0000000..0625276 --- /dev/null +++ b/Assets/Scripts/GameController.cs @@ -0,0 +1,25 @@ +using Assets.Scripts.Utils; +using UnityEngine; + +namespace Assets.Scripts +{ + public class GameController : MonoBehaviour + { + public static int PoolSize = 256; + + private ObjectPool _pooledWalls; + private ObjectPool _pooledActors; + private ObjectPool _pooledProjectiles; + + void Start() + { + _pooledActors = new ObjectPool(PoolSize); + _pooledProjectiles = new ObjectPool(PoolSize); + _pooledWalls = new ObjectPool(PoolSize); + } + + void Update() + { + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/GameController.cs.meta b/Assets/Scripts/GameController.cs.meta new file mode 100644 index 0000000..4fd1a1b --- /dev/null +++ b/Assets/Scripts/GameController.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: 5e377c95eee3a4044ac48a577e7abffb +timeCreated: 1469990009 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/GameManager.cs b/Assets/Scripts/GameManager.cs deleted file mode 100644 index 165726b..0000000 --- a/Assets/Scripts/GameManager.cs +++ /dev/null @@ -1,17 +0,0 @@ -using UnityEngine; -using System.Collections; - -public class GameManager : MonoBehaviour { - - // Use this for initialization - void Start () - { - - } - - // Update is called once per frame - void Update () - { - - } -} diff --git a/Assets/Scripts/GameManager.cs.meta b/Assets/Scripts/GameManager.cs.meta deleted file mode 100644 index 4fd1a1b..0000000 --- a/Assets/Scripts/GameManager.cs.meta +++ /dev/null @@ -1,12 +0,0 @@ -fileFormatVersion: 2 -guid: 5e377c95eee3a4044ac48a577e7abffb -timeCreated: 1469990009 -licenseType: Free -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Player.cs b/Assets/Scripts/Player.cs new file mode 100644 index 0000000..bdd33f4 --- /dev/null +++ b/Assets/Scripts/Player.cs @@ -0,0 +1,22 @@ +using UnityEngine; + +namespace Assets.Scripts +{ + public class Player : MonoBehaviour + { + private Transform _pos; + + void Start() + { + _pos = GetComponent(); + } + + void Update() + { + var newPos = Camera.main.ScreenToWorldPoint(Input.mousePosition); + newPos.z = 0; + + _pos.position = Vector3.Lerp(_pos.position, newPos, 10 * Time.deltaTime); + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/Player.cs.meta b/Assets/Scripts/Player.cs.meta new file mode 100644 index 0000000..f98c9fb --- /dev/null +++ b/Assets/Scripts/Player.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: ac12067f081e1bb4a9a576053cf23b44 +timeCreated: 1469997725 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Utils.meta b/Assets/Scripts/Utils.meta new file mode 100644 index 0000000..c630274 --- /dev/null +++ b/Assets/Scripts/Utils.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 0c4600f713b2c5f48800d11accf9a99f +folderAsset: yes +timeCreated: 1469993544 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Utils/ObjectPool.cs b/Assets/Scripts/Utils/ObjectPool.cs new file mode 100644 index 0000000..b426306 --- /dev/null +++ b/Assets/Scripts/Utils/ObjectPool.cs @@ -0,0 +1,43 @@ +using System.Collections.Generic; +using System.Linq; +using UnityEngine; + +namespace Assets.Scripts.Utils +{ + public class ObjectPool + { + public GameObject PooledObject; + public List Pool; + public bool WillGrow; + public int Size; + + public ObjectPool(int size) + { + Size = size; + } + + public void Start() + { + Pool = new List(); + + for (var i = 0; i < Pool.Count; i++) + { + var obj = Object.Instantiate(PooledObject); + + obj.SetActive(false); + Pool.Add(obj); + } + } + + public GameObject GetPooledObject() + { + if (!WillGrow || !Pool.All(o => o.activeInHierarchy)) + return Pool.FirstOrDefault(o => !o.activeInHierarchy); + + var obj = Object.Instantiate(PooledObject); + + Pool.Add(obj); + return obj; + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/Utils/ObjectPool.cs.meta b/Assets/Scripts/Utils/ObjectPool.cs.meta new file mode 100644 index 0000000..7834794 --- /dev/null +++ b/Assets/Scripts/Utils/ObjectPool.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: 573af60f153c3c5428fc5363ab81d909 +timeCreated: 1469996348 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset index db83836..55c9960 100644 Binary files a/ProjectSettings/EditorBuildSettings.asset and b/ProjectSettings/EditorBuildSettings.asset differ diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 3a90813..fdca12f 100644 Binary files a/ProjectSettings/ProjectSettings.asset and b/ProjectSettings/ProjectSettings.asset differ -- libgit2 0.27.0