Skip to content

Commit

Permalink
Cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
@Kanma
Kanma committed Jul 13, 2012
1 parent 7902f74 commit 2ff9edf
Show file tree
Hide file tree
Showing 56 changed files with 6,017 additions and 6,017 deletions.
54 changes: 27 additions & 27 deletions include/Athena-Graphics/Conversions.h
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/** @file Conversions.h
@author Philip Abbet
/** @file Conversions.h
@author Philip Abbet
Declaration of some conversion functions between Athena and Ogre types
Declaration of some conversion functions between Athena and Ogre types
*/

#ifndef _ATHENA_GRAPHICS_CONVERSIONS_H_
Expand Down Expand Up @@ -33,40 +33,40 @@
namespace Athena {
namespace Graphics {

Ogre::Vector2 toOgre(const Math::Vector2& v);
Ogre::Vector3 toOgre(const Math::Vector3& v);
Ogre::Vector4 toOgre(const Math::Vector4& v);
Ogre::Vector2 toOgre(const Math::Vector2& v);
Ogre::Vector3 toOgre(const Math::Vector3& v);
Ogre::Vector4 toOgre(const Math::Vector4& v);

Ogre::Quaternion toOgre(const Math::Quaternion& q);
Ogre::ColourValue toOgre(const Math::Color& c);
Ogre::AxisAlignedBox toOgre(const Math::AxisAlignedBox& b);
Ogre::Quaternion toOgre(const Math::Quaternion& q);
Ogre::ColourValue toOgre(const Math::Color& c);
Ogre::AxisAlignedBox toOgre(const Math::AxisAlignedBox& b);

Ogre::Matrix3 toOgre(const Math::Matrix3& m);
Ogre::Matrix4 toOgre(const Math::Matrix4& m);
Ogre::Matrix3 toOgre(const Math::Matrix3& m);
Ogre::Matrix4 toOgre(const Math::Matrix4& m);

Ogre::Radian toOgre(const Math::Radian& a);
Ogre::Degree toOgre(const Math::Degree& a);
Ogre::Radian toOgre(const Math::Radian& a);
Ogre::Degree toOgre(const Math::Degree& a);

Ogre::Plane toOgre(const Math::Plane& p);
Ogre::Sphere toOgre(const Math::Sphere& s);
Ogre::Plane toOgre(const Math::Plane& p);
Ogre::Sphere toOgre(const Math::Sphere& s);


Math::Vector2 fromOgre(const Ogre::Vector2& v);
Math::Vector3 fromOgre(const Ogre::Vector3& v);
Math::Vector4 fromOgre(const Ogre::Vector4& v);
Math::Vector2 fromOgre(const Ogre::Vector2& v);
Math::Vector3 fromOgre(const Ogre::Vector3& v);
Math::Vector4 fromOgre(const Ogre::Vector4& v);

Math::Quaternion fromOgre(const Ogre::Quaternion& q);
Math::Color fromOgre(const Ogre::ColourValue& c);
Math::AxisAlignedBox fromOgre(const Ogre::AxisAlignedBox& b);
Math::Quaternion fromOgre(const Ogre::Quaternion& q);
Math::Color fromOgre(const Ogre::ColourValue& c);
Math::AxisAlignedBox fromOgre(const Ogre::AxisAlignedBox& b);

Math::Matrix3 fromOgre(const Ogre::Matrix3& m);
Math::Matrix4 fromOgre(const Ogre::Matrix4& m);
Math::Matrix3 fromOgre(const Ogre::Matrix3& m);
Math::Matrix4 fromOgre(const Ogre::Matrix4& m);

Math::Radian fromOgre(const Ogre::Radian& a);
Math::Degree fromOgre(const Ogre::Degree& a);
Math::Radian fromOgre(const Ogre::Radian& a);
Math::Degree fromOgre(const Ogre::Degree& a);

Math::Plane fromOgre(const Ogre::Plane& p);
Math::Sphere fromOgre(const Ogre::Sphere& s);
Math::Plane fromOgre(const Ogre::Plane& p);
Math::Sphere fromOgre(const Ogre::Sphere& s);

}
}
Expand Down
88 changes: 44 additions & 44 deletions include/Athena-Graphics/Debug/AudioListener.h
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/** @file AudioListener.h
@author Philip Abbet
/** @file AudioListener.h
@author Philip Abbet
Declaration of the class 'Athena::Graphics::Debug::AudioListener'
Declaration of the class 'Athena::Graphics::Debug::AudioListener'
*/

#ifndef _ATHENA_GRAPHICS_DEBUG_AUDIOLISTENER_H_
Expand All @@ -17,87 +17,87 @@ namespace Debug {


//---------------------------------------------------------------------------------------
/// @brief Debug component that display an audio listener symbol
/// @brief Debug component that display an audio listener symbol
//---------------------------------------------------------------------------------------
class ATHENA_GRAPHICS_SYMBOL AudioListener: public DebugComponent
{
//_____ Construction / Destruction __________
//_____ Construction / Destruction __________
public:
//-----------------------------------------------------------------------------------
/// @brief Constructor
/// @param strName Name of the component
/// @brief Constructor
/// @param strName Name of the component
//-----------------------------------------------------------------------------------
AudioListener(const std::string& strName, Entities::ComponentsList* pList);
AudioListener(const std::string& strName, Entities::ComponentsList* pList);

//-----------------------------------------------------------------------------------
/// @brief Create a new component (Component creation method)
/// @brief Create a new component (Component creation method)
///
/// @param strName Name of the component
/// @param pList List to which the component must be added
/// @return The new component
/// @param strName Name of the component
/// @param pList List to which the component must be added
/// @return The new component
//-----------------------------------------------------------------------------------
static AudioListener* create(const std::string& strName, Entities::ComponentsList* pList);
static AudioListener* create(const std::string& strName, Entities::ComponentsList* pList);

//-----------------------------------------------------------------------------------
/// @brief Cast a component to an AudioListener
/// @brief Cast a component to an AudioListener
///
/// @param pComponent The component
/// @return The component, 0 if it isn't castable to a Camera
/// @param pComponent The component
/// @return The component, 0 if it isn't castable to a Camera
//-----------------------------------------------------------------------------------
static AudioListener* cast(Entities::Component* pComponent);
static AudioListener* cast(Entities::Component* pComponent);

protected:
//-----------------------------------------------------------------------------------
/// @brief Destructor
/// @brief Destructor
//-----------------------------------------------------------------------------------
virtual ~AudioListener();
virtual ~AudioListener();


//_____ Implementation of CDebugComponent __________
//_____ Implementation of CDebugComponent __________
public:
//-----------------------------------------------------------------------------------
/// @brief Show the audio listener symbol
/// @brief Show the audio listener symbol
//-----------------------------------------------------------------------------------
virtual void show();
virtual void show();

//-----------------------------------------------------------------------------------
/// @brief Hide the audio listener symbol
/// @brief Hide the audio listener symbol
//-----------------------------------------------------------------------------------
virtual void hide();
virtual void hide();

//-----------------------------------------------------------------------------------
/// @brief Returns the type of the component
/// @return The type
//-----------------------------------------------------------------------------------
virtual const std::string getType() const
{
return TYPE;
}
//-----------------------------------------------------------------------------------
/// @brief Returns the type of the component
/// @return The type
//-----------------------------------------------------------------------------------
virtual const std::string getType() const
{
return TYPE;
}


//_____ Management of the properties __________
//_____ Management of the properties __________
public:
//-----------------------------------------------------------------------------------
/// @brief Returns a list containing the properties of the component
/// @brief Returns a list containing the properties of the component
///
/// Used in the serialization mecanism of the components
/// @remark Must be overriden by each component type. Each implementation must first call
/// its base class one, and add a new category (named after the component's type)
/// AT THE BEGINNING of the obtained list, containing the properties related to
/// this type.
/// @return The list of properties
/// @remark Must be overriden by each component type. Each implementation must first call
/// its base class one, and add a new category (named after the component's type)
/// AT THE BEGINNING of the obtained list, containing the properties related to
/// this type.
/// @return The list of properties
//-----------------------------------------------------------------------------------
virtual Utils::PropertiesList* getProperties() const;
virtual Utils::PropertiesList* getProperties() const;


//_____ Constants __________
//_____ Constants __________
public:
static const std::string TYPE; ///< Name of the type of component
static const std::string TYPE; ///< Name of the type of component


//_____ Attributes __________
//_____ Attributes __________
protected:
std::vector<Line3D*> m_lines; ///< Lines used to represents the source
std::vector<Line3D*> m_lines; ///< Lines used to represents the source
};

}
Expand Down
88 changes: 44 additions & 44 deletions include/Athena-Graphics/Debug/AudioSource.h
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/** @file AudioSource.h
@author Philip Abbet
/** @file AudioSource.h
@author Philip Abbet
Declaration of the class 'Athena::Graphics::Debug::AudioSource'
Declaration of the class 'Athena::Graphics::Debug::AudioSource'
*/

#ifndef _ATHENA_GRAPHICS_DEBUG_AUDIOSOURCE_H_
Expand All @@ -17,87 +17,87 @@ namespace Debug {


//---------------------------------------------------------------------------------------
/// @brief Debug component that display an audio source symbol
/// @brief Debug component that display an audio source symbol
//---------------------------------------------------------------------------------------
class ATHENA_GRAPHICS_SYMBOL AudioSource: public DebugComponent
{
//_____ Construction / Destruction __________
//_____ Construction / Destruction __________
public:
//-----------------------------------------------------------------------------------
/// @brief Constructor
/// @param strName Name of the component
/// @brief Constructor
/// @param strName Name of the component
//-----------------------------------------------------------------------------------
AudioSource(const std::string& strName, Entities::ComponentsList* pList);
AudioSource(const std::string& strName, Entities::ComponentsList* pList);

//-----------------------------------------------------------------------------------
/// @brief Create a new component (Component creation method)
/// @brief Create a new component (Component creation method)
///
/// @param strName Name of the component
/// @param pList List to which the component must be added
/// @return The new component
/// @param strName Name of the component
/// @param pList List to which the component must be added
/// @return The new component
//-----------------------------------------------------------------------------------
static AudioSource* create(const std::string& strName, Entities::ComponentsList* pList);
static AudioSource* create(const std::string& strName, Entities::ComponentsList* pList);

//-----------------------------------------------------------------------------------
/// @brief Cast a component to an AudioSource
/// @brief Cast a component to an AudioSource
///
/// @param pComponent The component
/// @return The component, 0 if it isn't castable to a Camera
/// @param pComponent The component
/// @return The component, 0 if it isn't castable to a Camera
//-----------------------------------------------------------------------------------
static AudioSource* cast(Entities::Component* pComponent);
static AudioSource* cast(Entities::Component* pComponent);

protected:
//-----------------------------------------------------------------------------------
/// @brief Destructor
/// @brief Destructor
//-----------------------------------------------------------------------------------
virtual ~AudioSource();
virtual ~AudioSource();


//_____ Implementation of CDebugComponent __________
//_____ Implementation of CDebugComponent __________
public:
//-----------------------------------------------------------------------------------
/// @brief Show the audio source symbol
/// @brief Show the audio source symbol
//-----------------------------------------------------------------------------------
virtual void show();
virtual void show();

//-----------------------------------------------------------------------------------
/// @brief Hide the audio source symbol
/// @brief Hide the audio source symbol
//-----------------------------------------------------------------------------------
virtual void hide();
virtual void hide();

//-----------------------------------------------------------------------------------
/// @brief Returns the type of the component
/// @return The type
//-----------------------------------------------------------------------------------
virtual const std::string getType() const
{
return TYPE;
}
//-----------------------------------------------------------------------------------
/// @brief Returns the type of the component
/// @return The type
//-----------------------------------------------------------------------------------
virtual const std::string getType() const
{
return TYPE;
}


//_____ Management of the properties __________
//_____ Management of the properties __________
public:
//-----------------------------------------------------------------------------------
/// @brief Returns a list containing the properties of the component
/// @brief Returns a list containing the properties of the component
///
/// Used in the serialization mecanism of the components
/// @remark Must be overriden by each component type. Each implementation must first call
/// its base class one, and add a new category (named after the component's type)
/// AT THE BEGINNING of the obtained list, containing the properties related to
/// this type.
/// @return The list of properties
/// @remark Must be overriden by each component type. Each implementation must first call
/// its base class one, and add a new category (named after the component's type)
/// AT THE BEGINNING of the obtained list, containing the properties related to
/// this type.
/// @return The list of properties
//-----------------------------------------------------------------------------------
virtual Utils::PropertiesList* getProperties() const;
virtual Utils::PropertiesList* getProperties() const;


//_____ Constants __________
//_____ Constants __________
public:
static const std::string TYPE; ///< Name of the type of component
static const std::string TYPE; ///< Name of the type of component


//_____ Attributes __________
//_____ Attributes __________
protected:
std::vector<Line3D*> m_lines; ///< Lines used to represents the source
std::vector<Line3D*> m_lines; ///< Lines used to represents the source
};

}
Expand Down
Loading

0 comments on commit 2ff9edf

Please sign in to comment.