From ee7e115afd4e013d6e7151f5b43e11403dbc6b54 Mon Sep 17 00:00:00 2001 From: minggo Date: Tue, 22 Sep 2020 16:27:20 +0800 Subject: [PATCH] merge gfx/CoreMath into base/math (#2822) --- native/CMakeLists.txt | 3 +- native/cocos/math/Geometry.h | 2 +- native/cocos/math/Math.cpp | 160 ++++++++++++++++++++ native/cocos/math/Math.h | 70 +++++++-- native/cocos/renderer/core/CoreStd.h | 2 +- native/cocos/renderer/core/math/CoreMath.cc | 156 ------------------- native/cocos/renderer/core/math/CoreMath.h | 66 -------- native/cocos/renderer/pipeline/Define.h | 4 +- 8 files changed, 226 insertions(+), 237 deletions(-) create mode 100755 native/cocos/math/Math.cpp delete mode 100755 native/cocos/renderer/core/math/CoreMath.cc delete mode 100755 native/cocos/renderer/core/math/CoreMath.h diff --git a/native/CMakeLists.txt b/native/CMakeLists.txt index 8b49c0c08e..3d57d0c51e 100644 --- a/native/CMakeLists.txt +++ b/native/CMakeLists.txt @@ -282,6 +282,7 @@ cocos_source_files( cocos/math/Geometry.cpp cocos/math/Geometry.h cocos/math/Math.h + cocos/math/Math.cpp cocos/math/MathBase.h cocos/math/Vertex.cpp cocos/math/Vertex.h @@ -496,8 +497,6 @@ cocos_source_files( cocos/renderer/core/gfx/GFXTexture.h cocos/renderer/core/gfx/GFXFence.h cocos/renderer/core/gfx/GFXFence.cc - cocos/renderer/core/math/CoreMath.cc - cocos/renderer/core/math/CoreMath.h cocos/renderer/pipeline/BatchedBuffer.cpp cocos/renderer/pipeline/BatchedBuffer.h cocos/renderer/pipeline/Define.h diff --git a/native/cocos/math/Geometry.h b/native/cocos/math/Geometry.h index dcac3b0540..c2b6605ff1 100644 --- a/native/cocos/math/Geometry.h +++ b/native/cocos/math/Geometry.h @@ -28,7 +28,7 @@ THE SOFTWARE. #define __MATH_CCGEOMETRY_H__ #include "base/Macros.h" -#include "math/Math.h" +#include "math/Vec2.h" /** * @addtogroup base diff --git a/native/cocos/math/Math.cpp b/native/cocos/math/Math.cpp new file mode 100755 index 0000000000..877e4132e2 --- /dev/null +++ b/native/cocos/math/Math.cpp @@ -0,0 +1,160 @@ +#include "math/Math.h" +#include +#include +#include + +namespace cc { +namespace math { + +const float PI = (float)(3.14159265358979323846264338327950288419716939937511); +; +const float PI_2 = math::PI * 2.0f; +const float PI_DIV2 = math::PI * 0.5f; +const float PI_DIV3 = math::PI / 3.0f; +const float PI_DIV4 = math::PI / 4.0f; +const float PI_DIV5 = math::PI / 5.0f; +const float PI_DIV6 = math::PI / 6.0f; +const float PI_DIV8 = math::PI / 8.0f; +const float PI_SQR = (float)(9.86960440108935861883449099987615113531369940724079); +const float PI_INV = (float)(0.31830988618379067153776752674502872406891929148091); +const float EPSILON = std::numeric_limits::epsilon(); +const float LOW_EPSILON = (float)(1e-04); +const float POS_INFINITY = std::numeric_limits::infinity(); +const float NEG_INFINITY = -std::numeric_limits::infinity(); +; +const float LN2 = std::log(2.0f); +const float LN10 = std::log(10.0f); +const float LN2_INV = 1.0f / LN2; +const float LN10_INV = 1.0f / LN10; +const float DEG_TO_RAD = (float)0.01745329; +const float RAD_TO_DEG = (float)57.29577; +const float MIN_FLOAT = 1.175494351e-38F; +const float MAX_FLOAT = 3.402823466e+38F; + +const uint16_t CRC16_TABLE[256] = { + 0x0000, 0x1021, 0x2042, 0x3063, 0x4084, 0x50a5, 0x60c6, 0x70e7, + 0x8108, 0x9129, 0xa14a, 0xb16b, 0xc18c, 0xd1ad, 0xe1ce, 0xf1ef, + 0x1231, 0x0210, 0x3273, 0x2252, 0x52b5, 0x4294, 0x72f7, 0x62d6, + 0x9339, 0x8318, 0xb37b, 0xa35a, 0xd3bd, 0xc39c, 0xf3ff, 0xe3de, + 0x2462, 0x3443, 0x0420, 0x1401, 0x64e6, 0x74c7, 0x44a4, 0x5485, + 0xa56a, 0xb54b, 0x8528, 0x9509, 0xe5ee, 0xf5cf, 0xc5ac, 0xd58d, + 0x3653, 0x2672, 0x1611, 0x0630, 0x76d7, 0x66f6, 0x5695, 0x46b4, + 0xb75b, 0xa77a, 0x9719, 0x8738, 0xf7df, 0xe7fe, 0xd79d, 0xc7bc, + 0x48c4, 0x58e5, 0x6886, 0x78a7, 0x0840, 0x1861, 0x2802, 0x3823, + 0xc9cc, 0xd9ed, 0xe98e, 0xf9af, 0x8948, 0x9969, 0xa90a, 0xb92b, + 0x5af5, 0x4ad4, 0x7ab7, 0x6a96, 0x1a71, 0x0a50, 0x3a33, 0x2a12, + 0xdbfd, 0xcbdc, 0xfbbf, 0xeb9e, 0x9b79, 0x8b58, 0xbb3b, 0xab1a, + 0x6ca6, 0x7c87, 0x4ce4, 0x5cc5, 0x2c22, 0x3c03, 0x0c60, 0x1c41, + 0xedae, 0xfd8f, 0xcdec, 0xddcd, 0xad2a, 0xbd0b, 0x8d68, 0x9d49, + 0x7e97, 0x6eb6, 0x5ed5, 0x4ef4, 0x3e13, 0x2e32, 0x1e51, 0x0e70, + 0xff9f, 0xefbe, 0xdfdd, 0xcffc, 0xbf1b, 0xaf3a, 0x9f59, 0x8f78, + 0x9188, 0x81a9, 0xb1ca, 0xa1eb, 0xd10c, 0xc12d, 0xf14e, 0xe16f, + 0x1080, 0x00a1, 0x30c2, 0x20e3, 0x5004, 0x4025, 0x7046, 0x6067, + 0x83b9, 0x9398, 0xa3fb, 0xb3da, 0xc33d, 0xd31c, 0xe37f, 0xf35e, + 0x02b1, 0x1290, 0x22f3, 0x32d2, 0x4235, 0x5214, 0x6277, 0x7256, + 0xb5ea, 0xa5cb, 0x95a8, 0x8589, 0xf56e, 0xe54f, 0xd52c, 0xc50d, + 0x34e2, 0x24c3, 0x14a0, 0x0481, 0x7466, 0x6447, 0x5424, 0x4405, + 0xa7db, 0xb7fa, 0x8799, 0x97b8, 0xe75f, 0xf77e, 0xc71d, 0xd73c, + 0x26d3, 0x36f2, 0x0691, 0x16b0, 0x6657, 0x7676, 0x4615, 0x5634, + 0xd94c, 0xc96d, 0xf90e, 0xe92f, 0x99c8, 0x89e9, 0xb98a, 0xa9ab, + 0x5844, 0x4865, 0x7806, 0x6827, 0x18c0, 0x08e1, 0x3882, 0x28a3, + 0xcb7d, 0xdb5c, 0xeb3f, 0xfb1e, 0x8bf9, 0x9bd8, 0xabbb, 0xbb9a, + 0x4a75, 0x5a54, 0x6a37, 0x7a16, 0x0af1, 0x1ad0, 0x2ab3, 0x3a92, + 0xfd2e, 0xed0f, 0xdd6c, 0xcd4d, 0xbdaa, 0xad8b, 0x9de8, 0x8dc9, + 0x7c26, 0x6c07, 0x5c64, 0x4c45, 0x3ca2, 0x2c83, 0x1ce0, 0x0cc1, + 0xef1f, 0xff3e, 0xcf5d, 0xdf7c, 0xaf9b, 0xbfba, 0x8fd9, 0x9ff8, + 0x6e17, 0x7e36, 0x4e55, 0x5e74, 0x2e93, 0x3eb2, 0x0ed1, 0x1ef0}; + +const uint32_t CRC32_TABLE[] = { + 0x00000000, 0x77073096, 0xEE0E612C, 0x990951BA, 0x076DC419, + 0x706AF48F, 0xE963A535, 0x9E6495A3, 0x0EDB8832, 0x79DCB8A4, + 0xE0D5E91E, 0x97D2D988, 0x09B64C2B, 0x7EB17CBD, 0xE7B82D07, + 0x90BF1D91, 0x1DB71064, 0x6AB020F2, 0xF3B97148, 0x84BE41DE, + 0x1ADAD47D, 0x6DDDE4EB, 0xF4D4B551, 0x83D385C7, 0x136C9856, + 0x646BA8C0, 0xFD62F97A, 0x8A65C9EC, 0x14015C4F, 0x63066CD9, + 0xFA0F3D63, 0x8D080DF5, 0x3B6E20C8, 0x4C69105E, 0xD56041E4, + 0xA2677172, 0x3C03E4D1, 0x4B04D447, 0xD20D85FD, 0xA50AB56B, + 0x35B5A8FA, 0x42B2986C, 0xDBBBC9D6, 0xACBCF940, 0x32D86CE3, + 0x45DF5C75, 0xDCD60DCF, 0xABD13D59, 0x26D930AC, 0x51DE003A, + 0xC8D75180, 0xBFD06116, 0x21B4F4B5, 0x56B3C423, 0xCFBA9599, + 0xB8BDA50F, 0x2802B89E, 0x5F058808, 0xC60CD9B2, 0xB10BE924, + 0x2F6F7C87, 0x58684C11, 0xC1611DAB, 0xB6662D3D, 0x76DC4190, + 0x01DB7106, 0x98D220BC, 0xEFD5102A, 0x71B18589, 0x06B6B51F, + 0x9FBFE4A5, 0xE8B8D433, 0x7807C9A2, 0x0F00F934, 0x9609A88E, + 0xE10E9818, 0x7F6A0DBB, 0x086D3D2D, 0x91646C97, 0xE6635C01, + 0x6B6B51F4, 0x1C6C6162, 0x856530D8, 0xF262004E, 0x6C0695ED, + 0x1B01A57B, 0x8208F4C1, 0xF50FC457, 0x65B0D9C6, 0x12B7E950, + 0x8BBEB8EA, 0xFCB9887C, 0x62DD1DDF, 0x15DA2D49, 0x8CD37CF3, + 0xFBD44C65, 0x4DB26158, 0x3AB551CE, 0xA3BC0074, 0xD4BB30E2, + 0x4ADFA541, 0x3DD895D7, 0xA4D1C46D, 0xD3D6F4FB, 0x4369E96A, + 0x346ED9FC, 0xAD678846, 0xDA60B8D0, 0x44042D73, 0x33031DE5, + 0xAA0A4C5F, 0xDD0D7CC9, 0x5005713C, 0x270241AA, 0xBE0B1010, + 0xC90C2086, 0x5768B525, 0x206F85B3, 0xB966D409, 0xCE61E49F, + 0x5EDEF90E, 0x29D9C998, 0xB0D09822, 0xC7D7A8B4, 0x59B33D17, + 0x2EB40D81, 0xB7BD5C3B, 0xC0BA6CAD, 0xEDB88320, 0x9ABFB3B6, + 0x03B6E20C, 0x74B1D29A, 0xEAD54739, 0x9DD277AF, 0x04DB2615, + 0x73DC1683, 0xE3630B12, 0x94643B84, 0x0D6D6A3E, 0x7A6A5AA8, + 0xE40ECF0B, 0x9309FF9D, 0x0A00AE27, 0x7D079EB1, 0xF00F9344, + 0x8708A3D2, 0x1E01F268, 0x6906C2FE, 0xF762575D, 0x806567CB, + 0x196C3671, 0x6E6B06E7, 0xFED41B76, 0x89D32BE0, 0x10DA7A5A, + 0x67DD4ACC, 0xF9B9DF6F, 0x8EBEEFF9, 0x17B7BE43, 0x60B08ED5, + 0xD6D6A3E8, 0xA1D1937E, 0x38D8C2C4, 0x4FDFF252, 0xD1BB67F1, + 0xA6BC5767, 0x3FB506DD, 0x48B2364B, 0xD80D2BDA, 0xAF0A1B4C, + 0x36034AF6, 0x41047A60, 0xDF60EFC3, 0xA867DF55, 0x316E8EEF, + 0x4669BE79, 0xCB61B38C, 0xBC66831A, 0x256FD2A0, 0x5268E236, + 0xCC0C7795, 0xBB0B4703, 0x220216B9, 0x5505262F, 0xC5BA3BBE, + 0xB2BD0B28, 0x2BB45A92, 0x5CB36A04, 0xC2D7FFA7, 0xB5D0CF31, + 0x2CD99E8B, 0x5BDEAE1D, 0x9B64C2B0, 0xEC63F226, 0x756AA39C, + 0x026D930A, 0x9C0906A9, 0xEB0E363F, 0x72076785, 0x05005713, + 0x95BF4A82, 0xE2B87A14, 0x7BB12BAE, 0x0CB61B38, 0x92D28E9B, + 0xE5D5BE0D, 0x7CDCEFB7, 0x0BDBDF21, 0x86D3D2D4, 0xF1D4E242, + 0x68DDB3F8, 0x1FDA836E, 0x81BE16CD, 0xF6B9265B, 0x6FB077E1, + 0x18B74777, 0x88085AE6, 0xFF0F6A70, 0x66063BCA, 0x11010B5C, + 0x8F659EFF, 0xF862AE69, 0x616BFFD3, 0x166CCF45, 0xA00AE278, + 0xD70DD2EE, 0x4E048354, 0x3903B3C2, 0xA7672661, 0xD06016F7, + 0x4969474D, 0x3E6E77DB, 0xAED16A4A, 0xD9D65ADC, 0x40DF0B66, + 0x37D83BF0, 0xA9BCAE53, 0xDEBB9EC5, 0x47B2CF7F, 0x30B5FFE9, + 0xBDBDF21C, 0xCABAC28A, 0x53B39330, 0x24B4A3A6, 0xBAD03605, + 0xCDD70693, 0x54DE5729, 0x23D967BF, 0xB3667A2E, 0xC4614AB8, + 0x5D681B02, 0x2A6F2B94, 0xB40BBE37, 0xC30C8EA1, 0x5A05DF1B, + 0x2D02EF8D}; + +CC_INLINE void CRCUpdateB(uint32_t &crc, uint8_t b) { + crc = CRC32_TABLE[(crc ^ b) & 0xFF] ^ (crc >> 8); +} + +uint32_t CRC32(const char *str) { + uint32_t crc = 0xFFFFFFFF; + size_t length = strlen(str); + + for (size_t i = 0; i < length; ++i) { + CRCUpdateB(crc, (uint8_t)str[i]); + } + + CRCUpdateB(crc, (uint8_t)length); + return crc; +} + +uint32_t CRC32NoCase(const char *str) { + uint32_t crc = 0xFFFFFFFF; + size_t length = strlen(str); + + for (size_t i = 0; i < length; ++i) { + CRCUpdateB(crc, (uint8_t)tolower((char)str[i])); + } + + CRCUpdateB(crc, (uint8_t)length); + return crc; +} + +uint16_t CRC16(const char *str) { + size_t length = strlen(str); + uint16_t crc = 0; + for (size_t i = 0; i < length; ++i) { + crc = (crc << 8) ^ CRC16_TABLE[((crc >> 8) ^ *str++) & 0x00FF]; + } + return crc; +} + +} // namespace math +} // namespace cc diff --git a/native/cocos/math/Math.h b/native/cocos/math/Math.h index 985a13d3fc..5c862a7da8 100644 --- a/native/cocos/math/Math.h +++ b/native/cocos/math/Math.h @@ -22,15 +22,67 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ +#pragma once -#ifndef __CC_MATH_H__ -#define __CC_MATH_H__ +#include "base/Macros.h" -#include "math/Vec2.h" -#include "math/Vec3.h" -#include "math/Vec4.h" -#include "math/Mat4.h" -#include "math/Quaternion.h" -#include "math/Mat3.h" +namespace cc { +namespace math { -#endif +extern CC_DLL const float PI; +extern CC_DLL const float PI_2; +extern CC_DLL const float PI_DIV2; +extern CC_DLL const float PI_DIV3; +extern CC_DLL const float PI_DIV4; +extern CC_DLL const float PI_DIV5; +extern CC_DLL const float PI_DIV6; +extern CC_DLL const float PI_DIV8; +extern CC_DLL const float PI_SQR; +extern CC_DLL const float PI_INV; +extern CC_DLL const float EPSILON; +extern CC_DLL const float LOW_EPSILON; +extern CC_DLL const float POS_INFINITY; +extern CC_DLL const float NEG_INFINITY; +extern CC_DLL const float LN2; +extern CC_DLL const float LN10; +extern CC_DLL const float LN2_INV; +extern CC_DLL const float LN10_INV; +extern CC_DLL const float DEG_TO_RAD; +extern CC_DLL const float RAD_TO_DEG; +extern CC_DLL const float MIN_FLOAT; +extern CC_DLL const float MAX_FLOAT; + +uint16_t CRC16(const char *str); +uint32_t CRC32(const char *str); +uint32_t CRC32NoCase(const char *str); + +template +inline T Abs(T x) { + return x > 0 ? x : -x; +} + +template +inline T Sgn(T x) { + return (x < T(0) ? T(-1) : (x > T(0) ? T(1) : T(0))); +} + +template +inline T Sqr(T x) { + return x * x; +} + +template +inline bool IsPowerOfTwo(T n) { + return (n & (n - 1)) == 0; +} + +CC_INLINE bool IsEqualF(float lhs, float rhs, float precision = 0.000001f) { + return (Abs(lhs - rhs) < precision); +} + +CC_INLINE bool IsNotEqualF(float lhs, float rhs, float precision = 0.000001f) { + return (Abs(lhs - rhs) > precision); +} + +} // namespace math +} // namespace cc diff --git a/native/cocos/renderer/core/CoreStd.h b/native/cocos/renderer/core/CoreStd.h index 056b477e7c..015fc7f09e 100644 --- a/native/cocos/renderer/core/CoreStd.h +++ b/native/cocos/renderer/core/CoreStd.h @@ -33,7 +33,7 @@ #include "base/TypeDef.h" #include "base/memory/Memory.h" -#include "math/CoreMath.h" +#include "math/Math.h" #include "base/Log.h" #include "base/Object.h" #include "gfx/GFXObject.h" diff --git a/native/cocos/renderer/core/math/CoreMath.cc b/native/cocos/renderer/core/math/CoreMath.cc deleted file mode 100755 index e8af09d36f..0000000000 --- a/native/cocos/renderer/core/math/CoreMath.cc +++ /dev/null @@ -1,156 +0,0 @@ -#include "CoreStd.h" -#include "CoreMath.h" - -CC_MATH_NAMESPACE_BEGIN - -const float PI = (float)(3.14159265358979323846264338327950288419716939937511);; -const float PI_2 = math::PI * 2.0f; -const float PI_DIV2 = math::PI * 0.5f; -const float PI_DIV3 = math::PI / 3.0f; -const float PI_DIV4 = math::PI / 4.0f; -const float PI_DIV5 = math::PI / 5.0f; -const float PI_DIV6 = math::PI / 6.0f; -const float PI_DIV8 = math::PI / 8.0f; -const float PI_SQR = (float)(9.86960440108935861883449099987615113531369940724079); -const float PI_INV = (float)(0.31830988618379067153776752674502872406891929148091); -const float EPSILON = std::numeric_limits::epsilon(); -const float LOW_EPSILON = (float)(1e-04); -const float POS_INFINITY = std::numeric_limits::infinity(); -const float NEG_INFINITY = -std::numeric_limits::infinity();; -const float LN2 = std::log(2.0f); -const float LN10 = std::log(10.0f); -const float LN2_INV = 1.0f / LN2; -const float LN10_INV = 1.0f / LN10; -const float DEG_TO_RAD = (float)0.01745329; -const float RAD_TO_DEG = (float)57.29577; -const float MIN_FLOAT = 1.175494351e-38F; -const float MAX_FLOAT = 3.402823466e+38F; - -const uint16_t CRC16_TABLE[256] = { - 0x0000, 0x1021, 0x2042, 0x3063, 0x4084, 0x50a5, 0x60c6, 0x70e7, - 0x8108, 0x9129, 0xa14a, 0xb16b, 0xc18c, 0xd1ad, 0xe1ce, 0xf1ef, - 0x1231, 0x0210, 0x3273, 0x2252, 0x52b5, 0x4294, 0x72f7, 0x62d6, - 0x9339, 0x8318, 0xb37b, 0xa35a, 0xd3bd, 0xc39c, 0xf3ff, 0xe3de, - 0x2462, 0x3443, 0x0420, 0x1401, 0x64e6, 0x74c7, 0x44a4, 0x5485, - 0xa56a, 0xb54b, 0x8528, 0x9509, 0xe5ee, 0xf5cf, 0xc5ac, 0xd58d, - 0x3653, 0x2672, 0x1611, 0x0630, 0x76d7, 0x66f6, 0x5695, 0x46b4, - 0xb75b, 0xa77a, 0x9719, 0x8738, 0xf7df, 0xe7fe, 0xd79d, 0xc7bc, - 0x48c4, 0x58e5, 0x6886, 0x78a7, 0x0840, 0x1861, 0x2802, 0x3823, - 0xc9cc, 0xd9ed, 0xe98e, 0xf9af, 0x8948, 0x9969, 0xa90a, 0xb92b, - 0x5af5, 0x4ad4, 0x7ab7, 0x6a96, 0x1a71, 0x0a50, 0x3a33, 0x2a12, - 0xdbfd, 0xcbdc, 0xfbbf, 0xeb9e, 0x9b79, 0x8b58, 0xbb3b, 0xab1a, - 0x6ca6, 0x7c87, 0x4ce4, 0x5cc5, 0x2c22, 0x3c03, 0x0c60, 0x1c41, - 0xedae, 0xfd8f, 0xcdec, 0xddcd, 0xad2a, 0xbd0b, 0x8d68, 0x9d49, - 0x7e97, 0x6eb6, 0x5ed5, 0x4ef4, 0x3e13, 0x2e32, 0x1e51, 0x0e70, - 0xff9f, 0xefbe, 0xdfdd, 0xcffc, 0xbf1b, 0xaf3a, 0x9f59, 0x8f78, - 0x9188, 0x81a9, 0xb1ca, 0xa1eb, 0xd10c, 0xc12d, 0xf14e, 0xe16f, - 0x1080, 0x00a1, 0x30c2, 0x20e3, 0x5004, 0x4025, 0x7046, 0x6067, - 0x83b9, 0x9398, 0xa3fb, 0xb3da, 0xc33d, 0xd31c, 0xe37f, 0xf35e, - 0x02b1, 0x1290, 0x22f3, 0x32d2, 0x4235, 0x5214, 0x6277, 0x7256, - 0xb5ea, 0xa5cb, 0x95a8, 0x8589, 0xf56e, 0xe54f, 0xd52c, 0xc50d, - 0x34e2, 0x24c3, 0x14a0, 0x0481, 0x7466, 0x6447, 0x5424, 0x4405, - 0xa7db, 0xb7fa, 0x8799, 0x97b8, 0xe75f, 0xf77e, 0xc71d, 0xd73c, - 0x26d3, 0x36f2, 0x0691, 0x16b0, 0x6657, 0x7676, 0x4615, 0x5634, - 0xd94c, 0xc96d, 0xf90e, 0xe92f, 0x99c8, 0x89e9, 0xb98a, 0xa9ab, - 0x5844, 0x4865, 0x7806, 0x6827, 0x18c0, 0x08e1, 0x3882, 0x28a3, - 0xcb7d, 0xdb5c, 0xeb3f, 0xfb1e, 0x8bf9, 0x9bd8, 0xabbb, 0xbb9a, - 0x4a75, 0x5a54, 0x6a37, 0x7a16, 0x0af1, 0x1ad0, 0x2ab3, 0x3a92, - 0xfd2e, 0xed0f, 0xdd6c, 0xcd4d, 0xbdaa, 0xad8b, 0x9de8, 0x8dc9, - 0x7c26, 0x6c07, 0x5c64, 0x4c45, 0x3ca2, 0x2c83, 0x1ce0, 0x0cc1, - 0xef1f, 0xff3e, 0xcf5d, 0xdf7c, 0xaf9b, 0xbfba, 0x8fd9, 0x9ff8, - 0x6e17, 0x7e36, 0x4e55, 0x5e74, 0x2e93, 0x3eb2, 0x0ed1, 0x1ef0 -}; - -const uint32_t CRC32_TABLE[] = { - 0x00000000, 0x77073096, 0xEE0E612C, 0x990951BA, 0x076DC419, - 0x706AF48F, 0xE963A535, 0x9E6495A3, 0x0EDB8832, 0x79DCB8A4, - 0xE0D5E91E, 0x97D2D988, 0x09B64C2B, 0x7EB17CBD, 0xE7B82D07, - 0x90BF1D91, 0x1DB71064, 0x6AB020F2, 0xF3B97148, 0x84BE41DE, - 0x1ADAD47D, 0x6DDDE4EB, 0xF4D4B551, 0x83D385C7, 0x136C9856, - 0x646BA8C0, 0xFD62F97A, 0x8A65C9EC, 0x14015C4F, 0x63066CD9, - 0xFA0F3D63, 0x8D080DF5, 0x3B6E20C8, 0x4C69105E, 0xD56041E4, - 0xA2677172, 0x3C03E4D1, 0x4B04D447, 0xD20D85FD, 0xA50AB56B, - 0x35B5A8FA, 0x42B2986C, 0xDBBBC9D6, 0xACBCF940, 0x32D86CE3, - 0x45DF5C75, 0xDCD60DCF, 0xABD13D59, 0x26D930AC, 0x51DE003A, - 0xC8D75180, 0xBFD06116, 0x21B4F4B5, 0x56B3C423, 0xCFBA9599, - 0xB8BDA50F, 0x2802B89E, 0x5F058808, 0xC60CD9B2, 0xB10BE924, - 0x2F6F7C87, 0x58684C11, 0xC1611DAB, 0xB6662D3D, 0x76DC4190, - 0x01DB7106, 0x98D220BC, 0xEFD5102A, 0x71B18589, 0x06B6B51F, - 0x9FBFE4A5, 0xE8B8D433, 0x7807C9A2, 0x0F00F934, 0x9609A88E, - 0xE10E9818, 0x7F6A0DBB, 0x086D3D2D, 0x91646C97, 0xE6635C01, - 0x6B6B51F4, 0x1C6C6162, 0x856530D8, 0xF262004E, 0x6C0695ED, - 0x1B01A57B, 0x8208F4C1, 0xF50FC457, 0x65B0D9C6, 0x12B7E950, - 0x8BBEB8EA, 0xFCB9887C, 0x62DD1DDF, 0x15DA2D49, 0x8CD37CF3, - 0xFBD44C65, 0x4DB26158, 0x3AB551CE, 0xA3BC0074, 0xD4BB30E2, - 0x4ADFA541, 0x3DD895D7, 0xA4D1C46D, 0xD3D6F4FB, 0x4369E96A, - 0x346ED9FC, 0xAD678846, 0xDA60B8D0, 0x44042D73, 0x33031DE5, - 0xAA0A4C5F, 0xDD0D7CC9, 0x5005713C, 0x270241AA, 0xBE0B1010, - 0xC90C2086, 0x5768B525, 0x206F85B3, 0xB966D409, 0xCE61E49F, - 0x5EDEF90E, 0x29D9C998, 0xB0D09822, 0xC7D7A8B4, 0x59B33D17, - 0x2EB40D81, 0xB7BD5C3B, 0xC0BA6CAD, 0xEDB88320, 0x9ABFB3B6, - 0x03B6E20C, 0x74B1D29A, 0xEAD54739, 0x9DD277AF, 0x04DB2615, - 0x73DC1683, 0xE3630B12, 0x94643B84, 0x0D6D6A3E, 0x7A6A5AA8, - 0xE40ECF0B, 0x9309FF9D, 0x0A00AE27, 0x7D079EB1, 0xF00F9344, - 0x8708A3D2, 0x1E01F268, 0x6906C2FE, 0xF762575D, 0x806567CB, - 0x196C3671, 0x6E6B06E7, 0xFED41B76, 0x89D32BE0, 0x10DA7A5A, - 0x67DD4ACC, 0xF9B9DF6F, 0x8EBEEFF9, 0x17B7BE43, 0x60B08ED5, - 0xD6D6A3E8, 0xA1D1937E, 0x38D8C2C4, 0x4FDFF252, 0xD1BB67F1, - 0xA6BC5767, 0x3FB506DD, 0x48B2364B, 0xD80D2BDA, 0xAF0A1B4C, - 0x36034AF6, 0x41047A60, 0xDF60EFC3, 0xA867DF55, 0x316E8EEF, - 0x4669BE79, 0xCB61B38C, 0xBC66831A, 0x256FD2A0, 0x5268E236, - 0xCC0C7795, 0xBB0B4703, 0x220216B9, 0x5505262F, 0xC5BA3BBE, - 0xB2BD0B28, 0x2BB45A92, 0x5CB36A04, 0xC2D7FFA7, 0xB5D0CF31, - 0x2CD99E8B, 0x5BDEAE1D, 0x9B64C2B0, 0xEC63F226, 0x756AA39C, - 0x026D930A, 0x9C0906A9, 0xEB0E363F, 0x72076785, 0x05005713, - 0x95BF4A82, 0xE2B87A14, 0x7BB12BAE, 0x0CB61B38, 0x92D28E9B, - 0xE5D5BE0D, 0x7CDCEFB7, 0x0BDBDF21, 0x86D3D2D4, 0xF1D4E242, - 0x68DDB3F8, 0x1FDA836E, 0x81BE16CD, 0xF6B9265B, 0x6FB077E1, - 0x18B74777, 0x88085AE6, 0xFF0F6A70, 0x66063BCA, 0x11010B5C, - 0x8F659EFF, 0xF862AE69, 0x616BFFD3, 0x166CCF45, 0xA00AE278, - 0xD70DD2EE, 0x4E048354, 0x3903B3C2, 0xA7672661, 0xD06016F7, - 0x4969474D, 0x3E6E77DB, 0xAED16A4A, 0xD9D65ADC, 0x40DF0B66, - 0x37D83BF0, 0xA9BCAE53, 0xDEBB9EC5, 0x47B2CF7F, 0x30B5FFE9, - 0xBDBDF21C, 0xCABAC28A, 0x53B39330, 0x24B4A3A6, 0xBAD03605, - 0xCDD70693, 0x54DE5729, 0x23D967BF, 0xB3667A2E, 0xC4614AB8, - 0x5D681B02, 0x2A6F2B94, 0xB40BBE37, 0xC30C8EA1, 0x5A05DF1B, - 0x2D02EF8D -}; - -CC_INLINE void CRCUpdateB(uint32_t& crc, uint8_t b) { - crc = CRC32_TABLE[(crc ^ b) & 0xFF] ^ (crc >> 8); -} - -uint32_t CRC32(const char* str) { - uint32_t crc = 0xFFFFFFFF; - size_t length = strlen(str); - - for (size_t i = 0; i < length; ++i) { - CRCUpdateB(crc, (uint8_t)str[i]); - } - - CRCUpdateB(crc, (uint8_t)length); - return crc; -} - -uint32_t CRC32NoCase(const char* str) { - uint32_t crc = 0xFFFFFFFF; - size_t length = strlen(str); - - for (size_t i = 0; i < length; ++i) { - CRCUpdateB(crc, (uint8_t)tolower((char)str[i])); - } - - CRCUpdateB(crc, (uint8_t)length); - return crc; -} - -uint16_t CRC16(const char* str) { - size_t length = strlen(str); - uint16_t crc = 0; - for (size_t i = 0; i < length; ++i) { - crc = (crc << 8) ^ CRC16_TABLE[((crc >> 8) ^ *str++) & 0x00FF]; - } - return crc; -} - -CC_MATH_NAMESPACE_END diff --git a/native/cocos/renderer/core/math/CoreMath.h b/native/cocos/renderer/core/math/CoreMath.h deleted file mode 100755 index 741102267d..0000000000 --- a/native/cocos/renderer/core/math/CoreMath.h +++ /dev/null @@ -1,66 +0,0 @@ -#ifndef CC_CORE_MATH_CC_MATH_H_ -#define CC_CORE_MATH_CC_MATH_H_ - -#define CC_MATH_NAMESPACE_BEGIN namespace cc { namespace gfx { namespace math { -#define CC_MATH_NAMESPACE_END }}} - -CC_MATH_NAMESPACE_BEGIN - -extern CC_DLL const float PI; -extern CC_DLL const float PI_2; -extern CC_DLL const float PI_DIV2; -extern CC_DLL const float PI_DIV3; -extern CC_DLL const float PI_DIV4; -extern CC_DLL const float PI_DIV5; -extern CC_DLL const float PI_DIV6; -extern CC_DLL const float PI_DIV8; -extern CC_DLL const float PI_SQR; -extern CC_DLL const float PI_INV; -extern CC_DLL const float EPSILON; -extern CC_DLL const float LOW_EPSILON; -extern CC_DLL const float POS_INFINITY; -extern CC_DLL const float NEG_INFINITY; -extern CC_DLL const float LN2; -extern CC_DLL const float LN10; -extern CC_DLL const float LN2_INV; -extern CC_DLL const float LN10_INV; -extern CC_DLL const float DEG_TO_RAD; -extern CC_DLL const float RAD_TO_DEG; -extern CC_DLL const float MIN_FLOAT; -extern CC_DLL const float MAX_FLOAT; - -uint16_t CRC16(const char* str); -uint32_t CRC32(const char* str); -uint32_t CRC32NoCase(const char* str); - -template -inline T Abs(T x) { - return x > 0 ? x : -x; -} - -template -inline T Sgn(T x) { - return (x < T(0) ? T(-1) : (x > T(0) ? T(1) : T(0))); -} - -template -inline T Sqr(T x) { - return x * x; -} - -template -inline bool IsPowerOfTwo(T n) { - return (n & (n-1)) == 0; -} - -CC_INLINE bool IsEqualF(float lhs, float rhs, float precision = 0.000001f) { - return (Abs(lhs - rhs) < precision); -} - -CC_INLINE bool IsNotEqualF(float lhs, float rhs, float precision = 0.000001f) { - return (Abs(lhs - rhs) > precision); -} - -CC_MATH_NAMESPACE_END - -#endif diff --git a/native/cocos/renderer/pipeline/Define.h b/native/cocos/renderer/pipeline/Define.h index 6a17bedeb7..0c879333a1 100644 --- a/native/cocos/renderer/pipeline/Define.h +++ b/native/cocos/renderer/pipeline/Define.h @@ -146,7 +146,7 @@ private: CC_INLINE bool opaqueCompareFn(const RenderPass &a, const RenderPass &b) { if (a.hash != b.hash) return a.hash < b.hash; - else if (gfx::math::IsNotEqualF(a.depth, b.depth)) + else if (math::IsNotEqualF(a.depth, b.depth)) return a.depth < b.depth; else return a.shaderID < b.shaderID; @@ -155,7 +155,7 @@ CC_INLINE bool opaqueCompareFn(const RenderPass &a, const RenderPass &b) { CC_INLINE bool transparentCompareFn(const RenderPass &a, const RenderPass &b) { if (a.hash != b.hash) return a.hash < b.hash; - else if (gfx::math::IsEqualF(a.depth, b.depth)) + else if (math::IsEqualF(a.depth, b.depth)) return b.depth < a.depth; else return a.shaderID < b.shaderID;