godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename or refactor macros to avoid leading underscores 

These are not used consistently and some can conflict with
system-specific defines.  While here, also delete some unused macros.
This commit is contained in:
Omar Polo 2021-08-09 19:28:08 +02:00
parent 8fc0dd9997
commit bd448e5535
12 changed files with 95 additions and 94 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/io/marshalls.cpp
View File

@ -52,9 +52,8 @@ ObjectID EncodedObjectAsID::get_object_id() const {
return id; return id;
} }
#define _S(a) ((int32_t)a) #define ERR_FAIL_ADD_OF(a, b, err) ERR_FAIL_COND_V(((int32_t)(b)) < 0 || ((int32_t)(a)) < 0 || ((int32_t)(a)) > INT_MAX - ((int32_t)(b)), err)
#define ERR_FAIL_ADD_OF(a, b, err) ERR_FAIL_COND_V(_S(b) < 0 || _S(a) < 0 || _S(a) > INT_MAX - _S(b), err) #define ERR_FAIL_MUL_OF(a, b, err) ERR_FAIL_COND_V(((int32_t)(a)) < 0 || ((int32_t)(b)) <= 0 || ((int32_t)(a)) > INT_MAX / ((int32_t)(b)), err)
#define ERR_FAIL_MUL_OF(a, b, err) ERR_FAIL_COND_V(_S(a) < 0 || _S(b) <= 0 || _S(a) > INT_MAX / _S(b), err)
#define ENCODE_MASK 0xFF #define ENCODE_MASK 0xFF
#define ENCODE_FLAG_64 1 << 16 #define ENCODE_FLAG_64 1 << 16

8
core/math/face3.cpp
View File

@ -260,8 +260,8 @@ void Face3::project_range(const Vector3 &p_normal, const Transform3D &p_transfor
} }
void Face3::get_support(const Vector3 &p_normal, const Transform3D &p_transform, Vector3 *p_vertices, int *p_count, int p_max) const { void Face3::get_support(const Vector3 &p_normal, const Transform3D &p_transform, Vector3 *p_vertices, int *p_count, int p_max) const {
#define _FACE_IS_VALID_SUPPORT_THRESHOLD 0.98 constexpr double face_support_threshold = 0.98;
#define _EDGE_IS_VALID_SUPPORT_THRESHOLD 0.05 constexpr double edge_support_threshold = 0.05;
if (p_max <= 0) { if (p_max <= 0) {
return; return;
@ -270,7 +270,7 @@ void Face3::get_support(const Vector3 &p_normal, const Transform3D &p_transform,
Vector3 n = p_transform.basis.xform_inv(p_normal); Vector3 n = p_transform.basis.xform_inv(p_normal);
/** TEST FACE AS SUPPORT **/ /** TEST FACE AS SUPPORT **/
if (get_plane().normal.dot(n) > _FACE_IS_VALID_SUPPORT_THRESHOLD) { if (get_plane().normal.dot(n) > face_support_threshold) {
*p_count = MIN(3, p_max); *p_count = MIN(3, p_max);
for (int i = 0; i < *p_count; i++) { for (int i = 0; i < *p_count; i++) {
@ -304,7 +304,7 @@ void Face3::get_support(const Vector3 &p_normal, const Transform3D &p_transform,
// check if edge is valid as a support // check if edge is valid as a support
real_t dot = (vertex[i] - vertex[(i + 1) % 3]).normalized().dot(n); real_t dot = (vertex[i] - vertex[(i + 1) % 3]).normalized().dot(n);
dot = ABS(dot); dot = ABS(dot);
if (dot < _EDGE_IS_VALID_SUPPORT_THRESHOLD) { if (dot < edge_support_threshold) {
*p_count = MIN(2, p_max); *p_count = MIN(2, p_max);
for (int j = 0; j < *p_count; j++) { for (int j = 0; j < *p_count; j++) {

51
core/math/geometry_3d.cpp
View File

@ -281,16 +281,16 @@ static inline void _plot_face(uint8_t ***p_cell_status, int x, int y, int z, int
int div_y = len_y > 1 ? 2 : 1; int div_y = len_y > 1 ? 2 : 1;
int div_z = len_z > 1 ? 2 : 1; int div_z = len_z > 1 ? 2 : 1;
#define _SPLIT(m_i, m_div, m_v, m_len_v, m_new_v, m_new_len_v) \ #define SPLIT_DIV(m_i, m_div, m_v, m_len_v, m_new_v, m_new_len_v) \
if (m_div == 1) { \ if (m_div == 1) { \
m_new_v = m_v; \ m_new_v = m_v; \
m_new_len_v = 1; \ m_new_len_v = 1; \
} else if (m_i == 0) { \ } else if (m_i == 0) { \
m_new_v = m_v; \ m_new_v = m_v; \
m_new_len_v = m_len_v / 2; \ m_new_len_v = m_len_v / 2; \
} else { \ } else { \
m_new_v = m_v + m_len_v / 2; \ m_new_v = m_v + m_len_v / 2; \
m_new_len_v = m_len_v - m_len_v / 2; \ m_new_len_v = m_len_v - m_len_v / 2; \
} }
int new_x; int new_x;
@ -301,18 +301,20 @@ static inline void _plot_face(uint8_t ***p_cell_status, int x, int y, int z, int
int new_len_z; int new_len_z;
for (int i = 0; i < div_x; i++) { for (int i = 0; i < div_x; i++) {
_SPLIT(i, div_x, x, len_x, new_x, new_len_x); SPLIT_DIV(i, div_x, x, len_x, new_x, new_len_x);
for (int j = 0; j < div_y; j++) { for (int j = 0; j < div_y; j++) {
_SPLIT(j, div_y, y, len_y, new_y, new_len_y); SPLIT_DIV(j, div_y, y, len_y, new_y, new_len_y);
for (int k = 0; k < div_z; k++) { for (int k = 0; k < div_z; k++) {
_SPLIT(k, div_z, z, len_z, new_z, new_len_z); SPLIT_DIV(k, div_z, z, len_z, new_z, new_len_z);
_plot_face(p_cell_status, new_x, new_y, new_z, new_len_x, new_len_y, new_len_z, voxelsize, p_face); _plot_face(p_cell_status, new_x, new_y, new_z, new_len_x, new_len_y, new_len_z, voxelsize, p_face);
} }
} }
} }
#undef SPLIT_DIV
} }
static inline void _mark_outside(uint8_t ***p_cell_status, int x, int y, int z, int len_x, int len_y, int len_z) { static inline void _mark_outside(uint8_t ***p_cell_status, int x, int y, int z, int len_x, int len_y, int len_z) {
@ -491,11 +493,10 @@ static inline void _build_faces(uint8_t ***p_cell_status, int x, int y, int z, i
} }
Vector<Face3> Geometry3D::wrap_geometry(Vector<Face3> p_array, real_t *p_error) { Vector<Face3> Geometry3D::wrap_geometry(Vector<Face3> p_array, real_t *p_error) {
#define _MIN_SIZE 1.0
#define _MAX_LENGTH 20
int face_count = p_array.size(); int face_count = p_array.size();
const Face3 *faces = p_array.ptr(); const Face3 *faces = p_array.ptr();
constexpr double min_size = 1.0;
constexpr int max_length = 20;
AABB global_aabb; AABB global_aabb;
@ -512,22 +513,22 @@ Vector<Face3> Geometry3D::wrap_geometry(Vector<Face3> p_array, real_t *p_error)
// Determine amount of cells in grid axis. // Determine amount of cells in grid axis.
int div_x, div_y, div_z; int div_x, div_y, div_z;
if (global_aabb.size.x / _MIN_SIZE < _MAX_LENGTH) { if (global_aabb.size.x / min_size < max_length) {
div_x = (int)(global_aabb.size.x / _MIN_SIZE) + 1; div_x = (int)(global_aabb.size.x / min_size) + 1;
} else { } else {
div_x = _MAX_LENGTH; div_x = max_length;
} }
if (global_aabb.size.y / _MIN_SIZE < _MAX_LENGTH) { if (global_aabb.size.y / min_size < max_length) {
div_y = (int)(global_aabb.size.y / _MIN_SIZE) + 1; div_y = (int)(global_aabb.size.y / min_size) + 1;
} else { } else {
div_y = _MAX_LENGTH; div_y = max_length;
} }
if (global_aabb.size.z / _MIN_SIZE < _MAX_LENGTH) { if (global_aabb.size.z / min_size < max_length) {
div_z = (int)(global_aabb.size.z / _MIN_SIZE) + 1; div_z = (int)(global_aabb.size.z / min_size) + 1;
} else { } else {
div_z = _MAX_LENGTH; div_z = max_length;
} }
Vector3 voxelsize = global_aabb.size; Vector3 voxelsize = global_aabb.size;

34
core/string/ustring.cpp
View File

@ -1632,7 +1632,7 @@ String String::utf8(const char *p_utf8, int p_len) {
} }
bool String::parse_utf8(const char *p_utf8, int p_len) { bool String::parse_utf8(const char *p_utf8, int p_len) {
#define _UNICERROR(m_err) print_error("Unicode parsing error: " + String(m_err) + ". Is the string valid UTF-8?"); #define UNICERROR(m_err) print_error("Unicode parsing error: " + String(m_err) + ". Is the string valid UTF-8?");
if (!p_utf8) { if (!p_utf8) {
return true; return true;
@ -1673,12 +1673,12 @@ bool String::parse_utf8(const char *p_utf8, int p_len) {
} else if ((c & 0xf8) == 0xf0) { } else if ((c & 0xf8) == 0xf0) {
skip = 3; skip = 3;
} else { } else {
_UNICERROR("invalid skip at " + num_int64(cstr_size)); UNICERROR("invalid skip at " + num_int64(cstr_size));
return true; //invalid utf8 return true; //invalid utf8
} }
if (skip == 1 && (c & 0x1e) == 0) { if (skip == 1 && (c & 0x1e) == 0) {
_UNICERROR("overlong rejected at " + num_int64(cstr_size)); UNICERROR("overlong rejected at " + num_int64(cstr_size));
return true; //reject overlong return true; //reject overlong
} }
@ -1693,7 +1693,7 @@ bool String::parse_utf8(const char *p_utf8, int p_len) {
} }
if (skip) { if (skip) {
_UNICERROR("no space left"); UNICERROR("no space left");
return true; //not enough space return true; //not enough space
} }
} }
@ -1720,17 +1720,17 @@ bool String::parse_utf8(const char *p_utf8, int p_len) {
} else if ((*p_utf8 & 0xf8) == 0xf0) { } else if ((*p_utf8 & 0xf8) == 0xf0) {
len = 4; len = 4;
} else { } else {
_UNICERROR("invalid len"); UNICERROR("invalid len");
return true; //invalid UTF8 return true; //invalid UTF8
} }
if (len > cstr_size) { if (len > cstr_size) {
_UNICERROR("no space left"); UNICERROR("no space left");
return true; //not enough space return true; //not enough space
} }
if (len == 2 && (*p_utf8 & 0x1E) == 0) { if (len == 2 && (*p_utf8 & 0x1E) == 0) {
_UNICERROR("no space left"); UNICERROR("no space left");
return true; //reject overlong return true; //reject overlong
} }
@ -1745,18 +1745,18 @@ bool String::parse_utf8(const char *p_utf8, int p_len) {
for (int i = 1; i < len; i++) { for (int i = 1; i < len; i++) {
if ((p_utf8[i] & 0xc0) != 0x80) { if ((p_utf8[i] & 0xc0) != 0x80) {
_UNICERROR("invalid utf8"); UNICERROR("invalid utf8");
return true; //invalid utf8 return true; //invalid utf8
} }
if (unichar == 0 && i == 2 && ((p_utf8[i] & 0x7f) >> (7 - len)) == 0) { if (unichar == 0 && i == 2 && ((p_utf8[i] & 0x7f) >> (7 - len)) == 0) {
_UNICERROR("invalid utf8 overlong"); UNICERROR("invalid utf8 overlong");
return true; //no overlong return true; //no overlong
} }
unichar = (unichar << 6) | (p_utf8[i] & 0x3f); unichar = (unichar << 6) | (p_utf8[i] & 0x3f);
} }
} }
if (unichar >= 0xd800 && unichar <= 0xdfff) { if (unichar >= 0xd800 && unichar <= 0xdfff) {
_UNICERROR("invalid code point"); UNICERROR("invalid code point");
return CharString(); return CharString();
} }
@ -1766,7 +1766,7 @@ bool String::parse_utf8(const char *p_utf8, int p_len) {
} }
return false; return false;
#undef _UNICERROR #undef UNICERROR
} }
CharString String::utf8() const { CharString String::utf8() const {
@ -1840,7 +1840,7 @@ String String::utf16(const char16_t *p_utf16, int p_len) {
} }
bool String::parse_utf16(const char16_t *p_utf16, int p_len) { bool String::parse_utf16(const char16_t *p_utf16, int p_len) {
#define _UNICERROR(m_err) print_error("Unicode parsing error: " + String(m_err) + ". Is the string valid UTF-16?"); #define UNICERROR(m_err) print_error("Unicode parsing error: " + String(m_err) + ". Is the string valid UTF-16?");
if (!p_utf16) { if (!p_utf16) {
return true; return true;
@ -1880,7 +1880,7 @@ bool String::parse_utf16(const char16_t *p_utf16, int p_len) {
if ((c & 0xfffffc00) == 0xd800) { if ((c & 0xfffffc00) == 0xd800) {
skip = 1; // lead surrogate skip = 1; // lead surrogate
} else if ((c & 0xfffffc00) == 0xdc00) { } else if ((c & 0xfffffc00) == 0xdc00) {
_UNICERROR("invalid utf16 surrogate at " + num_int64(cstr_size)); UNICERROR("invalid utf16 surrogate at " + num_int64(cstr_size));
return true; // invalid UTF16 return true; // invalid UTF16
} else { } else {
skip = 0; skip = 0;
@ -1890,7 +1890,7 @@ bool String::parse_utf16(const char16_t *p_utf16, int p_len) {
if ((c & 0xfffffc00) == 0xdc00) { // trail surrogate if ((c & 0xfffffc00) == 0xdc00) { // trail surrogate
--skip; --skip;
} else { } else {
_UNICERROR("invalid utf16 surrogate at " + num_int64(cstr_size)); UNICERROR("invalid utf16 surrogate at " + num_int64(cstr_size));
return true; // invalid UTF16 return true; // invalid UTF16
} }
} }
@ -1900,7 +1900,7 @@ bool String::parse_utf16(const char16_t *p_utf16, int p_len) {
} }
if (skip) { if (skip) {
_UNICERROR("no space left"); UNICERROR("no space left");
return true; // not enough space return true; // not enough space
} }
} }
@ -1925,7 +1925,7 @@ bool String::parse_utf16(const char16_t *p_utf16, int p_len) {
} }
if (len > cstr_size) { if (len > cstr_size) {
_UNICERROR("no space left"); UNICERROR("no space left");
return true; //not enough space return true; //not enough space
} }
@ -1943,7 +1943,7 @@ bool String::parse_utf16(const char16_t *p_utf16, int p_len) {
} }
return false; return false;
#undef _UNICERROR #undef UNICERROR
} }
Char16String String::utf16() const { Char16String String::utf16() const {

10
editor/animation_track_editor.cpp
View File

@ -5700,16 +5700,16 @@ void AnimationTrackEditor::_edit_menu_pressed(int p_option) {
to_restore.push_back(amr); to_restore.push_back(amr);
} }
#define _NEW_POS(m_ofs) (((s > 0) ? m_ofs : from_t + (len - (m_ofs - from_t))) - pivot) * ABS(s) + from_t #define NEW_POS(m_ofs) (((s > 0) ? m_ofs : from_t + (len - (m_ofs - from_t))) - pivot) * ABS(s) + from_t
// 3 - Move the keys (re insert them). // 3 - Move the keys (re insert them).
for (Map<SelectedKey, KeyInfo>::Element *E = selection.back(); E; E = E->prev()) { for (Map<SelectedKey, KeyInfo>::Element *E = selection.back(); E; E = E->prev()) {
float newpos = _NEW_POS(E->get().pos); float newpos = NEW_POS(E->get().pos);
undo_redo->add_do_method(animation.ptr(), "track_insert_key", E->key().track, newpos, animation->track_get_key_value(E->key().track, E->key().key), animation->track_get_key_transition(E->key().track, E->key().key)); undo_redo->add_do_method(animation.ptr(), "track_insert_key", E->key().track, newpos, animation->track_get_key_value(E->key().track, E->key().key), animation->track_get_key_transition(E->key().track, E->key().key));
} }
// 4 - (Undo) Remove inserted keys. // 4 - (Undo) Remove inserted keys.
for (Map<SelectedKey, KeyInfo>::Element *E = selection.back(); E; E = E->prev()) { for (Map<SelectedKey, KeyInfo>::Element *E = selection.back(); E; E = E->prev()) {
float newpos = _NEW_POS(E->get().pos); float newpos = NEW_POS(E->get().pos);
undo_redo->add_undo_method(animation.ptr(), "track_remove_key_at_time", E->key().track, newpos); undo_redo->add_undo_method(animation.ptr(), "track_remove_key_at_time", E->key().track, newpos);
} }
@ -5729,13 +5729,13 @@ void AnimationTrackEditor::_edit_menu_pressed(int p_option) {
// 7-reselect. // 7-reselect.
for (Map<SelectedKey, KeyInfo>::Element *E = selection.back(); E; E = E->prev()) { for (Map<SelectedKey, KeyInfo>::Element *E = selection.back(); E; E = E->prev()) {
float oldpos = E->get().pos; float oldpos = E->get().pos;
float newpos = _NEW_POS(oldpos); float newpos = NEW_POS(oldpos);
if (newpos >= 0) { if (newpos >= 0) {
undo_redo->add_do_method(this, "_select_at_anim", animation, E->key().track, newpos); undo_redo->add_do_method(this, "_select_at_anim", animation, E->key().track, newpos);
} }
undo_redo->add_undo_method(this, "_select_at_anim", animation, E->key().track, oldpos); undo_redo->add_undo_method(this, "_select_at_anim", animation, E->key().track, oldpos);
} }
#undef _NEW_POS #undef NEW_POS
undo_redo->commit_action(); undo_redo->commit_action();
} break; } break;
case EDIT_DUPLICATE_SELECTION: { case EDIT_DUPLICATE_SELECTION: {

8
modules/webrtc/register_types.cpp
View File

@ -38,11 +38,11 @@
#include "webrtc_peer_connection_extension.h" #include "webrtc_peer_connection_extension.h"
void register_webrtc_types() { void register_webrtc_types() {
#define _SET_HINT(NAME, _VAL_, _MAX_) \ #define SET_HINT(NAME, _VAL_, _MAX_) \
GLOBAL_DEF(NAME, _VAL_); \ GLOBAL_DEF(NAME, _VAL_); \
ProjectSettings::get_singleton()->set_custom_property_info(NAME, PropertyInfo(Variant::INT, NAME, PROPERTY_HINT_RANGE, "2," #_MAX_ ",1,or_greater")); ProjectSettings::get_singleton()->set_custom_property_info(NAME, PropertyInfo(Variant::INT, NAME, PROPERTY_HINT_RANGE, "2," #_MAX_ ",1,or_greater"));
_SET_HINT(WRTC_IN_BUF, 64, 4096); SET_HINT(WRTC_IN_BUF, 64, 4096);
ClassDB::register_custom_instance_class<WebRTCPeerConnection>(); ClassDB::register_custom_instance_class<WebRTCPeerConnection>();
GDREGISTER_CLASS(WebRTCPeerConnectionExtension); GDREGISTER_CLASS(WebRTCPeerConnectionExtension);
@ -51,6 +51,8 @@ void register_webrtc_types() {
GDREGISTER_CLASS(WebRTCDataChannelExtension); GDREGISTER_CLASS(WebRTCDataChannelExtension);
GDREGISTER_CLASS(WebRTCMultiplayerPeer); GDREGISTER_CLASS(WebRTCMultiplayerPeer);
#undef SET_HINT
} }
void unregister_webrtc_types() {} void unregister_webrtc_types() {}

14
modules/websocket/wsl_client.cpp
View File

@ -124,17 +124,17 @@ bool WSLClient::_verify_headers(String &r_protocol) {
} }
} }
#define _WSL_CHECK(NAME, VALUE) \ #define WSL_CHECK(NAME, VALUE) \
ERR_FAIL_COND_V_MSG(!headers.has(NAME) || headers[NAME].to_lower() != VALUE, false, \ ERR_FAIL_COND_V_MSG(!headers.has(NAME) || headers[NAME].to_lower() != VALUE, false, \
"Missing or invalid header '" + String(NAME) + "'. Expected value '" + VALUE + "'."); "Missing or invalid header '" + String(NAME) + "'. Expected value '" + VALUE + "'.");
#define _WSL_CHECK_NC(NAME, VALUE) \ #define WSL_CHECK_NC(NAME, VALUE) \
ERR_FAIL_COND_V_MSG(!headers.has(NAME) || headers[NAME] != VALUE, false, \ ERR_FAIL_COND_V_MSG(!headers.has(NAME) || headers[NAME] != VALUE, false, \
"Missing or invalid header '" + String(NAME) + "'. Expected value '" + VALUE + "'."); "Missing or invalid header '" + String(NAME) + "'. Expected value '" + VALUE + "'.");
_WSL_CHECK("connection", "upgrade"); WSL_CHECK("connection", "upgrade");
_WSL_CHECK("upgrade", "websocket"); WSL_CHECK("upgrade", "websocket");
_WSL_CHECK_NC("sec-websocket-accept", WSLPeer::compute_key_response(_key)); WSL_CHECK_NC("sec-websocket-accept", WSLPeer::compute_key_response(_key));
#undef _WSL_CHECK_NC #undef WSL_CHECK_NC
#undef _WSL_CHECK #undef WSL_CHECK
if (_protocols.size() == 0) { if (_protocols.size() == 0) {
// We didn't request a custom protocol // We didn't request a custom protocol
ERR_FAIL_COND_V(headers.has("sec-websocket-protocol"), false); ERR_FAIL_COND_V(headers.has("sec-websocket-protocol"), false);

16
modules/websocket/wsl_server.cpp
View File

@ -58,17 +58,17 @@ bool WSLServer::PendingPeer::_parse_request(const Vector<String> p_protocols, St
headers[name] = value; headers[name] = value;
} }
} }
#define _WSL_CHECK(NAME, VALUE) \ #define WSL_CHECK(NAME, VALUE) \
ERR_FAIL_COND_V_MSG(!headers.has(NAME) || headers[NAME].to_lower() != VALUE, false, \ ERR_FAIL_COND_V_MSG(!headers.has(NAME) || headers[NAME].to_lower() != VALUE, false, \
"Missing or invalid header '" + String(NAME) + "'. Expected value '" + VALUE + "'."); "Missing or invalid header '" + String(NAME) + "'. Expected value '" + VALUE + "'.");
#define _WSL_CHECK_EX(NAME) \ #define WSL_CHECK_EX(NAME) \
ERR_FAIL_COND_V_MSG(!headers.has(NAME), false, "Missing header '" + String(NAME) + "'."); ERR_FAIL_COND_V_MSG(!headers.has(NAME), false, "Missing header '" + String(NAME) + "'.");
_WSL_CHECK("upgrade", "websocket"); WSL_CHECK("upgrade", "websocket");
_WSL_CHECK("sec-websocket-version", "13"); WSL_CHECK("sec-websocket-version", "13");
_WSL_CHECK_EX("sec-websocket-key"); WSL_CHECK_EX("sec-websocket-key");
_WSL_CHECK_EX("connection"); WSL_CHECK_EX("connection");
#undef _WSL_CHECK_EX #undef WSL_CHECK_EX
#undef _WSL_CHECK #undef WSL_CHECK
key = headers["sec-websocket-key"]; key = headers["sec-websocket-key"];
if (headers.has("sec-websocket-protocol")) { if (headers.has("sec-websocket-protocol")) {
Vector<String> protos = headers["sec-websocket-protocol"].split(","); Vector<String> protos = headers["sec-websocket-protocol"].split(",");

1
platform/linuxbsd/display_server_x11.cpp
View File

@ -64,7 +64,6 @@
// EWMH // EWMH
#define _NET_WM_STATE_REMOVE 0L // remove/unset property #define _NET_WM_STATE_REMOVE 0L // remove/unset property
#define _NET_WM_STATE_ADD 1L // add/set property #define _NET_WM_STATE_ADD 1L // add/set property
#define _NET_WM_STATE_TOGGLE 2L // toggle property
#include <dlfcn.h> #include <dlfcn.h>
#include <fcntl.h> #include <fcntl.h>

1
scene/resources/surface_tool.cpp
View File

@ -30,7 +30,6 @@
#include "surface_tool.h" #include "surface_tool.h"
#define _VERTEX_SNAP 0.0001
#define EQ_VERTEX_DIST 0.00001 #define EQ_VERTEX_DIST 0.00001
SurfaceTool::OptimizeVertexCacheFunc SurfaceTool::optimize_vertex_cache_func = nullptr; SurfaceTool::OptimizeVertexCacheFunc SurfaceTool::optimize_vertex_cache_func = nullptr;

28
servers/physics_3d/godot_shape_3d.cpp
View File

@ -52,11 +52,11 @@ subject to the following restrictions:
3. This notice may not be removed or altered from any source distribution. 3. This notice may not be removed or altered from any source distribution.
*/ */
#define _EDGE_IS_VALID_SUPPORT_THRESHOLD 0.0002 constexpr double edge_support_threshold = 0.0002;
#define _FACE_IS_VALID_SUPPORT_THRESHOLD 0.9998 constexpr double face_support_threshold = 0.9998;
#define _CYLINDER_EDGE_IS_VALID_SUPPORT_THRESHOLD 0.002 constexpr double cylinder_edge_support_threshold = 0.002;
#define _CYLINDER_FACE_IS_VALID_SUPPORT_THRESHOLD 0.999 constexpr double cylinder_face_support_threshold = 0.999;
void GodotShape3D::configure(const AABB &p_aabb) { void GodotShape3D::configure(const AABB &p_aabb) {
aabb = p_aabb; aabb = p_aabb;
@ -184,7 +184,7 @@ Vector3 GodotSeparationRayShape3D::get_support(const Vector3 &p_normal) const {
} }
void GodotSeparationRayShape3D::get_supports(const Vector3 &p_normal, int p_max, Vector3 *r_supports, int &r_amount, FeatureType &r_type) const { void GodotSeparationRayShape3D::get_supports(const Vector3 &p_normal, int p_max, Vector3 *r_supports, int &r_amount, FeatureType &r_type) const {
if (Math::abs(p_normal.z) < _EDGE_IS_VALID_SUPPORT_THRESHOLD) { if (Math::abs(p_normal.z) < edge_support_threshold) {
r_amount = 2; r_amount = 2;
r_type = FEATURE_EDGE; r_type = FEATURE_EDGE;
r_supports[0] = Vector3(0, 0, 0); r_supports[0] = Vector3(0, 0, 0);
@ -335,7 +335,7 @@ void GodotBoxShape3D::get_supports(const Vector3 &p_normal, int p_max, Vector3 *
Vector3 axis; Vector3 axis;
axis[i] = 1.0; axis[i] = 1.0;
real_t dot = p_normal.dot(axis); real_t dot = p_normal.dot(axis);
if (Math::abs(dot) > _FACE_IS_VALID_SUPPORT_THRESHOLD) { if (Math::abs(dot) > face_support_threshold) {
//Vector3 axis_b; //Vector3 axis_b;
bool neg = dot < 0; bool neg = dot < 0;
@ -376,7 +376,7 @@ void GodotBoxShape3D::get_supports(const Vector3 &p_normal, int p_max, Vector3 *
Vector3 axis; Vector3 axis;
axis[i] = 1.0; axis[i] = 1.0;
if (Math::abs(p_normal.dot(axis)) < _EDGE_IS_VALID_SUPPORT_THRESHOLD) { if (Math::abs(p_normal.dot(axis)) < edge_support_threshold) {
r_amount = 2; r_amount = 2;
r_type = FEATURE_EDGE; r_type = FEATURE_EDGE;
@ -522,7 +522,7 @@ void GodotCapsuleShape3D::get_supports(const Vector3 &p_normal, int p_max, Vecto
real_t d = n.y; real_t d = n.y;
if (Math::abs(d) < _EDGE_IS_VALID_SUPPORT_THRESHOLD) { if (Math::abs(d) < edge_support_threshold) {
// make it flat // make it flat
n.y = 0.0; n.y = 0.0;
n.normalize(); n.normalize();
@ -703,7 +703,7 @@ Vector3 GodotCylinderShape3D::get_support(const Vector3 &p_normal) const {
void GodotCylinderShape3D::get_supports(const Vector3 &p_normal, int p_max, Vector3 *r_supports, int &r_amount, FeatureType &r_type) const { void GodotCylinderShape3D::get_supports(const Vector3 &p_normal, int p_max, Vector3 *r_supports, int &r_amount, FeatureType &r_type) const {
real_t d = p_normal.y; real_t d = p_normal.y;
if (Math::abs(d) > _CYLINDER_FACE_IS_VALID_SUPPORT_THRESHOLD) { if (Math::abs(d) > cylinder_face_support_threshold) {
real_t h = (d > 0) ? height : -height; real_t h = (d > 0) ? height : -height;
Vector3 n = p_normal; Vector3 n = p_normal;
@ -718,7 +718,7 @@ void GodotCylinderShape3D::get_supports(const Vector3 &p_normal, int p_max, Vect
r_supports[1].x += radius; r_supports[1].x += radius;
r_supports[2] = n; r_supports[2] = n;
r_supports[2].z += radius; r_supports[2].z += radius;
} else if (Math::abs(d) < _CYLINDER_EDGE_IS_VALID_SUPPORT_THRESHOLD) { } else if (Math::abs(d) < cylinder_edge_support_threshold) {
// make it flat // make it flat
Vector3 n = p_normal; Vector3 n = p_normal;
n.y = 0.0; n.y = 0.0;
@ -911,7 +911,7 @@ void GodotConvexPolygonShape3D::get_supports(const Vector3 &p_normal, int p_max,
} }
for (int i = 0; i < fc; i++) { for (int i = 0; i < fc; i++) {
if (faces[i].plane.normal.dot(p_normal) > _FACE_IS_VALID_SUPPORT_THRESHOLD) { if (faces[i].plane.normal.dot(p_normal) > face_support_threshold) {
int ic = faces[i].indices.size(); int ic = faces[i].indices.size();
const int *ind = faces[i].indices.ptr(); const int *ind = faces[i].indices.ptr();
@ -940,7 +940,7 @@ void GodotConvexPolygonShape3D::get_supports(const Vector3 &p_normal, int p_max,
for (int i = 0; i < ec; i++) { for (int i = 0; i < ec; i++) {
real_t dot = (vertices[edges[i].a] - vertices[edges[i].b]).normalized().dot(p_normal); real_t dot = (vertices[edges[i].a] - vertices[edges[i].b]).normalized().dot(p_normal);
dot = ABS(dot); dot = ABS(dot);
if (dot < _EDGE_IS_VALID_SUPPORT_THRESHOLD && (edges[i].a == vtx || edges[i].b == vtx)) { if (dot < edge_support_threshold && (edges[i].a == vtx || edges[i].b == vtx)) {
r_amount = 2; r_amount = 2;
r_type = FEATURE_EDGE; r_type = FEATURE_EDGE;
r_supports[0] = vertices[edges[i].a]; r_supports[0] = vertices[edges[i].a];
@ -1140,7 +1140,7 @@ void GodotFaceShape3D::get_supports(const Vector3 &p_normal, int p_max, Vector3
Vector3 n = p_normal; Vector3 n = p_normal;
/** TEST FACE AS SUPPORT **/ /** TEST FACE AS SUPPORT **/
if (Math::abs(normal.dot(n)) > _FACE_IS_VALID_SUPPORT_THRESHOLD) { if (Math::abs(normal.dot(n)) > face_support_threshold) {
r_amount = 3; r_amount = 3;
r_type = FEATURE_FACE; r_type = FEATURE_FACE;
for (int i = 0; i < 3; i++) { for (int i = 0; i < 3; i++) {
@ -1174,7 +1174,7 @@ void GodotFaceShape3D::get_supports(const Vector3 &p_normal, int p_max, Vector3
// check if edge is valid as a support // check if edge is valid as a support
real_t dot = (vertex[i] - vertex[nx]).normalized().dot(n); real_t dot = (vertex[i] - vertex[nx]).normalized().dot(n);
dot = ABS(dot); dot = ABS(dot);
if (dot < _EDGE_IS_VALID_SUPPORT_THRESHOLD) { if (dot < edge_support_threshold) {
r_amount = 2; r_amount = 2;
r_type = FEATURE_EDGE; r_type = FEATURE_EDGE;
r_supports[0] = vertex[i]; r_supports[0] = vertex[i];

13
servers/rendering_server.cpp
View File

@ -2771,13 +2771,14 @@ void RenderingServer::mesh_add_surface_from_mesh_data(RID p_mesh, const Geometry
const Geometry3D::MeshData::Face &f = p_mesh_data.faces[i]; const Geometry3D::MeshData::Face &f = p_mesh_data.faces[i];
for (int j = 2; j < f.indices.size(); j++) { for (int j = 2; j < f.indices.size(); j++) {
#define _ADD_VERTEX(m_idx) \ vertices.push_back(p_mesh_data.vertices[f.indices[0]]);
vertices.push_back(p_mesh_data.vertices[f.indices[m_idx]]); \ normals.push_back(f.plane.normal);
normals.push_back(f.plane.normal);
_ADD_VERTEX(0); vertices.push_back(p_mesh_data.vertices[f.indices[j - 1]]);
_ADD_VERTEX(j - 1); normals.push_back(f.plane.normal);
_ADD_VERTEX(j);
vertices.push_back(p_mesh_data.vertices[f.indices[j]]);
normals.push_back(f.plane.normal);
} }
} }