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

Format engine codebase with ReSharper

Browse Source
This commit is contained in:
Wojtek Figat
2022-06-14 19:05:04 +02:00
parent 3294624849
commit d4d27b88f0
82 changed files with 276 additions and 775 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Engine/Level/Actors/AnimatedModel.cpp
View File

@@ -693,9 +693,9 @@ void AnimatedModel::Update()
void AnimatedModel::Draw(RenderContext& renderContext)
{
if (renderContext.View.Pass == DrawPass::GlobalSDF)
return; // TODO: Animated Model rendering to Global SDF
return; // TODO: Animated Model rendering to Global SDF
if (renderContext.View.Pass == DrawPass::GlobalSurfaceAtlas)
return; // No supported
return; // No supported
GEOMETRY_DRAW_STATE_EVENT_BEGIN(_drawState, _world);
const DrawPass drawModes = (DrawPass)(DrawModes & renderContext.View.Pass & (int32)renderContext.View.GetShadowsDrawPassMask(ShadowsMode));

12
Source/Engine/Level/Actors/AnimatedModel.h
View File

@@ -14,10 +14,9 @@
/// </summary>
API_CLASS() class FLAXENGINE_API AnimatedModel : public ModelInstanceActor
{
DECLARE_SCENE_OBJECT(AnimatedModel);
DECLARE_SCENE_OBJECT(AnimatedModel);
friend class AnimationsSystem;
public:
/// <summary>
/// Describes the animation graph updates frequency for the animated model.
/// </summary>
@@ -55,7 +54,6 @@ public:
};
private:
BoundingBox _boxLocal;
Matrix _world;
GeometryDrawStateData _drawState;
@@ -68,7 +66,6 @@ private:
ScriptingObjectReference<AnimatedModel> _masterPose;
public:
/// <summary>
/// The skinned model asset used for rendering.
/// </summary>
@@ -154,7 +151,6 @@ public:
ScriptingObjectReference<Actor> RootMotionTarget;
public:
/// <summary>
/// The graph instance data container. For dynamic usage only at runtime, not serialized.
/// </summary>
@@ -238,7 +234,6 @@ public:
API_FUNCTION() void SetMasterPoseModel(AnimatedModel* masterPose);
public:
/// <summary>
/// Gets the anim graph instance parameters collection.
/// </summary>
@@ -283,7 +278,6 @@ public:
API_FUNCTION() void SetParameterValue(const Guid& id, const Variant& value);
public:
/// <summary>
/// Gets the weight of the blend shape.
/// </summary>
@@ -304,7 +298,6 @@ public:
API_FUNCTION() void ClearBlendShapeWeights();
public:
/// <summary>
/// Plays the animation on the slot in Anim Graph.
/// </summary>
@@ -353,7 +346,6 @@ public:
API_FUNCTION() bool IsPlayingSlotAnimation(const StringView& slotName, Animation* anim);
private:
void ApplyRootMotion(const RootMotionData& rootMotionDelta);
void SyncParameters();
@@ -372,7 +364,6 @@ private:
void OnGraphLoaded();
public:
// [ModelInstanceActor]
bool HasContentLoaded() const override;
void Draw(RenderContext& renderContext) override;
@@ -387,7 +378,6 @@ public:
bool IntersectsEntry(const Ray& ray, Real& distance, Vector3& normal, int32& entryIndex) override;
protected:
// [ModelInstanceActor]
void BeginPlay(SceneBeginData* data) override;
void EndPlay() override;

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

@@ -104,7 +104,7 @@ void BoneSocket::OnParentChanged()
{
// Base
Actor::OnParentChanged();
if (!IsDuringPlay())
return;

7
Source/Engine/Level/Actors/BoneSocket.h
View File

@@ -9,16 +9,14 @@
/// </summary>
API_CLASS() class FLAXENGINE_API BoneSocket : public Actor
{
DECLARE_SCENE_OBJECT(BoneSocket);
DECLARE_SCENE_OBJECT(BoneSocket);
private:
String _node;
int32 _index;
bool _useScale;
public:
/// <summary>
/// Gets the target node name to link to it.
/// </summary>
@@ -54,7 +52,6 @@ public:
void SetUseScale(bool value);
public:
/// <summary>
/// Updates the actor transformation based on a skeleton node.
/// </summary>
@@ -62,7 +59,6 @@ public:
void UpdateTransformation();
public:
// [Actor]
#if USE_EDITOR
void OnDebugDrawSelected() override;
@@ -71,7 +67,6 @@ public:
void Deserialize(DeserializeStream& stream, ISerializeModifier* modifier) override;
protected:
// [Actor]
void OnTransformChanged() override;
void OnParentChanged() override;

11
Source/Engine/Level/Actors/BoxBrush.h
View File

@@ -12,7 +12,7 @@
/// </summary>
API_STRUCT() struct BrushSurface : ISerializable
{
DECLARE_SCRIPTING_TYPE_NO_SPAWN(BrushSurface);
DECLARE_SCRIPTING_TYPE_NO_SPAWN(BrushSurface);
/// <summary>
/// The parent brush.
@@ -57,7 +57,6 @@ DECLARE_SCRIPTING_TYPE_NO_SPAWN(BrushSurface);
float ScaleInLightmap = 1.0f;
public:
// [ISerializable]
void Serialize(SerializeStream& stream, const void* otherObj) override;
void Deserialize(DeserializeStream& stream, ISerializeModifier* modifier) override;
@@ -68,16 +67,14 @@ public:
/// </summary>
API_CLASS() class FLAXENGINE_API BoxBrush : public Actor, public CSG::Brush
{
DECLARE_SCENE_OBJECT(BoxBrush);
DECLARE_SCENE_OBJECT(BoxBrush);
private:
Vector3 _center;
Vector3 _size;
OrientedBoundingBox _bounds;
BrushMode _mode;
public:
/// <summary>
/// Brush surfaces scale in lightmap
/// </summary>
@@ -161,7 +158,6 @@ public:
API_FUNCTION() void SetMaterial(int32 surfaceIndex, MaterialBase* material);
public:
/// <summary>
/// Gets the volume bounding box (oriented).
/// </summary>
@@ -191,7 +187,6 @@ public:
API_FUNCTION() void GetVertices(int32 surfaceIndex, API_PARAM(Out) Array<Vector3>& outputData) const;
private:
FORCE_INLINE void UpdateBounds()
{
OrientedBoundingBox::CreateCentered(_center, _size, _bounds);
@@ -201,7 +196,6 @@ private:
}
public:
// [Actor]
void Serialize(SerializeStream& stream, const void* otherObj) override;
void Deserialize(DeserializeStream& stream, ISerializeModifier* modifier) override;
@@ -219,7 +213,6 @@ public:
int32 GetSurfacesCount() override;
protected:
// [Actor]
void OnTransformChanged() override;
void OnActiveInTreeChanged() override;

7
Source/Engine/Level/Actors/BoxVolume.h
View File

@@ -10,14 +10,12 @@
/// </summary>
API_CLASS(Abstract) class FLAXENGINE_API BoxVolume : public Actor
{
DECLARE_SCENE_OBJECT(BoxVolume);
DECLARE_SCENE_OBJECT(BoxVolume);
protected:
Vector3 _size;
OrientedBoundingBox _bounds;
public:
/// <summary>
/// Gets the size of the volume (in local space).
/// </summary>
@@ -41,7 +39,6 @@ public:
}
protected:
virtual void OnBoundsChanged(const BoundingBox& prevBounds)
{
}
@@ -51,7 +48,6 @@ protected:
#endif
public:
// [Actor]
#if USE_EDITOR
void OnDebugDraw() override;
@@ -61,7 +57,6 @@ public:
void Deserialize(DeserializeStream& stream, ISerializeModifier* modifier) override;
protected:
// [Actor]
void OnTransformChanged() override;
};

9
Source/Engine/Level/Actors/Camera.h
View File

@@ -20,7 +20,7 @@
/// </summary>
API_CLASS(Sealed) class FLAXENGINE_API Camera : public Actor
{
DECLARE_SCENE_OBJECT(Camera);
DECLARE_SCENE_OBJECT(Camera);
// List with all created cameras actors on the scene
static Array<Camera*> Cameras;
@@ -35,7 +35,6 @@ DECLARE_SCENE_OBJECT(Camera);
API_PROPERTY() static Camera* GetMainCamera();
private:
Matrix _view, _projection;
BoundingFrustum _frustum;
@@ -56,7 +55,6 @@ private:
#endif
public:
/// <summary>
/// Gets the view matrix.
/// </summary>
@@ -82,7 +80,6 @@ public:
}
public:
/// <summary>
/// Gets the value indicating if camera should use perspective rendering mode, otherwise it will use orthographic projection.
/// </summary>
@@ -174,7 +171,6 @@ public:
LayersMask RenderLayersMask;
public:
/// <summary>
/// Projects the point from 3D world-space to game window coordinates (in screen pixels for default viewport calculated from <see cref="Viewport"/>).
/// </summary>
@@ -231,14 +227,12 @@ public:
#endif
private:
#if USE_EDITOR
void OnPreviewModelLoaded();
#endif
void UpdateCache();
public:
// [Actor]
#if USE_EDITOR
BoundingBox GetEditorBox() const override;
@@ -250,7 +244,6 @@ public:
void Deserialize(DeserializeStream& stream, ISerializeModifier* modifier) override;
protected:
// [Actor]
void OnEnable() override;
void OnDisable() override;

7
Source/Engine/Level/Actors/Decal.h
View File

@@ -12,16 +12,14 @@
/// </summary>
API_CLASS() class FLAXENGINE_API Decal : public Actor
{
DECLARE_SCENE_OBJECT(Decal);
DECLARE_SCENE_OBJECT(Decal);
private:
Vector3 _size;
OrientedBoundingBox _bounds;
Matrix _world;
int32 _sceneRenderingKey = -1;
public:
/// <summary>
/// The decal material. Must have domain mode to Decal type.
/// </summary>
@@ -56,7 +54,6 @@ public:
API_PROPERTY() void SetSize(const Vector3& value);
public:
/// <summary>
/// Utility to crate a new virtual Material Instance asset, set its parent to the currently applied material, and assign it to the decal. Can be used to modify the decal material parameters from code.
/// </summary>
@@ -73,7 +70,6 @@ public:
}
public:
// [Actor]
#if USE_EDITOR
void OnDebugDrawSelected() override;
@@ -86,7 +82,6 @@ public:
bool IntersectsItself(const Ray& ray, Real& distance, Vector3& normal) override;
protected:
// [Actor]
void OnEnable() override;
void OnDisable() override;

4
Source/Engine/Level/Actors/EmptyActor.h
View File

@@ -9,16 +9,14 @@
/// </summary>
API_CLASS() class FLAXENGINE_API EmptyActor : public Actor
{
DECLARE_SCENE_OBJECT(EmptyActor);
DECLARE_SCENE_OBJECT(EmptyActor);
public:
// [Actor]
#if USE_EDITOR
BoundingBox GetEditorBox() const override;
#endif
protected:
// [Actor]
void OnTransformChanged() override;
};

9
Source/Engine/Level/Actors/EnvironmentProbe.h
View File

@@ -11,16 +11,14 @@
/// </summary>
API_CLASS() class FLAXENGINE_API EnvironmentProbe : public Actor
{
DECLARE_SCENE_OBJECT(EnvironmentProbe);
DECLARE_SCENE_OBJECT(EnvironmentProbe);
private:
float _radius;
bool _isUsingCustomProbe;
int32 _sceneRenderingKey = -1;
AssetReference<CubeTexture> _probe;
public:
/// <summary>
/// The reflections brightness.
/// </summary>
@@ -40,7 +38,6 @@ public:
float CaptureNearPlane = 10.0f;
public:
/// <summary>
/// Gets the probe radius.
/// </summary>
@@ -108,7 +105,6 @@ public:
API_PROPERTY() void SetCustomProbe(CubeTexture* probe);
public:
/// <summary>
/// Bakes that probe. It won't be performed now but on async graphics rendering task.
/// </summary>
@@ -122,11 +118,9 @@ public:
void SetProbeData(TextureData& data);
private:
void UpdateBounds();
public:
// [Actor]
#if USE_EDITOR
BoundingBox GetEditorBox() const override
@@ -146,7 +140,6 @@ public:
bool IntersectsItself(const Ray& ray, Real& distance, Vector3& normal) override;
protected:
// [Actor]
void OnEnable() override;
void OnDisable() override;

6
Source/Engine/Level/Actors/ExponentialHeightFog.cpp
View File

@@ -33,10 +33,10 @@ void ExponentialHeightFog::Draw(RenderContext& renderContext)
{
// Render only when shader is valid and fog can be rendered
// Do not render exponential fog in orthographic views
if ((renderContext.View.Flags & ViewFlags::Fog) != 0
if ((renderContext.View.Flags & ViewFlags::Fog) != 0
&& renderContext.View.Pass & DrawPass::GBuffer
&& _shader
&& _shader->IsLoaded()
&& _shader
&& _shader->IsLoaded()
&& renderContext.View.IsPerspectiveProjection())
{
// Prepare

9
Source/Engine/Level/Actors/Light.h
View File

@@ -11,9 +11,8 @@
/// </summary>
API_CLASS(Abstract) class FLAXENGINE_API Light : public Actor
{
DECLARE_SCENE_OBJECT_ABSTRACT(Light);
DECLARE_SCENE_OBJECT_ABSTRACT(Light);
public:
/// <summary>
/// Color of the light
/// </summary>
@@ -51,12 +50,10 @@ public:
bool CastVolumetricShadow = true;
protected:
// Adjust the light brightness used during rendering (called by light types inside SetupLightData callback)
void AdjustBrightness(const RenderView& view, float& brightness) const;
public:
// [Actor]
#if USE_EDITOR
BoundingBox GetEditorBox() const override
@@ -74,9 +71,8 @@ public:
/// </summary>
API_CLASS(Abstract) class FLAXENGINE_API LightWithShadow : public Light
{
DECLARE_SCENE_OBJECT_ABSTRACT(LightWithShadow);
DECLARE_SCENE_OBJECT_ABSTRACT(LightWithShadow);
public:
/// <summary>
/// The minimum roughness value used to clamp material surface roughness during shading pixel.
/// </summary>
@@ -132,7 +128,6 @@ public:
ShadowsCastingMode ShadowsMode = ShadowsCastingMode::All;
public:
// [Light]
void Serialize(SerializeStream& stream, const void* otherObj) override;
void Deserialize(DeserializeStream& stream, ISerializeModifier* modifier) override;

6
Source/Engine/Level/Actors/ModelInstanceActor.h
View File

@@ -11,13 +11,11 @@
/// <seealso cref="Actor" />
API_CLASS(Abstract) class FLAXENGINE_API ModelInstanceActor : public Actor
{
DECLARE_SCENE_OBJECT_ABSTRACT(ModelInstanceActor);
DECLARE_SCENE_OBJECT_ABSTRACT(ModelInstanceActor);
protected:
int32 _sceneRenderingKey = -1;
public:
/// <summary>
/// The model instance buffer.
/// </summary>
@@ -84,12 +82,10 @@ public:
}
public:
// [Actor]
void OnLayerChanged() override;
protected:
// [Actor]
void OnEnable() override;
void OnDisable() override;

8
Source/Engine/Level/Actors/PostFxVolume.h
View File

@@ -11,16 +11,14 @@
/// </summary>
API_CLASS() class FLAXENGINE_API PostFxVolume : public BoxVolume, public IPostFxSettingsProvider
{
DECLARE_SCENE_OBJECT(PostFxVolume);
DECLARE_SCENE_OBJECT(PostFxVolume);
private:
int32 _priority;
float _blendRadius;
float _blendWeight;
bool _isBounded;
public:
/// <summary>
/// The ambient occlusion effect settings.
/// </summary>
@@ -100,7 +98,6 @@ public:
PostFxMaterialsSettings PostFxMaterials;
public:
/// <summary>
/// Gets the order in which multiple volumes are blended together.
/// The volume with the highest priority takes precedence over all other overlapping volumes.
@@ -184,7 +181,6 @@ public:
}
public:
/// <summary>
/// Adds the post fx material to the settings.
/// </summary>
@@ -198,7 +194,6 @@ public:
API_FUNCTION() void RemovePostFxMaterial(MaterialBase* material);
public:
// [BoxVolume]
bool HasContentLoaded() const override;
void Serialize(SerializeStream& stream, const void* otherObj) override;
@@ -209,7 +204,6 @@ public:
void Blend(PostProcessSettings& other, float weight) override;
protected:
// [BoxVolume]
void OnEnable() override;
void OnDisable() override;

9
Source/Engine/Level/Actors/Ragdoll.h
View File

@@ -10,15 +10,13 @@
/// </summary>
API_CLASS() class FLAXENGINE_API Ragdoll : public Actor
{
DECLARE_SCENE_OBJECT(Ragdoll);
API_AUTO_SERIALIZATION();
DECLARE_SCENE_OBJECT(Ragdoll);
API_AUTO_SERIALIZATION();
private:
AnimatedModel* _animatedModel = nullptr;
Dictionary<RigidBody*, Transform> _bonesOffsets;
public:
/// <summary>
/// The default bones weight where 0 means fully animated bone and 1 means fully simulate bones. Can be used to control all bones simulation mode but is overriden by per-bone BonesWeights.
/// </summary>
@@ -53,7 +51,6 @@ public:
float MaxDepenetrationVelocity = MAX_float;
public:
/// <summary>
/// Calculates the total mass of all ragdoll bodies.
/// </summary>
@@ -70,13 +67,11 @@ public:
API_FUNCTION() void SetAngularVelocity(const Vector3& value) const;
private:
float InitBone(RigidBody* rigidBody, int32& nodeIndex, Transform& localPose);
void OnFixedUpdate();
void OnAnimationUpdating(struct AnimGraphImpulse* localPose);
public:
// [Actor]
void OnEnable() override;
void OnDisable() override;

10
Source/Engine/Level/Actors/Spline.h
View File

@@ -10,15 +10,13 @@
/// </summary>
API_CLASS() class FLAXENGINE_API Spline : public Actor
{
DECLARE_SCENE_OBJECT(Spline);
DECLARE_SCENE_OBJECT(Spline);
typedef BezierCurveKeyframe<Transform> Keyframe;
private:
bool _loop = false;
BoundingBox _localBounds;
public:
/// <summary>
/// The spline bezier curve points represented as series of transformations in 3D space (with tangents). Points are stored in local-space of the actor.
/// </summary>
@@ -37,7 +35,6 @@ public:
API_PROPERTY() void SetIsLoop(bool value);
public:
/// <summary>
/// Evaluates the spline curve at the given time and calculates the point location in 3D (world-space).
/// </summary>
@@ -215,7 +212,6 @@ public:
API_FUNCTION() void GetSplineLocalPoints(API_PARAM(Out) Array<Transform>& points) const;
public:
/// <summary>
/// Clears the spline to be empty.
/// </summary>
@@ -345,7 +341,6 @@ public:
API_FUNCTION() void SetTangentsSmooth();
public:
/// <summary>
/// Called when spline gets updated (eg. after curve modification).
/// </summary>
@@ -357,7 +352,6 @@ public:
API_FUNCTION() virtual void UpdateSpline();
protected:
#if USE_EDITOR
virtual Color GetSplineColor()
{
@@ -366,7 +360,6 @@ protected:
#endif
private:
// Internal bindings
#if !COMPILE_WITHOUT_CSHARP
API_FUNCTION(NoProxy) void GetKeyframes(MonoArray* data);
@@ -374,7 +367,6 @@ private:
#endif
public:
// [Actor]
#if USE_EDITOR
void OnDebugDraw() override;

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

@@ -351,9 +351,9 @@ void SplineModel::Draw(RenderContext& renderContext)
return;
auto model = Model.Get();
if (renderContext.View.Pass == DrawPass::GlobalSDF)
return; // TODO: Spline Model rendering to Global SDF
return; // TODO: Spline Model rendering to Global SDF
if (renderContext.View.Pass == DrawPass::GlobalSurfaceAtlas)
return; // TODO: Spline Model rendering to Global Surface Atlas
return; // TODO: Spline Model rendering to Global Surface Atlas
if (!Entries.IsValidFor(model))
Entries.Setup(model);

7
Source/Engine/Level/Actors/SplineModel.h
View File

@@ -12,9 +12,8 @@ class Spline;
/// </summary>
API_CLASS() class FLAXENGINE_API SplineModel : public ModelInstanceActor
{
DECLARE_SCENE_OBJECT(SplineModel);
DECLARE_SCENE_OBJECT(SplineModel);
private:
struct Instance
{
BoundingSphere Sphere;
@@ -33,7 +32,6 @@ private:
float _chunksPerSegment, _meshMinZ, _meshMaxZ;
public:
~SplineModel();
/// <summary>
@@ -104,14 +102,12 @@ public:
API_PROPERTY() void SetForcedLOD(int32 value);
private:
void OnModelChanged();
void OnModelLoaded();
void OnSplineUpdated();
void UpdateDeformationBuffer();
public:
// [ModelInstanceActor]
bool HasContentLoaded() const override;
void Draw(RenderContext& renderContext) override;
@@ -121,7 +117,6 @@ public:
void OnParentChanged() override;
protected:
// [ModelInstanceActor]
void OnTransformChanged() override;
void OnActiveInTreeChanged() override;

8
Source/Engine/Level/Actors/SpotLight.h
View File

@@ -11,9 +11,8 @@
/// </summary>
API_CLASS() class FLAXENGINE_API SpotLight : public LightWithShadow
{
DECLARE_SCENE_OBJECT(SpotLight);
DECLARE_SCENE_OBJECT(SpotLight);
private:
Vector3 _direction;
float _radius;
float _outerConeAngle;
@@ -24,7 +23,6 @@ private:
int32 _sceneRenderingKey = -1;
public:
/// <summary>
/// Light source bulb radius
/// </summary>
@@ -62,7 +60,6 @@ public:
float IESBrightnessScale = 1.0f;
public:
/// <summary>
/// Computes light brightness value
/// </summary>
@@ -122,11 +119,9 @@ public:
API_PROPERTY() void SetInnerConeAngle(float value);
private:
void UpdateBounds();
public:
// [LightWithShadow]
void Draw(RenderContext& renderContext) override;
#if USE_EDITOR
@@ -138,7 +133,6 @@ public:
bool IntersectsItself(const Ray& ray, Real& distance, Vector3& normal) override;
protected:
// [LightWithShadow]
void OnEnable() override;
void OnDisable() override;

8
Source/Engine/Level/Actors/StaticModel.h
View File

@@ -12,9 +12,8 @@
/// </summary>
API_CLASS() class FLAXENGINE_API StaticModel : public ModelInstanceActor
{
DECLARE_SCENE_OBJECT(StaticModel);
DECLARE_SCENE_OBJECT(StaticModel);
private:
Matrix _world;
GeometryDrawStateData _drawState;
float _scaleInLightmap;
@@ -28,7 +27,6 @@ private:
Model* _residencyChangedModel = nullptr;
public:
/// <summary>
/// Finalizes an instance of the <see cref="StaticModel"/> class.
/// </summary>
@@ -52,7 +50,6 @@ public:
LightmapEntry Lightmap;
public:
/// <summary>
/// Gets the model world matrix transform.
/// </summary>
@@ -180,14 +177,12 @@ public:
API_FUNCTION() void RemoveVertexColors();
private:
void OnModelChanged();
void OnModelLoaded();
void OnModelResidencyChanged();
void UpdateBounds();
public:
// [ModelInstanceActor]
bool HasContentLoaded() const override;
void Draw(RenderContext& renderContext) override;
@@ -198,7 +193,6 @@ public:
bool IntersectsEntry(const Ray& ray, Real& distance, Vector3& normal, int32& entryIndex) override;
protected:
// [ModelInstanceActor]
void OnTransformChanged() override;
void OnEnable() override;