Pop_Slime/crtr
1
0
Fork 0
Code Issues 6 Pull Requests Projects 1 Releases Activity

Code cleanup.

Browse Source
This commit is contained in:
PopSlime
2023-07-28 12:17:03 +08:00
parent bc51a45df8
commit 957270c41a
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Assets/Cryville/Crtr/Config/IPropertyAdapter.cs
View File

@@ -20,7 +20,7 @@ namespace Cryville.Crtr.Config {
public enum PropertyType { public enum PropertyType {
Unknown, Unknown,
Number, Number,
SteppedNumber, NumberStepped,
Boolean, Boolean,
String, String,
} }
@@ -39,11 +39,11 @@ namespace Cryville.Crtr.Config {
public object GetValue() { return _prop.GetValue(_target, null); } public object GetValue() { return _prop.GetValue(_target, null); }
public void SetValue(object value) { _prop.SetValue(_target, value, null); } public void SetValue(object value) { _prop.SetValue(_target, value, null); }
double _precision; readonly double _precision;
double _step; readonly double _step;
bool _logarithmic; readonly bool _logarithmic;
public object MapValue(object value) { public object MapValue(object value) {
if (Type == PropertyType.Number || Type == PropertyType.SteppedNumber) { if (Type == PropertyType.Number || Type == PropertyType.NumberStepped) {
var result = (double)value; var result = (double)value;
if (_step != 0) result *= _step; if (_step != 0) result *= _step;
if (_logarithmic) result = Math.Pow(Math.E, result); if (_logarithmic) result = Math.Pow(Math.E, result);
@@ -54,7 +54,7 @@ namespace Cryville.Crtr.Config {
} }
public bool SetMapped { get { return true; } } public bool SetMapped { get { return true; } }
public object MapValueInverse(object value) { public object MapValueInverse(object value) {
if (Type == PropertyType.Number || Type == PropertyType.SteppedNumber) { if (Type == PropertyType.Number || Type == PropertyType.NumberStepped) {
var result = Convert.ToDouble(value); var result = Convert.ToDouble(value);
if (_logarithmic) result = Math.Log(result); if (_logarithmic) result = Math.Log(result);
if (_step != 0) result /= _step; if (_step != 0) result /= _step;
@@ -73,7 +73,7 @@ namespace Cryville.Crtr.Config {
else if (prop.PropertyType == typeof(char)) throw new NotSupportedException(); else if (prop.PropertyType == typeof(char)) throw new NotSupportedException();
else if (prop.PropertyType.IsPrimitive) { else if (prop.PropertyType.IsPrimitive) {
m_type = prop.GetCustomAttributes(typeof(StepAttribute), true).Length > 0 m_type = prop.GetCustomAttributes(typeof(StepAttribute), true).Length > 0
? PropertyType.SteppedNumber ? PropertyType.NumberStepped
: PropertyType.Number; : PropertyType.Number;
var attr = prop.GetCustomAttributes(typeof(RangeAttribute), true); var attr = prop.GetCustomAttributes(typeof(RangeAttribute), true);
if (attr.Length > 0) { if (attr.Length > 0) {

4
Assets/Cryville/Crtr/Config/PropertyPanel.cs
View File

@@ -8,7 +8,7 @@ namespace Cryville.Crtr.Config {
[SerializeField] [SerializeField]
GameObject m_number; GameObject m_number;
[SerializeField] [SerializeField]
GameObject m_steppedNumber; GameObject m_numberStepped;
[SerializeField] [SerializeField]
GameObject m_string; GameObject m_string;
@@ -28,7 +28,7 @@ namespace Cryville.Crtr.Config {
GameObject vp; GameObject vp;
switch (prop.Type) { switch (prop.Type) {
case PropertyType.Number: vp = m_number; break; case PropertyType.Number: vp = m_number; break;
case PropertyType.SteppedNumber: vp = m_steppedNumber; break; case PropertyType.NumberStepped: vp = m_numberStepped; break;
case PropertyType.Boolean: vp = m_bool; break; case PropertyType.Boolean: vp = m_bool; break;
case PropertyType.String: vp = m_string; break; case PropertyType.String: vp = m_string; break;
default: return; default: return;

2
Assets/Prefabs/Property.prefab
View File

@@ -184,7 +184,7 @@ MonoBehaviour:
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_bool: {fileID: 1470186229546822, guid: a800312865d564c45a527666aecf4148, type: 3} m_bool: {fileID: 1470186229546822, guid: a800312865d564c45a527666aecf4148, type: 3}
m_number: {fileID: 1880403085839712, guid: eac2dff5c86cca940a909d2a833beebe, type: 3} m_number: {fileID: 1880403085839712, guid: eac2dff5c86cca940a909d2a833beebe, type: 3}
m_steppedNumber: {fileID: 1880403085839712, guid: c0445309ae827a644a4f2ff974ca9fe5, m_numberStepped: {fileID: 1880403085839712, guid: c0445309ae827a644a4f2ff974ca9fe5,
type: 3} type: 3}
m_string: {fileID: 7940274472347270489, guid: d3142009b74dda042a75e9b808dde66d, m_string: {fileID: 7940274472347270489, guid: d3142009b74dda042a75e9b808dde66d,
type: 3} type: 3}