move some files to shared folders
use b3Aabb for compound vs compound on host (for testing, towards BVH)
This commit is contained in:
@@ -4,8 +4,9 @@
|
||||
#include "Bullet3Common/shared/b3PlatformDefinitions.h"
|
||||
|
||||
#ifdef __cplusplus
|
||||
#include "Bullet3Common/b3Vector3.h"
|
||||
#define b3Float4 b3Vector3
|
||||
#else//bla
|
||||
#else
|
||||
typedef float4 b3Float4;
|
||||
#endif
|
||||
|
||||
|
||||
50
src/Bullet3Common/shared/b3Int2.h
Normal file
50
src/Bullet3Common/shared/b3Int2.h
Normal file
@@ -0,0 +1,50 @@
|
||||
/*
|
||||
Bullet Continuous Collision Detection and Physics Library
|
||||
Copyright (c) 2003-2013 Erwin Coumans http://bulletphysics.org
|
||||
|
||||
This software is provided 'as-is', without any express or implied warranty.
|
||||
In no event will the authors be held liable for any damages arising from the use of this software.
|
||||
Permission is granted to anyone to use this software for any purpose,
|
||||
including commercial applications, and to alter it and redistribute it freely,
|
||||
subject to the following restrictions:
|
||||
|
||||
1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
|
||||
2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
|
||||
3. This notice may not be removed or altered from any source distribution.
|
||||
*/
|
||||
|
||||
#ifndef B3_INT2_H
|
||||
#define B3_INT2_H
|
||||
|
||||
struct b3UnsignedInt2
|
||||
{
|
||||
union
|
||||
{
|
||||
struct
|
||||
{
|
||||
unsigned int x,y;
|
||||
};
|
||||
struct
|
||||
{
|
||||
unsigned int s[2];
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
struct b3Int2
|
||||
{
|
||||
union
|
||||
{
|
||||
struct
|
||||
{
|
||||
int x,y;
|
||||
};
|
||||
struct
|
||||
{
|
||||
int s[2];
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
#endif
|
||||
55
src/Bullet3Common/shared/b3Int4.h
Normal file
55
src/Bullet3Common/shared/b3Int4.h
Normal file
@@ -0,0 +1,55 @@
|
||||
#ifndef B3_INT4_H
|
||||
#define B3_INT4_H
|
||||
|
||||
#include "Bullet3Common/b3Scalar.h"
|
||||
|
||||
B3_ATTRIBUTE_ALIGNED16(struct) b3UnsignedInt4
|
||||
{
|
||||
B3_DECLARE_ALIGNED_ALLOCATOR();
|
||||
|
||||
union
|
||||
{
|
||||
struct
|
||||
{
|
||||
unsigned int x,y,z,w;
|
||||
};
|
||||
struct
|
||||
{
|
||||
unsigned int s[4];
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
B3_ATTRIBUTE_ALIGNED16(struct) b3Int4
|
||||
{
|
||||
B3_DECLARE_ALIGNED_ALLOCATOR();
|
||||
|
||||
union
|
||||
{
|
||||
struct
|
||||
{
|
||||
int x,y,z,w;
|
||||
};
|
||||
struct
|
||||
{
|
||||
int s[4];
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
B3_FORCE_INLINE b3Int4 b3MakeInt4(int x, int y, int z, int w = 0)
|
||||
{
|
||||
b3Int4 v;
|
||||
v.s[0] = x; v.s[1] = y; v.s[2] = z; v.s[3] = w;
|
||||
return v;
|
||||
}
|
||||
|
||||
B3_FORCE_INLINE b3UnsignedInt4 b3MakeUnsignedInt4(unsigned int x, unsigned int y, unsigned int z, unsigned int w = 0)
|
||||
{
|
||||
b3UnsignedInt4 v;
|
||||
v.s[0] = x; v.s[1] = y; v.s[2] = z; v.s[3] = w;
|
||||
return v;
|
||||
}
|
||||
|
||||
|
||||
#endif //B3_INT4_H
|
||||
@@ -6,4 +6,11 @@ struct MyTest
|
||||
int bla;
|
||||
};
|
||||
|
||||
#ifdef __cplusplus
|
||||
#define b3AtomicInc(a) ((*a)++)
|
||||
#else
|
||||
#define b3AtomicInc atomic_inc
|
||||
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
||||
13
src/Bullet3Common/shared/b3Quat.h
Normal file
13
src/Bullet3Common/shared/b3Quat.h
Normal file
@@ -0,0 +1,13 @@
|
||||
#ifndef B3_QUAT_H
|
||||
#define B3_QUAT_H
|
||||
|
||||
#include "Bullet3Common/shared/b3PlatformDefinitions.h"
|
||||
|
||||
#ifdef __cplusplus
|
||||
#include "Bullet3Common/b3Quaternion.h"
|
||||
#define b3Quat b3Quaternion
|
||||
#else
|
||||
typedef float4 b3Quat;
|
||||
#endif
|
||||
|
||||
#endif //B3_QUAT_H
|
||||
Reference in New Issue
Block a user