From 7c5b0df96cf86702d5587569c485ede4e3f0831c Mon Sep 17 00:00:00 2001 From: Faymoon Date: Sat, 8 Sep 2018 10:28:25 +0200 Subject: [PATCH] Make all component inherits of HandledObject (#185) * Update * Add: [Get/Set]AngularDaming for standardization * Fix: Name error * Add: [Get/Set][AngularDamping/MomentOfInertia] in PhysicsComponent2D * Forgot in last commit * Add: param coordSys in [PhysicsComponent2D/RigidBody2D]::SetMassCenter * Add: Some forgotten inline * Fix little error * Fix: Indentation before case * Move and Change GetCenterOfGravity * Rename m_world into m_physWorld * Rename GetWorld int GetPhysWorld * Update: PhysicsSystem2D became an interface of PhysWorld2D * Update Collison/PhysicsComponent because GetWorld was renamed * Update tests * Update: Make the interface usable with Entity instead of PhysicsComponent * Update: Make GetPhysWorld private * Update PhysicsSystem2D.hpp * Update: indent * Remove: useless blank line * update order(?) * Update PhysicsSystem2D.hpp * Add calls to GetPhysWorld to attempt a nullptr value * update include * little fix * add some missing inline * Fix * Make all component inherits of HandledObject * fix: compilation error * Add Handle alias for all Components * forgot in last commit --- SDK/include/NDK/Component.hpp | 2 +- SDK/include/NDK/Components/CameraComponent.hpp | 2 +- SDK/include/NDK/Components/CameraComponent.inl | 1 - SDK/include/NDK/Components/CollisionComponent2D.hpp | 4 ++++ SDK/include/NDK/Components/CollisionComponent3D.hpp | 4 ++++ SDK/include/NDK/Components/ConstraintComponent2D.hpp | 4 ++++ SDK/include/NDK/Components/DebugComponent.hpp | 4 ++++ SDK/include/NDK/Components/GraphicsComponent.hpp | 2 +- SDK/include/NDK/Components/GraphicsComponent.inl | 1 - SDK/include/NDK/Components/LightComponent.hpp | 6 +++++- SDK/include/NDK/Components/ListenerComponent.hpp | 4 ++++ SDK/include/NDK/Components/NodeComponent.hpp | 2 +- SDK/include/NDK/Components/ParticleEmitterComponent.hpp | 4 ++++ SDK/include/NDK/Components/ParticleGroupComponent.hpp | 4 ++-- SDK/include/NDK/Components/PhysicsComponent2D.hpp | 4 ++++ SDK/include/NDK/Components/PhysicsComponent3D.hpp | 4 ++++ SDK/include/NDK/Components/VelocityComponent.hpp | 2 +- 17 files changed, 44 insertions(+), 10 deletions(-) diff --git a/SDK/include/NDK/Component.hpp b/SDK/include/NDK/Component.hpp index a3bc1cac2..6b32c5fd2 100644 --- a/SDK/include/NDK/Component.hpp +++ b/SDK/include/NDK/Component.hpp @@ -12,7 +12,7 @@ namespace Ndk { template - class Component : public BaseComponent + class Component : public BaseComponent, public Nz::HandledObject { public: Component(); diff --git a/SDK/include/NDK/Components/CameraComponent.hpp b/SDK/include/NDK/Components/CameraComponent.hpp index e9a4de2da..92fab2e0e 100644 --- a/SDK/include/NDK/Components/CameraComponent.hpp +++ b/SDK/include/NDK/Components/CameraComponent.hpp @@ -22,7 +22,7 @@ namespace Ndk using CameraComponentHandle = Nz::ObjectHandle; - class NDK_API CameraComponent : public Component, public Nz::AbstractViewer, public Nz::HandledObject + class NDK_API CameraComponent : public Component, public Nz::AbstractViewer { public: inline CameraComponent(); diff --git a/SDK/include/NDK/Components/CameraComponent.inl b/SDK/include/NDK/Components/CameraComponent.inl index 4baad5225..df6d5a2b3 100644 --- a/SDK/include/NDK/Components/CameraComponent.inl +++ b/SDK/include/NDK/Components/CameraComponent.inl @@ -38,7 +38,6 @@ namespace Ndk inline CameraComponent::CameraComponent(const CameraComponent& camera) : Component(camera), AbstractViewer(camera), - HandledObject(camera), m_visibilityHash(camera.m_visibilityHash), m_projectionType(camera.m_projectionType), m_targetRegion(camera.m_targetRegion), diff --git a/SDK/include/NDK/Components/CollisionComponent2D.hpp b/SDK/include/NDK/Components/CollisionComponent2D.hpp index 6908c2bef..aecdc5197 100644 --- a/SDK/include/NDK/Components/CollisionComponent2D.hpp +++ b/SDK/include/NDK/Components/CollisionComponent2D.hpp @@ -14,6 +14,10 @@ namespace Ndk { + class CollisionComponent2D; + + using CollisionComponent2DHandle = Nz::ObjectHandle; + class NDK_API CollisionComponent2D : public Component { friend class PhysicsSystem2D; diff --git a/SDK/include/NDK/Components/CollisionComponent3D.hpp b/SDK/include/NDK/Components/CollisionComponent3D.hpp index 5c14f2c70..65e48576b 100644 --- a/SDK/include/NDK/Components/CollisionComponent3D.hpp +++ b/SDK/include/NDK/Components/CollisionComponent3D.hpp @@ -14,6 +14,10 @@ namespace Ndk { + class CollisionComponent3D; + + using CollisionComponent3DHandle = Nz::ObjectHandle; + class NDK_API CollisionComponent3D : public Component { friend class PhysicsSystem3D; diff --git a/SDK/include/NDK/Components/ConstraintComponent2D.hpp b/SDK/include/NDK/Components/ConstraintComponent2D.hpp index 8ad80e1de..23fcfe4c8 100644 --- a/SDK/include/NDK/Components/ConstraintComponent2D.hpp +++ b/SDK/include/NDK/Components/ConstraintComponent2D.hpp @@ -11,6 +11,10 @@ namespace Ndk { + class ConstraintComponent2D; + + using ConstraintComponent2DHandle = Nz::ObjectHandle; + class NDK_API ConstraintComponent2D : public Component { public: diff --git a/SDK/include/NDK/Components/DebugComponent.hpp b/SDK/include/NDK/Components/DebugComponent.hpp index 85e868b5a..206f85724 100644 --- a/SDK/include/NDK/Components/DebugComponent.hpp +++ b/SDK/include/NDK/Components/DebugComponent.hpp @@ -40,6 +40,10 @@ namespace Ndk constexpr DebugDrawFlags DebugDraw_None = 0; + class DebugComponent; + + using DebugComponentHandle = Nz::ObjectHandle; + class NDK_API DebugComponent : public Component { friend class DebugSystem; diff --git a/SDK/include/NDK/Components/GraphicsComponent.hpp b/SDK/include/NDK/Components/GraphicsComponent.hpp index 83afc22f1..e7780f3e0 100644 --- a/SDK/include/NDK/Components/GraphicsComponent.hpp +++ b/SDK/include/NDK/Components/GraphicsComponent.hpp @@ -22,7 +22,7 @@ namespace Ndk using GraphicsComponentCullingList = Nz::CullingList; using GraphicsComponentHandle = Nz::ObjectHandle; - class NDK_API GraphicsComponent : public Component, public Nz::HandledObject + class NDK_API GraphicsComponent : public Component { friend class RenderSystem; diff --git a/SDK/include/NDK/Components/GraphicsComponent.inl b/SDK/include/NDK/Components/GraphicsComponent.inl index f7cfb07ba..37bbd1049 100644 --- a/SDK/include/NDK/Components/GraphicsComponent.inl +++ b/SDK/include/NDK/Components/GraphicsComponent.inl @@ -22,7 +22,6 @@ namespace Ndk */ inline GraphicsComponent::GraphicsComponent(const GraphicsComponent& graphicsComponent) : Component(graphicsComponent), - HandledObject(graphicsComponent), m_reflectiveMaterialCount(0), m_aabb(graphicsComponent.m_aabb), m_transformMatrix(graphicsComponent.m_transformMatrix), diff --git a/SDK/include/NDK/Components/LightComponent.hpp b/SDK/include/NDK/Components/LightComponent.hpp index fcf59f179..a7f72d0eb 100644 --- a/SDK/include/NDK/Components/LightComponent.hpp +++ b/SDK/include/NDK/Components/LightComponent.hpp @@ -1,4 +1,4 @@ -// Copyright (C) 2017 Jérôme Leclercq +// Copyright (C) 2017 Jérôme Leclercq // This file is part of the "Nazara Development Kit" // For conditions of distribution and use, see copyright notice in Prerequisites.hpp @@ -13,6 +13,10 @@ namespace Ndk { + class LightComponent; + + using LightComponentHandle = Nz::ObjectHandle; + class NDK_API LightComponent : public Component, public Nz::Light { public: diff --git a/SDK/include/NDK/Components/ListenerComponent.hpp b/SDK/include/NDK/Components/ListenerComponent.hpp index 605f425a2..d5debdd36 100644 --- a/SDK/include/NDK/Components/ListenerComponent.hpp +++ b/SDK/include/NDK/Components/ListenerComponent.hpp @@ -12,6 +12,10 @@ namespace Ndk { + class ListenerComponent; + + using ListenerComponentHandle = Nz::ObjectHandle; + class NDK_API ListenerComponent : public Component { public: diff --git a/SDK/include/NDK/Components/NodeComponent.hpp b/SDK/include/NDK/Components/NodeComponent.hpp index 5661ab3ea..bccba1233 100644 --- a/SDK/include/NDK/Components/NodeComponent.hpp +++ b/SDK/include/NDK/Components/NodeComponent.hpp @@ -17,7 +17,7 @@ namespace Ndk using NodeComponentHandle = Nz::ObjectHandle; - class NDK_API NodeComponent : public Component, public Nz::Node, public Nz::HandledObject + class NDK_API NodeComponent : public Component, public Nz::Node { public: NodeComponent() = default; diff --git a/SDK/include/NDK/Components/ParticleEmitterComponent.hpp b/SDK/include/NDK/Components/ParticleEmitterComponent.hpp index f50229ef5..0c7497a3b 100644 --- a/SDK/include/NDK/Components/ParticleEmitterComponent.hpp +++ b/SDK/include/NDK/Components/ParticleEmitterComponent.hpp @@ -13,6 +13,10 @@ namespace Ndk { + class ParticleEmitterComponent; + + using ParticleEmitterComponentHandle = Nz::ObjectHandle; + class NDK_API ParticleEmitterComponent : public Component, public Nz::ParticleEmitter { public: diff --git a/SDK/include/NDK/Components/ParticleGroupComponent.hpp b/SDK/include/NDK/Components/ParticleGroupComponent.hpp index 981dbd11e..9415b8547 100644 --- a/SDK/include/NDK/Components/ParticleGroupComponent.hpp +++ b/SDK/include/NDK/Components/ParticleGroupComponent.hpp @@ -17,7 +17,7 @@ namespace Ndk using ParticleGroupComponentHandle = Nz::ObjectHandle; - class NDK_API ParticleGroupComponent : public Component, public Nz::ParticleGroup, public Nz::HandledObject + class NDK_API ParticleGroupComponent : public Component, public Nz::ParticleGroup { public: inline ParticleGroupComponent(unsigned int maxParticleCount, Nz::ParticleLayout layout); @@ -38,4 +38,4 @@ namespace Ndk #include #endif // NDK_COMPONENTS_PARTICLEGROUPCOMPONENT_HPP -#endif // NDK_SERVER \ No newline at end of file +#endif // NDK_SERVER diff --git a/SDK/include/NDK/Components/PhysicsComponent2D.hpp b/SDK/include/NDK/Components/PhysicsComponent2D.hpp index c1a741153..74b6d630e 100644 --- a/SDK/include/NDK/Components/PhysicsComponent2D.hpp +++ b/SDK/include/NDK/Components/PhysicsComponent2D.hpp @@ -13,6 +13,10 @@ namespace Ndk { + class PhysicsComponent2D; + + using PhysicsComponent2DHandle = Nz::ObjectHandle; + class NDK_API PhysicsComponent2D : public Component { friend class CollisionComponent2D; diff --git a/SDK/include/NDK/Components/PhysicsComponent3D.hpp b/SDK/include/NDK/Components/PhysicsComponent3D.hpp index d7c9ddd52..08cc64081 100644 --- a/SDK/include/NDK/Components/PhysicsComponent3D.hpp +++ b/SDK/include/NDK/Components/PhysicsComponent3D.hpp @@ -13,6 +13,10 @@ namespace Ndk { + class PhysicsComponent3D; + + using PhysicsComponent3DHandle = Nz::ObjectHandle; + class NDK_API PhysicsComponent3D : public Component { friend class CollisionComponent3D; diff --git a/SDK/include/NDK/Components/VelocityComponent.hpp b/SDK/include/NDK/Components/VelocityComponent.hpp index 6497fd61a..8785f6861 100644 --- a/SDK/include/NDK/Components/VelocityComponent.hpp +++ b/SDK/include/NDK/Components/VelocityComponent.hpp @@ -16,7 +16,7 @@ namespace Ndk using VelocityComponentHandle = Nz::ObjectHandle; - class NDK_API VelocityComponent : public Component, public Nz::HandledObject + class NDK_API VelocityComponent : public Component { public: VelocityComponent(const Nz::Vector3f& velocity = Nz::Vector3f::Zero());