asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Remove USE_QUAD_VECTORS unused check

Browse source
This commit is contained in:
J08nY 2016-06-19 00:06:04 +02:00
parent a95a1f47a4
commit 449571b6cd
No known key found for this signature in database
GPG key ID: 7F4A448FE68F329D
2 changed files with 0 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
core/math/vector3.h
View file

@ -44,18 +44,6 @@ struct Vector3 {
}; };
union { union {
#ifdef USE_QUAD_VECTORS
struct {
real_t x;
real_t y;
real_t z;
real_t _unused;
};
real_t coord[4];
#else
struct { struct {
real_t x; real_t x;
real_t y; real_t y;
@ -63,7 +51,6 @@ struct Vector3 {
}; };
real_t coord[3]; real_t coord[3];
#endif
}; };
_FORCE_INLINE_ const real_t& operator[](int p_axis) const { _FORCE_INLINE_ const real_t& operator[](int p_axis) const {

4
core/variant.h
View file

@ -151,11 +151,7 @@ private:
InputEvent *_input_event; InputEvent *_input_event;
Image *_image; Image *_image;
void *_ptr; //generic pointer void *_ptr; //generic pointer
#ifdef USE_QUAD_VECTORS
uint8_t _mem[sizeof(ObjData) > (sizeof(real_t)*5) ? sizeof(ObjData) : (sizeof(real_t)*5)]; // plane uses an extra real
#else
uint8_t _mem[sizeof(ObjData) > (sizeof(real_t)*4) ? sizeof(ObjData) : (sizeof(real_t)*4)]; uint8_t _mem[sizeof(ObjData) > (sizeof(real_t)*4) ? sizeof(ObjData) : (sizeof(real_t)*4)];
#endif
} _data; } _data;