From 06298e39a9982bf8a45b4ec613fb4297344edcdd Mon Sep 17 00:00:00 2001 From: tverona1 Date: Tue, 23 Jul 2019 23:13:27 -0700 Subject: [PATCH] Initialize grid values in-line --- Assets/Resources/OVRBuildConfig.asset | 2 +- Assets/Scripts/Config.cs | 4 ++-- Assets/Scripts/GridPopulation.cs | 6 ------ 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/Assets/Resources/OVRBuildConfig.asset b/Assets/Resources/OVRBuildConfig.asset index f2d36f8..cf5cd6c 100644 --- a/Assets/Resources/OVRBuildConfig.asset +++ b/Assets/Resources/OVRBuildConfig.asset @@ -12,6 +12,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 20553fac56ec59645857c0732b787431, type: 3} m_Name: OVRBuildConfig m_EditorClassIdentifier: - androidSDKPath: C:\Users\tvero\AppData\Local\Android\Sdk + androidSDKPath: gradlePath: jdkPath: diff --git a/Assets/Scripts/Config.cs b/Assets/Scripts/Config.cs index e803a75..fe0dcc2 100644 --- a/Assets/Scripts/Config.cs +++ b/Assets/Scripts/Config.cs @@ -18,8 +18,8 @@ namespace QuestAppLauncher [Serializable] public class GridSize { - public int rows; - public int cols; + public int rows = 3; + public int cols = 3; } public GridSize gridSize; diff --git a/Assets/Scripts/GridPopulation.cs b/Assets/Scripts/GridPopulation.cs index dd6877d..00f1cb7 100644 --- a/Assets/Scripts/GridPopulation.cs +++ b/Assets/Scripts/GridPopulation.cs @@ -146,12 +146,6 @@ namespace QuestAppLauncher private void ProcessGridSize() { // Make sure grid size have sane value - if (0 == this.config.gridSize.cols && 0 == this.config.gridSize.rows) - { - // If not initialized, default to 3x3 - this.config.gridSize.cols = 3; - this.config.gridSize.rows = 3; - } this.config.gridSize.cols = Math.Min(this.config.gridSize.cols, 10); this.config.gridSize.cols = Math.Max(this.config.gridSize.cols, 1); this.config.gridSize.rows = Math.Min(this.config.gridSize.rows, 50);