瀏覽代碼

Remove USE_QUAD_VECTORS unused check

J08nY 9 年之前
父節點
當前提交
449571b6cd
共有 2 個文件被更改,包括 0 次插入17 次删除
  1. 0 13
      core/math/vector3.h
  2. 0 4
      core/variant.h

+ 0 - 13
core/math/vector3.h

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

+ 0 - 4
core/variant.h

@@ -151,11 +151,7 @@ private:
 		InputEvent *_input_event;
 		Image *_image;
 		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)];
-#endif
 	} _data;