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

Plane primitives no longer rely on normal vector

Browse Source 
Former-commit-id: 66e1e2a83799055ad773f7b145e569469f68279a
This commit is contained in:
Lynix
2013-06-18 16:39:46 +02:00
parent 433c36f176
commit 880c2aa32c
6 changed files with 51 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/Nazara/Core/Primitive.hpp
View File

@@ -15,13 +15,13 @@
struct NzPrimitive
{
NzMatrix4f matrix;
nzPrimitiveType type;
union
{
struct
{
NzMatrix4f matrix;
NzVector3f lengths;
NzVector3ui subdivision;
}
@@ -31,15 +31,12 @@ struct NzPrimitive
{
NzVector2f size;
NzVector2ui subdivision;
NzVector3f normal;
NzVector3f position;
}
plane;
struct
{
nzSphereType type;
NzMatrix4f matrix;
float size;
union

5
include/Nazara/Core/PrimitiveList.hpp
View File

@@ -23,8 +23,9 @@ class NAZARA_API NzPrimitiveList
void AddCubicSphere(float size, unsigned int subdivision, const NzVector3f& position, const NzQuaternionf& rotation = NzQuaternionf::Identity());
void AddIcoSphere(float size, unsigned int recursionLevel = 3, const NzMatrix4f& matrix = NzMatrix4f::Identity());
void AddIcoSphere(float size, unsigned int recursionLevel, const NzVector3f& position, const NzQuaternionf& rotation = NzQuaternionf::Identity());
void AddPlane(const NzPlanef& plane, const NzVector2f& size, const NzVector2ui& subdivision = NzVector2ui(0U));
void AddPlane(const NzVector3f& position, const NzVector3f& normal, const NzVector2f& size, const NzVector2ui& subdivision = NzVector2ui(0U));
void AddPlane(const NzVector2f& size, const NzVector2ui& subdivision, const NzMatrix4f& matrix = NzMatrix4f::Identity());
void AddPlane(const NzVector2f& size, const NzVector2ui& subdivision, const NzPlanef& plane);
void AddPlane(const NzVector2f& size, const NzVector2ui& subdivision, const NzVector3f& position, const NzQuaternionf& rotation = NzQuaternionf::Identity());
void AddUVSphere(float size, unsigned int slices = 4, unsigned int stacks = 4, const NzMatrix4f& matrix = NzMatrix4f::Identity());
void AddUVSphere(float size, unsigned int slices, unsigned int stacks, const NzVector3f& position, const NzQuaternionf& rotation = NzQuaternionf::Identity());