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

Moved AxisAlignedBox to mathematic module

Browse Source 
Former-commit-id: 2cb5b151941a431b5c12457f0decf7b39195052d
This commit is contained in:
Lynix
2013-02-19 12:32:11 +01:00
parent d56900fe01
commit add363a290
21 changed files with 762 additions and 399 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/Nazara/Renderer/DebugDrawer.cpp
View File

@@ -7,7 +7,6 @@
#include <Nazara/Renderer/Renderer.hpp>
#include <Nazara/Renderer/Shader.hpp>
#include <Nazara/Renderer/ShaderBuilder.hpp>
#include <Nazara/Utility/AxisAlignedBox.hpp>
#include <Nazara/Utility/BufferMapper.hpp>
#include <Nazara/Utility/Mesh.hpp>
#include <Nazara/Utility/Skeleton.hpp>
@@ -32,7 +31,7 @@ namespace
static int colorLocation = -1;
}
void NzDebugDrawer::Draw(const NzAxisAlignedBox& aabb)
void NzDebugDrawer::Draw(const NzAxisAlignedBoxf& aabb)
{
if (!aabb.IsFinite())
return;

279
src/Nazara/Utility/AxisAlignedBox.cpp
View File

@@ -1,279 +0,0 @@
// Copyright (C) 2012 Jérôme Leclercq
// This file is part of the "Nazara Engine - Utility module"
// For conditions of distribution and use, see copyright notice in Config.hpp
#include <Nazara/Utility/AxisAlignedBox.hpp>
#include <Nazara/Core/Error.hpp>
#include <Nazara/Utility/Debug.hpp>
NzAxisAlignedBox::NzAxisAlignedBox() :
m_extend(nzExtend_Null)
{
}
NzAxisAlignedBox::NzAxisAlignedBox(const NzCubef& cube) :
m_extend(nzExtend_Finite),
m_cube(cube)
{
}
NzAxisAlignedBox::NzAxisAlignedBox(const NzVector3f& vec1, const NzVector3f& vec2) :
m_extend(nzExtend_Finite),
m_cube(vec1, vec2)
{
}
NzAxisAlignedBox::NzAxisAlignedBox(nzExtend extend) :
m_extend(extend)
{
}
bool NzAxisAlignedBox::Contains(const NzAxisAlignedBox& box)
{
if (m_extend == nzExtend_Null || box.m_extend == nzExtend_Null)
return false;
else if (m_extend == nzExtend_Infinite || box.m_extend == nzExtend_Infinite)
return true;
return m_cube.Contains(box.m_cube);
}
bool NzAxisAlignedBox::Contains(const NzVector3f& vector)
{
switch (m_extend)
{
case nzExtend_Finite:
return m_cube.Contains(vector);
case nzExtend_Infinite:
return true;
case nzExtend_Null:
return false;
}
NazaraError("Extend type not handled (0x" + NzString::Number(m_extend, 16) + ')');
return false;
}
void NzAxisAlignedBox::ExtendTo(const NzAxisAlignedBox& box)
{
switch (m_extend)
{
case nzExtend_Finite:
switch (box.m_extend)
{
case nzExtend_Finite:
m_cube.ExtendTo(box.m_cube);
break;
case nzExtend_Infinite:
SetInfinite();
break;
case nzExtend_Null:
break;
}
break;
case nzExtend_Infinite:
// Rien à faire
break;
case nzExtend_Null:
operator=(box);
break;
}
}
void NzAxisAlignedBox::ExtendTo(const NzVector3f& vector)
{
switch (m_extend)
{
case nzExtend_Finite:
m_cube.ExtendTo(vector);
break;
case nzExtend_Infinite:
// Rien à faire
break;
case nzExtend_Null:
m_extend = nzExtend_Finite;
m_cube.Set(vector, vector);
break;
}
}
NzVector3f NzAxisAlignedBox::GetCorner(nzCorner corner) const
{
switch (m_extend)
{
case nzExtend_Finite:
return m_cube.GetCorner(corner);
case nzExtend_Infinite:
// Il est possible de renvoyer un vecteur avec des flottants infinis dont le signe dépend du coin
// Bien que ça soit plus juste mathématiquement, je ne vois pas l'intérêt...
NazaraError("Infinite AABB has no corner");
return NzVector3f();
case nzExtend_Null:
return NzVector3f::Zero();
}
NazaraError("Extend type not handled (0x" + NzString::Number(m_extend, 16) + ')');
return NzVector3f();
}
NzCubef NzAxisAlignedBox::GetCube() const
{
return m_cube;
}
nzExtend NzAxisAlignedBox::GetExtend() const
{
return m_extend;
}
NzVector3f NzAxisAlignedBox::GetMaximum() const
{
return m_cube.GetPosition() + m_cube.GetSize();
}
NzVector3f NzAxisAlignedBox::GetMinimum() const
{
return m_cube.GetPosition();
}
bool NzAxisAlignedBox::IsFinite() const
{
return m_extend == nzExtend_Finite;
}
bool NzAxisAlignedBox::IsInfinite() const
{
return m_extend == nzExtend_Infinite;
}
bool NzAxisAlignedBox::IsNull() const
{
return m_extend == nzExtend_Null;
}
void NzAxisAlignedBox::SetInfinite()
{
m_extend = nzExtend_Infinite;
}
void NzAxisAlignedBox::SetExtends(const NzVector3f& vec1, const NzVector3f& vec2)
{
m_extend = nzExtend_Finite;
m_cube.Set(vec1, vec2);
}
void NzAxisAlignedBox::SetNull()
{
m_extend = nzExtend_Null;
}
NzString NzAxisAlignedBox::ToString() const
{
switch (m_extend)
{
case nzExtend_Finite:
return "NzAxisAlignedBox(min=" + GetMinimum().ToString() + ", max=" + GetMaximum().ToString() + ')';
case nzExtend_Infinite:
return "NzAxisAlignedBox(Infinite)";
case nzExtend_Null:
return "NzAxisAlignedBox(Null)";
}
return "NzAxisAlignedBox(ERROR)";
}
void NzAxisAlignedBox::Transform(const NzMatrix4f& matrix, bool applyTranslation)
{
if (m_extend != nzExtend_Finite)
return;
NzVector3f center = matrix.Transform(m_cube.GetCenter(), (applyTranslation) ? 1.f : 0.f); // Valeur multipliant la translation
NzVector3f halfSize = m_cube.GetSize() * 0.5f;
halfSize.Set(std::fabs(matrix(0,0))*halfSize.x + std::fabs(matrix(1,0))*halfSize.y + std::fabs(matrix(2,0))*halfSize.z,
std::fabs(matrix(0,1))*halfSize.x + std::fabs(matrix(1,1))*halfSize.y + std::fabs(matrix(2,1))*halfSize.z,
std::fabs(matrix(0,2))*halfSize.x + std::fabs(matrix(1,2))*halfSize.y + std::fabs(matrix(2,2))*halfSize.z);
m_cube.Set(center - halfSize, center + halfSize);
}
NzAxisAlignedBox::operator NzString() const
{
return ToString();
}
NzAxisAlignedBox NzAxisAlignedBox::Lerp(const NzAxisAlignedBox& from, const NzAxisAlignedBox& to, float interpolation)
{
#ifdef NAZARA_DEBUG
if (interpolation < 0.f || interpolation > 1.f)
{
NazaraError("Interpolation must be in range [0..1] (Got " + NzString::Number(interpolation) + ')');
return Null;
}
#endif
if (NzNumberEquals(interpolation, 0.f))
return from;
if (NzNumberEquals(interpolation, 1.f))
return to;
switch (to.m_extend)
{
case nzExtend_Finite:
{
switch (from.m_extend)
{
case nzExtend_Finite:
return NzCubef::Lerp(from.m_cube, to.m_cube, interpolation);
case nzExtend_Infinite:
return Infinite;
case nzExtend_Null:
return from.m_cube * interpolation;
}
}
case nzExtend_Infinite:
return Infinite; // Un petit peu d'infini est infini quand même ;)
case nzExtend_Null:
{
switch (from.m_extend)
{
case nzExtend_Finite:
return from.m_cube * (1.f - interpolation);
case nzExtend_Infinite:
return Infinite;
case nzExtend_Null:
return Null;
}
}
}
return Null;
}
const NzAxisAlignedBox NzAxisAlignedBox::Infinite(nzExtend_Infinite);
const NzAxisAlignedBox NzAxisAlignedBox::Null(nzExtend_Null);
std::ostream& operator<<(std::ostream& out, const NzAxisAlignedBox& aabb)
{
out << aabb.ToString();
return out;
}

18
src/Nazara/Utility/KeyframeMesh.cpp
View File

@@ -12,7 +12,7 @@
struct NzKeyframeMeshImpl
{
NzAxisAlignedBox* aabb;
NzAxisAlignedBoxf* aabb;
NzVector2f* uv;
NzVector3f* normals;
NzVector3f* positions;
@@ -59,7 +59,7 @@ bool NzKeyframeMesh::Create(NzVertexBuffer* vertexBuffer, unsigned int frameCoun
vertexBuffer->AddResourceReference();
m_impl = new NzKeyframeMeshImpl;
m_impl->aabb = new NzAxisAlignedBox[frameCount+1]; // La première case représente l'AABB interpolée
m_impl->aabb = new NzAxisAlignedBoxf[frameCount+1]; // La première case représente l'AABB interpolée
m_impl->frameCount = frameCount;
m_impl->vertexBuffer = vertexBuffer;
@@ -123,7 +123,7 @@ void NzKeyframeMesh::GenerateAABBs()
unsigned int vertexCount = m_impl->vertexBuffer->GetVertexCount();
for (unsigned int i = 0; i < m_impl->frameCount; ++i)
{
NzAxisAlignedBox& aabb = m_impl->aabb[i+1]; // l'AABB 0 est celle qui est interpolée
NzAxisAlignedBoxf& aabb = m_impl->aabb[i+1]; // l'AABB 0 est celle qui est interpolée
if (aabb.IsNull())
{
// Génération de l'AABB selon la position
@@ -134,13 +134,15 @@ void NzKeyframeMesh::GenerateAABBs()
}
}
const NzAxisAlignedBox& NzKeyframeMesh::GetAABB() const
const NzAxisAlignedBoxf& NzKeyframeMesh::GetAABB() const
{
#if NAZARA_UTILITY_SAFE
if (!m_impl)
{
NazaraError("Keyframe mesh not created");
return NzAxisAlignedBox::Null;
static NzAxisAlignedBoxf dummy(nzExtend_Null);
return dummy;
}
#endif
@@ -402,7 +404,7 @@ bool NzKeyframeMesh::IsValid()
return m_impl != nullptr;
}
void NzKeyframeMesh::SetAABB(unsigned int frameIndex, const NzAxisAlignedBox& aabb)
void NzKeyframeMesh::SetAABB(unsigned int frameIndex, const NzAxisAlignedBoxf& aabb)
{
#if NAZARA_UTILITY_SAFE
if (!m_impl)
@@ -500,7 +502,7 @@ void NzKeyframeMesh::SetPosition(unsigned int frameIndex, unsigned int vertexInd
unsigned int index = frameIndex*vertexCount + vertexIndex;
m_impl->positions[index] = position;
m_impl->aabb[frameIndex+1].SetNull(); // Invalidation de l'AABB
m_impl->aabb[frameIndex+1].MakeNull(); // Invalidation de l'AABB
}
void NzKeyframeMesh::SetTangent(unsigned int frameIndex, unsigned int vertexIndex, const NzVector3f& tangent)
@@ -564,7 +566,7 @@ void NzKeyframeMesh::InterpolateImpl(unsigned int frameA, unsigned int frameB, f
#endif
// Interpolation de l'AABB
m_impl->aabb[0] = NzAxisAlignedBox::Lerp(m_impl->aabb[frameA+1], m_impl->aabb[frameB+1], interpolation);
m_impl->aabb[0] = NzAxisAlignedBoxf::Lerp(m_impl->aabb[frameA+1], m_impl->aabb[frameB+1], interpolation);
NzMeshVertex* vertex = reinterpret_cast<NzMeshVertex*>(m_impl->vertexBuffer->Map(nzBufferAccess_DiscardAndWrite));
if (!vertex)

2
src/Nazara/Utility/Loaders/MD5Anim/Parser.cpp
View File

@@ -338,7 +338,7 @@ bool NzMD5AnimParser::ParseBounds()
return false;
}
m_frames[i].aabb.SetExtends(min, max);
m_frames[i].aabb.Set(min, max);
}
if (!Advance())

4
src/Nazara/Utility/Loaders/MD5Anim/Parser.hpp
View File

@@ -9,10 +9,10 @@
#include <Nazara/Prerequesites.hpp>
#include <Nazara/Core/InputStream.hpp>
#include <Nazara/Math/AxisAlignedBox.hpp>
#include <Nazara/Math/Quaternion.hpp>
#include <Nazara/Math/Vector3.hpp>
#include <Nazara/Utility/Animation.hpp>
#include <Nazara/Utility/AxisAlignedBox.hpp>
#include <vector>
class NzMD5AnimParser
@@ -34,7 +34,7 @@ class NzMD5AnimParser
};
std::vector<Joint> joints;
NzAxisAlignedBox aabb;
NzAxisAlignedBoxf aabb;
};
struct Joint

20
src/Nazara/Utility/Mesh.cpp
View File

@@ -41,7 +41,7 @@ struct NzMeshImpl
std::vector<NzString> materials;
std::vector<NzSubMesh*> subMeshes;
nzAnimationType animationType;
NzAxisAlignedBox aabb;
NzAxisAlignedBoxf aabb;
NzSkeleton skeleton; // Uniquement pour les meshs squelettiques
NzString animationPath;
unsigned int jointCount; // Uniquement pour les meshs squelettiques
@@ -77,7 +77,7 @@ bool NzMesh::AddSubMesh(NzSubMesh* subMesh)
subMesh->AddResourceListener(this, m_impl->subMeshes.size());
subMesh->Finish();
m_impl->aabb.SetNull(); // On invalide l'AABB
m_impl->aabb.MakeNull(); // On invalide l'AABB
m_impl->subMeshes.push_back(subMesh);
return true;
@@ -123,7 +123,7 @@ bool NzMesh::AddSubMesh(const NzString& identifier, NzSubMesh* subMesh)
subMesh->AddResourceListener(this, index);
subMesh->Finish();
m_impl->aabb.SetNull(); // On invalide l'AABB
m_impl->aabb.MakeNull(); // On invalide l'AABB
m_impl->subMeshes.push_back(subMesh);
m_impl->subMeshMap[identifier] = index;
@@ -206,7 +206,7 @@ void NzMesh::Animate(const NzAnimation* animation, unsigned int frameA, unsigned
break;
}
m_impl->aabb.SetNull(); // On invalide l'AABB
m_impl->aabb.MakeNull(); // On invalide l'AABB
}
bool NzMesh::CreateKeyframe()
@@ -417,13 +417,15 @@ void NzMesh::GenerateTangents()
}
}
const NzAxisAlignedBox& NzMesh::GetAABB() const
const NzAxisAlignedBoxf& NzMesh::GetAABB() const
{
#if NAZARA_UTILITY_SAFE
if (!m_impl)
{
NazaraError("Mesh not created");
return NzAxisAlignedBox::Null;
static NzAxisAlignedBoxf dummy(nzExtend_Null);
return dummy;
}
#endif
@@ -698,7 +700,7 @@ void NzMesh::InvalidateAABB() const
}
#endif
m_impl->aabb.SetNull();
m_impl->aabb.MakeNull();
}
bool NzMesh::HasSubMesh(const NzString& identifier) const
@@ -789,7 +791,7 @@ void NzMesh::RemoveSubMesh(const NzString& identifier)
(*it2)->RemoveResourceListener(this);
m_impl->subMeshes.erase(it2);
m_impl->aabb.SetNull(); // On invalide l'AABB
m_impl->aabb.MakeNull(); // On invalide l'AABB
}
void NzMesh::RemoveSubMesh(unsigned int index)
@@ -816,7 +818,7 @@ void NzMesh::RemoveSubMesh(unsigned int index)
(*it)->RemoveResourceListener(this);
m_impl->subMeshes.erase(it);
m_impl->aabb.SetNull(); // On invalide l'AABB
m_impl->aabb.MakeNull(); // On invalide l'AABB
}
void NzMesh::SetAnimation(const NzString& animationPath)

8
src/Nazara/Utility/SkeletalMesh.cpp
View File

@@ -132,7 +132,7 @@ struct NzSkeletalMeshImpl
{
std::vector<NzVertexWeight> vertexWeights;
std::vector<NzWeight> weights;
NzAxisAlignedBox aabb;
NzAxisAlignedBoxf aabb;
nzUInt8* bindPoseBuffer;
const NzIndexBuffer* indexBuffer = nullptr;
NzVertexBuffer* vertexBuffer;
@@ -208,13 +208,15 @@ void NzSkeletalMesh::Finish()
Skin();
}
const NzAxisAlignedBox& NzSkeletalMesh::GetAABB() const
const NzAxisAlignedBoxf& NzSkeletalMesh::GetAABB() const
{
#if NAZARA_UTILITY_SAFE
if (!m_impl)
{
NazaraError("Skeletal mesh not created");
return NzAxisAlignedBox::Null;
static NzAxisAlignedBoxf dummy(nzExtend_Null);
return dummy;
}
#endif

17
src/Nazara/Utility/Skeleton.cpp
View File

@@ -3,7 +3,6 @@
// For conditions of distribution and use, see copyright notice in Config.hpp
#include <Nazara/Utility/Skeleton.hpp>
#include <Nazara/Utility/AxisAlignedBox.hpp>
#include <map>
#include <Nazara/Utility/Debug.hpp>
@@ -11,7 +10,7 @@ struct NzSkeletonImpl
{
std::map<NzString, unsigned int> jointMap; ///FIXME: unordered_map
std::vector<NzJoint> joints;
NzAxisAlignedBox aabb;
NzAxisAlignedBoxf aabb;
bool jointMapUpdated = false;
};
@@ -51,13 +50,15 @@ void NzSkeleton::Destroy()
}
}
const NzAxisAlignedBox& NzSkeleton::GetAABB() const
const NzAxisAlignedBoxf& NzSkeleton::GetAABB() const
{
#if NAZARA_UTILITY_SAFE
if (!m_impl)
{
NazaraError("Skeleton not created");
return NzAxisAlignedBox::Null;
static NzAxisAlignedBoxf dummy(nzExtend_Null);
return dummy;
}
#endif
@@ -94,7 +95,7 @@ NzJoint* NzSkeleton::GetJoint(const NzString& jointName)
#endif
// Invalidation de l'AABB
m_impl->aabb.SetNull();
m_impl->aabb.MakeNull();
return &m_impl->joints[it->second];
}
@@ -116,7 +117,7 @@ NzJoint* NzSkeleton::GetJoint(unsigned int index)
#endif
// Invalidation de l'AABB
m_impl->aabb.SetNull();
m_impl->aabb.MakeNull();
return &m_impl->joints[index];
}
@@ -264,7 +265,7 @@ void NzSkeleton::Interpolate(const NzSkeleton& skeletonA, const NzSkeleton& skel
for (unsigned int i = 0; i < m_impl->joints.size(); ++i)
m_impl->joints[i].Interpolate(jointsA[i], jointsB[i], interpolation);
m_impl->aabb.SetNull();
m_impl->aabb.MakeNull();
}
void NzSkeleton::Interpolate(const NzSkeleton& skeletonA, const NzSkeleton& skeletonB, float interpolation, unsigned int* indices, unsigned int indiceCount)
@@ -312,7 +313,7 @@ void NzSkeleton::Interpolate(const NzSkeleton& skeletonA, const NzSkeleton& skel
m_impl->joints[index].Interpolate(jointsA[index], jointsB[index], interpolation);
}
m_impl->aabb.SetNull();
m_impl->aabb.MakeNull();
}
bool NzSkeleton::IsValid() const

6
src/Nazara/Utility/StaticMesh.cpp
View File

@@ -39,7 +39,7 @@ bool NzStaticMesh::Create(NzVertexBuffer* vertexBuffer)
void NzStaticMesh::Destroy()
{
m_aabb.SetNull();
m_aabb.MakeNull();
if (m_indexBuffer)
{
@@ -79,7 +79,7 @@ bool NzStaticMesh::GenerateAABB()
return true;
}
const NzAxisAlignedBox& NzStaticMesh::GetAABB() const
const NzAxisAlignedBoxf& NzStaticMesh::GetAABB() const
{
return m_aabb;
}
@@ -114,7 +114,7 @@ bool NzStaticMesh::IsValid() const
return m_vertexBuffer != nullptr;
}
void NzStaticMesh::SetAABB(const NzAxisAlignedBox& aabb)
void NzStaticMesh::SetAABB(const NzAxisAlignedBoxf& aabb)
{
m_aabb = aabb;
}