sid/NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Renamed (Oriented)Cube to (Oriented)Box

Browse Source 
Also renamed BoundingBox to BoundingVolume


Former-commit-id: 795c70c265ba17f6b96fc30799e89f140c52852b
This commit is contained in:
Lynix
2013-06-03 14:18:31 +02:00
parent 7e9dd26991
commit fb839de33e
46 changed files with 1008 additions and 1007 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/Nazara/Graphics/Camera.hpp
View File

@@ -29,7 +29,7 @@ class NAZARA_API NzCamera : public NzSceneNode
void EnsureViewMatrixUpdate() const;
float GetAspectRatio() const;
const NzBoundingBoxf& GetBoundingBox() const override;
const NzBoundingVolumef& GetBoundingVolume() const override;
float GetFOV() const;
const NzFrustumf& GetFrustum() const;
const NzMatrix4f& GetProjectionMatrix() const;

8
include/Nazara/Graphics/Light.hpp
View File

@@ -25,9 +25,9 @@ class NAZARA_API NzLight : public NzSceneNode
void Apply(const NzShader* shader, unsigned int lightUnit) const;
const NzBoundingBoxf& GetBoundingBox() const;
NzColor GetAmbientColor() const;
float GetAttenuation() const;
const NzBoundingVolumef& GetBoundingVolume() const;
NzColor GetDiffuseColor() const;
float GetInnerAngle() const;
nzLightType GetLightType() const;
@@ -50,15 +50,15 @@ class NAZARA_API NzLight : public NzSceneNode
void Invalidate();
void Register();
void Unregister();
void UpdateBoundingBox() const;
void UpdateBoundingVolume() const;
bool VisibilityTest(const NzFrustumf& frustum);
nzLightType m_type;
mutable NzBoundingBoxf m_boundingBox;
mutable NzBoundingVolumef m_boundingVolume;
NzColor m_ambientColor;
NzColor m_diffuseColor;
NzColor m_specularColor;
mutable bool m_boundingBoxUpdated;
mutable bool m_boundingVolumeUpdated;
float m_attenuation;
float m_innerAngle;
float m_outerAngle;

10
include/Nazara/Graphics/Model.hpp
View File

@@ -48,7 +48,7 @@ class NAZARA_API NzModel : public NzSceneNode, public NzUpdatable
void EnableDraw(bool draw);
NzAnimation* GetAnimation() const;
const NzBoundingBoxf& GetBoundingBox() const;
const NzBoundingVolumef& GetBoundingVolume() const;
NzMaterial* GetMaterial(const NzString& subMeshName) const;
NzMaterial* GetMaterial(unsigned int matIndex) const;
NzMaterial* GetMaterial(unsigned int skinIndex, const NzString& subMeshName) const;
@@ -92,17 +92,17 @@ class NAZARA_API NzModel : public NzSceneNode, public NzUpdatable
void Register() override;
void Unregister() override;
void Update() override;
void UpdateBoundingBox() const;
void UpdateBoundingVolume() const;
bool VisibilityTest(const NzFrustumf& frustum) override;
std::vector<NzMaterialRef> m_materials;
mutable NzBoundingBoxf m_boundingBox;
NzSkeleton m_skeleton; // Uniquement pour les animations squelettiques
NzAnimationRef m_animation;
mutable NzBoundingVolumef m_boundingVolume;
NzMeshRef m_mesh;
NzSkeleton m_skeleton; // Uniquement pour les animations squelettiques
const NzSequence* m_currentSequence;
bool m_animationEnabled;
mutable bool m_boundingBoxUpdated;
mutable bool m_boundingVolumeUpdated;
bool m_drawEnabled;
float m_interpolation;
unsigned int m_currentFrame;

4
include/Nazara/Graphics/SceneNode.hpp
View File

@@ -10,7 +10,7 @@
#include <Nazara/Prerequesites.hpp>
#include <Nazara/Graphics/Enums.hpp>
#include <Nazara/Graphics/Scene.hpp>
#include <Nazara/Math/BoundingBox.hpp>
#include <Nazara/Math/BoundingVolume.hpp>
#include <Nazara/Math/Frustum.hpp>
#include <Nazara/Utility/Node.hpp>
@@ -25,7 +25,7 @@ class NAZARA_API NzSceneNode : public NzNode
virtual void AddToRenderQueue(NzAbstractRenderQueue* renderQueue) const = 0;
virtual const NzBoundingBoxf& GetBoundingBox() const = 0;
virtual const NzBoundingVolumef& GetBoundingVolume() const = 0;
nzNodeType GetNodeType() const final;
NzScene* GetScene() const;
virtual nzSceneNodeType GetSceneNodeType() const = 0;

2
include/Nazara/Graphics/SceneRoot.hpp
View File

@@ -19,7 +19,7 @@ class NAZARA_API NzSceneRoot : public NzSceneNode
public:
void AddToRenderQueue(NzAbstractRenderQueue* renderQueue) const override;
const NzBoundingBoxf& GetBoundingBox() const override;
const NzBoundingVolumef& GetBoundingVolume() const override;
nzSceneNodeType GetSceneNodeType() const override;
private: