mirrors/HeavenStudio
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

hey minenice how ya doing

Browse source 
here's your requested push
This commit is contained in:
ThatZeoMan 2022-08-18 11:38:57 -05:00
parent eebbd451f1
commit 715ae47c7a
2 changed files with 34 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
Assets/Scripts/LevelEditor/Properties/PropController.cs
View file

@ -12,7 +12,7 @@ using HeavenStudio.Games;
namespace HeavenStudio.Properties namespace HeavenStudio.Properties
{ {
public class EventParameterManager : MonoBehaviour public class PropManager : MonoBehaviour
{ {
[Header("Property Prefabs")] [Header("Property Prefabs")]
[SerializeField] private GameObject IntegerP; [SerializeField] private GameObject IntegerP;
@ -30,7 +30,7 @@ namespace HeavenStudio.Properties
public bool canDisable = true; public bool canDisable = true;
public static EventParameterManager instance { get; set; } public static PropManager instance { get; set; }
private void Awake() private void Awake()
{ {
@ -52,6 +52,25 @@ namespace HeavenStudio.Properties
public string levelCreator = "testCreator"; public string levelCreator = "testCreator";
public int Number; public int Number;
public object this[string propertyName]
{
get
{
return typeof(Entity).GetField(propertyName).GetValue(this);
}
set
{
try
{
typeof(Entity).GetField(propertyName).SetValue(this, value);
}
catch (Exception ex)
{
UnityEngine.Debug.LogError($"You probably misspelled a parameter, or defined the object type wrong. Exception log: {ex}");
}
}
}
} }
public class PropController public class PropController

24
Assets/Scripts/LevelEditor/Properties/PropertyDefn.cs
View file

@ -11,11 +11,11 @@ using HeavenStudio.Util;
namespace HeavenStudio.Properties namespace HeavenStudio.Properties
{ {
public class RemixPropertyPrefab : MonoBehaviour public class PropertyDefn : MonoBehaviour
{ {
public TMP_Text caption; public TMP_Text caption;
[SerializeField] private EventParameterManager parameterManager; [SerializeField] private PropManager parameterManager;
[Header("Integer and Float")] [Header("Integer and Float")]
[Space(10)] [Space(10)]
@ -50,13 +50,13 @@ namespace HeavenStudio.Properties
slider.minValue = integer.min; slider.minValue = integer.min;
slider.maxValue = integer.max; slider.maxValue = integer.max;
slider.value = Mathf.RoundToInt(System.Convert.ToSingle(PropController.instance["levelName"])); slider.value = Mathf.RoundToInt(System.Convert.ToSingle(PropController.properties.instance[propertyName]));
inputField.text = slider.value.ToString(); inputField.text = slider.value.ToString();
slider.onValueChanged.AddListener(delegate slider.onValueChanged.AddListener(delegate
{ {
inputField.text = slider.value.ToString(); inputField.text = slider.value.ToString();
PropController.Properties["Number"] = (int)slider.value; PropController.properties.instance[propertyName] = (int)slider.value;
}); });
inputField.onSelect.AddListener(delegate inputField.onSelect.AddListener(delegate
@ -67,17 +67,17 @@ namespace HeavenStudio.Properties
inputField.onEndEdit.AddListener(delegate inputField.onEndEdit.AddListener(delegate
{ {
slider.value = Mathf.RoundToInt(System.Convert.ToSingle(System.Convert.ToSingle(inputField.text))); slider.value = Mathf.RoundToInt(System.Convert.ToSingle(System.Convert.ToSingle(inputField.text)));
PropController.instance["levelName"] = (int)slider.value; PropController.properties.instance[propertyName] = (int)slider.value;
Editor.instance.editingInputField = false; Editor.instance.editingInputField = false;
}); });
} }
else if (type is bool) else if (type is bool)
{ {
toggle.isOn = System.Convert.ToBoolean(PropController.instance["levelName"]); // ' (bool)type ' always results in false toggle.isOn = System.Convert.ToBoolean(PropController.properties.instance[propertyName]); // ' (bool)type ' always results in false
toggle.onValueChanged.AddListener(delegate toggle.onValueChanged.AddListener(delegate
{ {
PropController.instance["levelName"] = toggle.isOn; PropController.properties.instance[propertyName] = toggle.isOn;
}); });
} }
else if (objType.IsEnum) else if (objType.IsEnum)
@ -94,7 +94,7 @@ namespace HeavenStudio.Properties
dropDownData.Add(optionData); dropDownData.Add(optionData);
if ((int)vals.GetValue(i) == (int)PropController.instance["levelName"]) if ((int)vals.GetValue(i) == (int)PropController.properties.instance[propertyName])
selected = i; selected = i;
} }
dropdown.AddOptions(dropDownData); dropdown.AddOptions(dropDownData);
@ -102,14 +102,14 @@ namespace HeavenStudio.Properties
dropdown.onValueChanged.AddListener(delegate dropdown.onValueChanged.AddListener(delegate
{ {
PropController.instance["levelName"] = (int)Enum.GetValues(objType).GetValue(dropdown.value); PropController.properties.instance[propertyName] = (int)Enum.GetValues(objType).GetValue(dropdown.value);
}); });
} }
//why the FUCK wasn't this a thing before lmao //why the FUCK wasn't this a thing before lmao
else if (objType == typeof(string)) else if (objType == typeof(string))
{ {
// Debug.Log("entity " + propertyName + " is: " + (string)(PropController.instance["levelName"])); // Debug.Log("entity " + propertyName + " is: " + (string)(PropController.properties.instance[propertyName]));
inputFieldString.text = (string)(PropController.instance["levelName"]); inputFieldString.text = (string)(PropController.properties.instance[propertyName]);
inputFieldString.onSelect.AddListener(delegate inputFieldString.onSelect.AddListener(delegate
{ {
@ -119,7 +119,7 @@ namespace HeavenStudio.Properties
inputFieldString.onEndEdit.AddListener(delegate inputFieldString.onEndEdit.AddListener(delegate
{ {
// Debug.Log("setting " + propertyName + " to: " + inputFieldString.text); // Debug.Log("setting " + propertyName + " to: " + inputFieldString.text);
PropController.instance["levelName"] = inputFieldString.text; PropController.properties.instance[propertyName] = inputFieldString.text;
Editor.instance.editingInputField = false; Editor.instance.editingInputField = false;
}); });
} }