diff --git a/Assets/Librairies/OCF.meta b/Assets/Librairies/GenUI.meta similarity index 62% rename from Assets/Librairies/OCF.meta rename to Assets/Librairies/GenUI.meta index 1940297..7814173 100644 --- a/Assets/Librairies/OCF.meta +++ b/Assets/Librairies/GenUI.meta @@ -1,8 +1,6 @@ fileFormatVersion: 2 -guid: 3482b601eabe7864794d703007f024f1 +guid: 0517edc69af2c9545aa7e353149eed3d folderAsset: yes -timeCreated: 1526469066 -licenseType: Free DefaultImporter: externalObjects: {} userData: diff --git a/Assets/Scenes/Main.unity b/Assets/Scenes/Main.unity index 1ce7f07..7e55de1 100644 --- a/Assets/Scenes/Main.unity +++ b/Assets/Scenes/Main.unity @@ -235,7 +235,7 @@ Prefab: - target: {fileID: 224261597021104126, guid: 79c2718dd59243e4c90e145349e7dadf, type: 2} propertyPath: m_AnchoredPosition.y - value: 0.000015258789 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4679437618935694, guid: 79c2718dd59243e4c90e145349e7dadf, type: 2} propertyPath: m_LocalEulerAnglesHint.y @@ -278,7 +278,12 @@ Prefab: type: 2} - target: {fileID: 1277216160771640, guid: 79c2718dd59243e4c90e145349e7dadf, type: 2} propertyPath: m_Name - value: OCF + value: GenUI + objectReference: {fileID: 0} + - target: {fileID: 224261597021104126, guid: 79c2718dd59243e4c90e145349e7dadf, + type: 2} + propertyPath: m_SizeDelta.y + value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: 79c2718dd59243e4c90e145349e7dadf, type: 2} @@ -536,6 +541,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 549500f70af21674585d1c1e51ec43c9, type: 3} m_Name: m_EditorClassIdentifier: + BarColor: {r: 0.54509807, g: 0, b: 0.8207547, a: 1} id: FakePointManager folder: debug: 0 diff --git a/Assets/Scripts/FakePointManager.cs b/Assets/Scripts/FakePointManager.cs index 5864c58..fb8a6d9 100644 --- a/Assets/Scripts/FakePointManager.cs +++ b/Assets/Scripts/FakePointManager.cs @@ -118,7 +118,7 @@ void Update () { _frameCounter++; - if (_oldWidth != Width && _oldHeight != Height) + if (_oldWidth != Width || _oldHeight != Height) { _oldWidth = Width; _oldHeight = Height; @@ -194,12 +194,16 @@ void Update () { public void InstantiatePoint() { if (NbPoints <= 0) NbPoints = 0; + if (InstanceNumber < NbPoints) { _highestPid++; InstanceNumber++; + if (_highestPid <= 0) + _highestPid = 1; + var newPoint = Instantiate(Prefab); newPoint.GetComponent().material.SetColor("_PointColor", Color.HSVToRGB(Random.value, 0.75f, 0.75f)); @@ -210,8 +214,8 @@ public void InstantiatePoint() newPoint.transform.localScale = new Vector3(PointSize.x, PointSize.y, 2f); InstanciatedPoints.Add(_highestPid, newPoint); - + SendPersonEntered(InstanciatedPoints[_highestPid]); } @@ -224,6 +228,9 @@ public void InstantiatePoint() InstanceNumber--; } + + + } private void ComputeOrthoCamera() diff --git a/Assets/Scripts/FakePointManagerControllable.cs b/Assets/Scripts/FakePointManagerControllable.cs index 1ef88ac..647c5cd 100644 --- a/Assets/Scripts/FakePointManagerControllable.cs +++ b/Assets/Scripts/FakePointManagerControllable.cs @@ -48,6 +48,5 @@ public override void OnUiValueChanged(string name) { base.OnUiValueChanged(name); manager.PointSize = new Vector2(PointSizeX / Width, PointSizeY / Height); - manager.ChangeResolution(); } } diff --git a/ProjectSettings/GraphicsSettings.asset b/ProjectSettings/GraphicsSettings.asset index e21d2cd..9e432d1 100644 --- a/ProjectSettings/GraphicsSettings.asset +++ b/ProjectSettings/GraphicsSettings.asset @@ -37,7 +37,6 @@ GraphicsSettings: - {fileID: 10770, guid: 0000000000000000f000000000000000, type: 0} - {fileID: 17000, guid: 0000000000000000f000000000000000, type: 0} - {fileID: 16000, guid: 0000000000000000f000000000000000, type: 0} - - {fileID: 16001, guid: 0000000000000000f000000000000000, type: 0} m_PreloadedShaders: [] m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index b171987..29eae9e 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1 +1 @@ -m_EditorVersion: 2018.1.3f1 +m_EditorVersion: 2018.1.6f1