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

Require semicolon after most engine API macros

Browse Source 
# Conflicts:
#	Source/Engine/Physics/PhysX/PhysicsBackendPhysX.cpp
This commit is contained in:
Ari Vuollet
2023-07-30 00:56:00 +03:00
committed by Ari Vuollet
parent 83c3201ef8
commit f4c13032a2
17 changed files with 90 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Source/Engine/Level/Actors/Spline.cpp
View File

@@ -101,25 +101,25 @@ Vector3 Spline::GetSplineLocalDirection(float time) const
Vector3 Spline::GetSplinePoint(int32 index) const
{
CHECK_RETURN(index >= 0 && index < GetSplinePointsCount(), Vector3::Zero)
CHECK_RETURN(index >= 0 && index < GetSplinePointsCount(), Vector3::Zero);
return _transform.LocalToWorld(Curve[index].Value.Translation);
}
Vector3 Spline::GetSplineLocalPoint(int32 index) const
{
CHECK_RETURN(index >= 0 && index < GetSplinePointsCount(), Vector3::Zero)
CHECK_RETURN(index >= 0 && index < GetSplinePointsCount(), Vector3::Zero);
return Curve[index].Value.Translation;
}
Transform Spline::GetSplineTransform(int32 index) const
{
CHECK_RETURN(index >= 0 && index < GetSplinePointsCount(), Transform::Identity)
CHECK_RETURN(index >= 0 && index < GetSplinePointsCount(), Transform::Identity);
return _transform.LocalToWorld(Curve[index].Value);
}
Transform Spline::GetSplineLocalTransform(int32 index) const
{
CHECK_RETURN(index >= 0 && index < GetSplinePointsCount(), Transform::Identity)
CHECK_RETURN(index >= 0 && index < GetSplinePointsCount(), Transform::Identity);
return Curve[index].Value;
}
@@ -130,7 +130,7 @@ Transform Spline::GetSplineTangent(int32 index, bool isIn)
Transform Spline::GetSplineLocalTangent(int32 index, bool isIn)
{
CHECK_RETURN(index >= 0 && index < GetSplinePointsCount(), Transform::Identity)
CHECK_RETURN(index >= 0 && index < GetSplinePointsCount(), Transform::Identity);
const auto& k = Curve[index];
const auto& tangent = isIn ? k.TangentIn : k.TangentOut;
return tangent + k.Value;
@@ -209,7 +209,7 @@ float Spline::GetSplineSegmentLength(int32 index) const
float Spline::GetSplineTime(int32 index) const
{
CHECK_RETURN(index >= 0 && index < GetSplinePointsCount(), 0.0f)
CHECK_RETURN(index >= 0 && index < GetSplinePointsCount(), 0.0f);
return Curve[index].Time;
}

2
Source/Engine/Level/Actors/SplineModel.cpp
View File

@@ -489,7 +489,7 @@ void SplineModel::Serialize(SerializeStream& stream, const void* otherObj)
SERIALIZE_MEMBER(BoundsScale, _boundsScale);
SERIALIZE_MEMBER(LODBias, _lodBias);
SERIALIZE_MEMBER(ForcedLOD, _forcedLod);
SERIALIZE_MEMBER(PreTransform, _preTransform)
SERIALIZE_MEMBER(PreTransform, _preTransform);
SERIALIZE(Model);
SERIALIZE(DrawModes);