Skip to content

Commit

Permalink
Fix errors and warnings
Browse files Browse the repository at this point in the history
  • Loading branch information
SirLynix committed Sep 10, 2024
1 parent 761b1a7 commit 5010b06
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 11 deletions.
4 changes: 2 additions & 2 deletions include/ClientLib/Systems/AnimationSystem.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,14 @@ namespace tsom

inline AnimationSystem(entt::registry& registry);
AnimationSystem(const AnimationSystem&) = delete;
AnimationSystem(AnimationSystem&&) = default;
AnimationSystem(AnimationSystem&&) = delete;
~AnimationSystem() = default;

void Update(Nz::Time elapsedTime);
void UpdateAnimationStates(Nz::Time elapsedTime);

AnimationSystem& operator=(const AnimationSystem&) = delete;
AnimationSystem& operator=(AnimationSystem&&) = default;
AnimationSystem& operator=(AnimationSystem&&) = delete;

private:
entt::registry& m_registry;
Expand Down
4 changes: 2 additions & 2 deletions include/ClientLib/Systems/MovementInterpolationSystem.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,13 @@ namespace tsom

MovementInterpolationSystem(entt::registry& registry, Nz::Time movementTickDuration, std::size_t targetMovementPoints = 4);
MovementInterpolationSystem(const MovementInterpolationSystem&) = delete;
MovementInterpolationSystem(MovementInterpolationSystem&&) = default;
MovementInterpolationSystem(MovementInterpolationSystem&&) = delete;
~MovementInterpolationSystem() = default;

void Update(Nz::Time elapsedTime);

MovementInterpolationSystem& operator=(const MovementInterpolationSystem&) = delete;
MovementInterpolationSystem& operator=(MovementInterpolationSystem&&) = default;
MovementInterpolationSystem& operator=(MovementInterpolationSystem&&) = delete;

private:
entt::observer m_interpolatedObserver;
Expand Down
4 changes: 2 additions & 2 deletions include/ClientLib/Systems/PlayerAnimationSystem.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,13 @@ namespace tsom

inline PlayerAnimationSystem(entt::registry& registry);
PlayerAnimationSystem(const PlayerAnimationSystem&) = delete;
PlayerAnimationSystem(PlayerAnimationSystem&&) = default;
PlayerAnimationSystem(PlayerAnimationSystem&&) = delete;
~PlayerAnimationSystem() = default;

void Update(Nz::Time elapsedTime);

PlayerAnimationSystem& operator=(const PlayerAnimationSystem&) = delete;
PlayerAnimationSystem& operator=(PlayerAnimationSystem&&) = default;
PlayerAnimationSystem& operator=(PlayerAnimationSystem&&) = delete;

private:
entt::registry& m_registry;
Expand Down
4 changes: 2 additions & 2 deletions include/CommonLib/Ship.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ namespace tsom
public:
Ship(float tileSize);
Ship(const Ship&) = delete;
Ship(Ship&&) noexcept = default;
Ship(Ship&&) = delete;
~Ship() = default;

FlatChunk& AddChunk(const BlockLibrary& blockLibrary, const ChunkIndices& indices, const Nz::FunctionRef<void(BlockIndex* blocks)>& initCallback = nullptr);
Expand All @@ -50,7 +50,7 @@ namespace tsom
inline void UpdateUpDirection(const Nz::Vector3f& upDirection);

Ship& operator=(const Ship&) = delete;
Ship& operator=(Ship&&) noexcept = default;
Ship& operator=(Ship&&) = delete;

static constexpr unsigned int ChunkSize = 32;

Expand Down
6 changes: 3 additions & 3 deletions src/CommonLib/Entities/ChunkClassLibrary.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ namespace tsom
{
registry.RegisterClass(EntityClass("planet", {
{
{ .name = "CellSize", .type = EntityPropertyType::Float, .defaultValue = EntityPropertySingleValue<EntityPropertyType::Float>(1.f), .isNetworked = true },
{ .name = "CornerRadius", .type = EntityPropertyType::Float, .defaultValue = EntityPropertySingleValue<EntityPropertyType::Float>(16.f), .isNetworked = true },
{ .name = "Gravity", .type = EntityPropertyType::Float, .defaultValue = EntityPropertySingleValue<EntityPropertyType::Float>(9.81f), .isNetworked = true }
EntityClass::Property { .name = "CellSize", .type = EntityPropertyType::Float, .defaultValue = EntityPropertySingleValue<EntityPropertyType::Float>(1.f), .isNetworked = true },
EntityClass::Property { .name = "CornerRadius", .type = EntityPropertyType::Float, .defaultValue = EntityPropertySingleValue<EntityPropertyType::Float>(16.f), .isNetworked = true },
EntityClass::Property { .name = "Gravity", .type = EntityPropertyType::Float, .defaultValue = EntityPropertySingleValue<EntityPropertyType::Float>(9.81f), .isNetworked = true }
}
},
{
Expand Down

0 comments on commit 5010b06

Please sign in to comment.