GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions 7 Packages Projects Releases Wiki Activity

add torque unit

Browse Source
This commit is contained in:
nothingTVatYT
2024-01-31 11:01:22 +01:00
parent 1f8314b663
commit 22600a2c29
4 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Source/Editor/Utilities/ShuntingYardParser.cs
View File

@@ -144,13 +144,16 @@ namespace FlaxEditor.Utilities
/// List known units which cannot be handled as a variable easily because they contain operator /// List known units which cannot be handled as a variable easily because they contain operator
/// symbols (mostly a forward slash). The value is the factor to calculate game units. /// symbols (mostly a forward slash). The value is the factor to calculate game units.
/// </summary> /// </summary>
// Nm is here because these values are compared case-sensitive and we don't want to confuse
// nanometers and Newtonmeters
private static readonly IDictionary<string, double> UnitSymbols = new Dictionary<string, double> private static readonly IDictionary<string, double> UnitSymbols = new Dictionary<string, double>
{ {
["cm/s"] = Units.Meters2Units / 100, ["cm/s"] = Units.Meters2Units / 100,
["cm/s²"] = Units.Meters2Units / 100, ["cm/s²"] = Units.Meters2Units / 100,
["m/s"] = Units.Meters2Units, ["m/s"] = Units.Meters2Units,
["m/s²"] = Units.Meters2Units, ["m/s²"] = Units.Meters2Units,
["km/h"] = 1/3.6 * Units.Meters2Units ["km/h"] = 1/3.6 * Units.Meters2Units,
["Nm"] = Units.Meters2Units * Units.Meters2Units
}; };
/// <summary> /// <summary>

1
Source/Editor/Utilities/Utils.cs
View File

@@ -1203,6 +1203,7 @@ namespace FlaxEditor.Utilities
case FlaxEngine.Utils.ValueCategory.Volume: return (value / Units.Meters2Units / Units.Meters2Units / Units.Meters2Units).ToString(format, CultureInfo.InvariantCulture) + "m³"; case FlaxEngine.Utils.ValueCategory.Volume: return (value / Units.Meters2Units / Units.Meters2Units / Units.Meters2Units).ToString(format, CultureInfo.InvariantCulture) + "m³";
case FlaxEngine.Utils.ValueCategory.Mass: return value.ToString(format, CultureInfo.InvariantCulture) + "kg"; case FlaxEngine.Utils.ValueCategory.Mass: return value.ToString(format, CultureInfo.InvariantCulture) + "kg";
case FlaxEngine.Utils.ValueCategory.Force: return (value / Units.Meters2Units).ToString(format, CultureInfo.InvariantCulture) + "N"; case FlaxEngine.Utils.ValueCategory.Force: return (value / Units.Meters2Units).ToString(format, CultureInfo.InvariantCulture) + "N";
case FlaxEngine.Utils.ValueCategory.Torque: return (value / Units.Meters2Units / Units.Meters2Units).ToString(format, CultureInfo.InvariantCulture) + "Nm";
case FlaxEngine.Utils.ValueCategory.None: case FlaxEngine.Utils.ValueCategory.None:
default: default:
return FormatFloat(value); return FormatFloat(value);

2
Source/Engine/Physics/Actors/RigidBody.h
View File

@@ -181,7 +181,7 @@ public:
/// <summary> /// <summary>
/// Gets the mass value measured in kilograms (use override value only if OverrideMass is checked). /// Gets the mass value measured in kilograms (use override value only if OverrideMass is checked).
/// </summary> /// </summary>
API_PROPERTY(Attributes="EditorOrder(110), Limit(0), EditorDisplay(\"Rigid Body\")") API_PROPERTY(Attributes="EditorOrder(110), Limit(0), EditorDisplay(\"Rigid Body\"), NumberCategory(Utils.ValueCategory.Mass)")
float GetMass() const; float GetMass() const;
/// <summary> /// <summary>

3
Source/Engine/Utilities/Utils.cs
View File

@@ -1053,7 +1053,8 @@ namespace FlaxEngine
Speed, Speed,
Acceleration, Acceleration,
Time, Time,
Force Force,
Torque
} }
} }
} }