Stowage/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-10-19 16:03:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

Use const reference where favorable

Browse source
This commit is contained in:
Wilson E. Alvarez 2017-08-12 07:04:30 -04:00
parent 9575dbdf78
commit 21d281c4a9
17 changed files with 71 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

2
core/class_db.h
View file

@ -45,7 +45,7 @@ struct ParamHint {
String hint_text; String hint_text;
Variant default_val; Variant default_val;
ParamHint(const String &p_name = "", PropertyHint p_hint = PROPERTY_HINT_NONE, const String &p_hint_text = "", Variant p_default_val = Variant()) ParamHint(const String &p_name = "", PropertyHint p_hint = PROPERTY_HINT_NONE, const String &p_hint_text = "", const Variant &p_default_val = Variant())
: name(p_name), : name(p_name),
hint(p_hint), hint(p_hint),
hint_text(p_hint_text), hint_text(p_hint_text),

2
core/io/packet_peer_udp.h
View file

@ -49,7 +49,7 @@ protected:
public: public:
void set_blocking_mode(bool p_enable); void set_blocking_mode(bool p_enable);
virtual Error listen(int p_port, IP_Address p_bind_address = IP_Address("*"), int p_recv_buffer_size = 65536) = 0; virtual Error listen(int p_port, const IP_Address &p_bind_address = IP_Address("*"), int p_recv_buffer_size = 65536) = 0;
virtual void close() = 0; virtual void close() = 0;
virtual Error wait() = 0; virtual Error wait() = 0;
virtual bool is_listening() const = 0; virtual bool is_listening() const = 0;

2
core/io/tcp_server.h
View file

@ -45,7 +45,7 @@ protected:
static void _bind_methods(); static void _bind_methods();
public: public:
virtual Error listen(uint16_t p_port, const IP_Address p_bind_address = IP_Address("*")) = 0; virtual Error listen(uint16_t p_port, const IP_Address &p_bind_address = IP_Address("*")) = 0;
virtual bool is_connection_available() const = 0; virtual bool is_connection_available() const = 0;
virtual Ref<StreamPeerTCP> take_connection() = 0; virtual Ref<StreamPeerTCP> take_connection() = 0;

4
core/math/plane.cpp
View file

@ -103,7 +103,7 @@ bool Plane::intersect_3(const Plane &p_plane1, const Plane &p_plane2, Vector3 *r
return true; return true;
} }
bool Plane::intersects_ray(Vector3 p_from, Vector3 p_dir, Vector3 *p_intersection) const { bool Plane::intersects_ray(const Vector3 &p_from, const Vector3 &p_dir, Vector3 *p_intersection) const {
Vector3 segment = p_dir; Vector3 segment = p_dir;
real_t den = normal.dot(segment); real_t den = normal.dot(segment);
@ -128,7 +128,7 @@ bool Plane::intersects_ray(Vector3 p_from, Vector3 p_dir, Vector3 *p_intersectio
return true; return true;
} }
bool Plane::intersects_segment(Vector3 p_begin, Vector3 p_end, Vector3 *p_intersection) const { bool Plane::intersects_segment(const Vector3 &p_begin, const Vector3 &p_end, Vector3 *p_intersection) const {
Vector3 segment = p_begin - p_end; Vector3 segment = p_begin - p_end;
real_t den = normal.dot(segment); real_t den = normal.dot(segment);

4
core/math/plane.h
View file

@ -56,8 +56,8 @@ public:
/* intersections */ /* intersections */
bool intersect_3(const Plane &p_plane1, const Plane &p_plane2, Vector3 *r_result = 0) const; bool intersect_3(const Plane &p_plane1, const Plane &p_plane2, Vector3 *r_result = 0) const;
bool intersects_ray(Vector3 p_from, Vector3 p_dir, Vector3 *p_intersection) const; bool intersects_ray(const Vector3 &p_from, const Vector3 &p_dir, Vector3 *p_intersection) const;
bool intersects_segment(Vector3 p_begin, Vector3 p_end, Vector3 *p_intersection) const; bool intersects_segment(const Vector3 &p_begin, const Vector3 &p_end, Vector3 *p_intersection) const;
_FORCE_INLINE_ Vector3 project(const Vector3 &p_point) const { _FORCE_INLINE_ Vector3 project(const Vector3 &p_point) const {

57
core/method_ptrcall.h
View file

@ -80,6 +80,26 @@ struct PtrToArg {
} \ } \
} }
#define MAKE_PTRARG_BY_REFERENCE(m_type) \
template <> \
struct PtrToArg<m_type> { \
_FORCE_INLINE_ static m_type convert(const void *p_ptr) { \
return *reinterpret_cast<const m_type *>(p_ptr); \
} \
_FORCE_INLINE_ static void encode(const m_type &p_val, void *p_ptr) { \
*((m_type *)p_ptr) = p_val; \
} \
}; \
template <> \
struct PtrToArg<const m_type &> { \
_FORCE_INLINE_ static m_type convert(const void *p_ptr) { \
return *reinterpret_cast<const m_type *>(p_ptr); \
} \
_FORCE_INLINE_ static void encode(const m_type &p_val, void *p_ptr) { \
*((m_type *)p_ptr) = p_val; \
} \
}
MAKE_PTRARG(bool); MAKE_PTRARG(bool);
MAKE_PTRARGCONV(uint8_t, int64_t); MAKE_PTRARGCONV(uint8_t, int64_t);
MAKE_PTRARGCONV(int8_t, int64_t); MAKE_PTRARGCONV(int8_t, int64_t);
@ -95,14 +115,14 @@ MAKE_PTRARG(double);
MAKE_PTRARG(String); MAKE_PTRARG(String);
MAKE_PTRARG(Vector2); MAKE_PTRARG(Vector2);
MAKE_PTRARG(Rect2); MAKE_PTRARG(Rect2);
MAKE_PTRARG(Vector3); MAKE_PTRARG_BY_REFERENCE(Vector3);
MAKE_PTRARG(Transform2D); MAKE_PTRARG(Transform2D);
MAKE_PTRARG(Plane); MAKE_PTRARG_BY_REFERENCE(Plane);
MAKE_PTRARG(Quat); MAKE_PTRARG(Quat);
MAKE_PTRARG(Rect3); MAKE_PTRARG_BY_REFERENCE(Rect3);
MAKE_PTRARG(Basis); MAKE_PTRARG_BY_REFERENCE(Basis);
MAKE_PTRARG(Transform); MAKE_PTRARG_BY_REFERENCE(Transform);
MAKE_PTRARG(Color); MAKE_PTRARG_BY_REFERENCE(Color);
MAKE_PTRARG(NodePath); MAKE_PTRARG(NodePath);
MAKE_PTRARG(RID); MAKE_PTRARG(RID);
MAKE_PTRARG(Dictionary); MAKE_PTRARG(Dictionary);
@ -114,7 +134,7 @@ MAKE_PTRARG(PoolStringArray);
MAKE_PTRARG(PoolVector2Array); MAKE_PTRARG(PoolVector2Array);
MAKE_PTRARG(PoolVector3Array); MAKE_PTRARG(PoolVector3Array);
MAKE_PTRARG(PoolColorArray); MAKE_PTRARG(PoolColorArray);
MAKE_PTRARG(Variant); MAKE_PTRARG_BY_REFERENCE(Variant);
//this is for Object //this is for Object
@ -311,8 +331,29 @@ MAKE_DVECARR(Plane);
} \ } \
} }
#define MAKE_STRINGCONV_BY_REFERENCE(m_type) \
template <> \
struct PtrToArg<m_type> { \
_FORCE_INLINE_ static m_type convert(const void *p_ptr) { \
m_type s = *reinterpret_cast<const String *>(p_ptr); \
return s; \
} \
_FORCE_INLINE_ static void encode(const m_type &p_vec, void *p_ptr) { \
String *arr = reinterpret_cast<String *>(p_ptr); \
*arr = p_vec; \
} \
}; \
\
template <> \
struct PtrToArg<const m_type &> { \
_FORCE_INLINE_ static m_type convert(const void *p_ptr) { \
m_type s = *reinterpret_cast<const String *>(p_ptr); \
return s; \
} \
}
MAKE_STRINGCONV(StringName); MAKE_STRINGCONV(StringName);
MAKE_STRINGCONV(IP_Address); MAKE_STRINGCONV_BY_REFERENCE(IP_Address);
template <> template <>
struct PtrToArg<PoolVector<Face3> > { struct PtrToArg<PoolVector<Face3> > {

2
core/pair.h
View file

@ -37,7 +37,7 @@ struct Pair {
S second; S second;
Pair() {} Pair() {}
Pair(F p_first, S p_second) Pair(F p_first, const S &p_second)
: first(p_first), : first(p_first),
second(p_second) { second(p_second) {
} }

8
core/vector.h
View file

@ -117,7 +117,7 @@ public:
} }
_FORCE_INLINE_ bool empty() const { return _ptr == 0; } _FORCE_INLINE_ bool empty() const { return _ptr == 0; }
Error resize(int p_size); Error resize(int p_size);
bool push_back(T p_elem); bool push_back(const T &p_elem);
void remove(int p_index); void remove(int p_index);
void erase(const T &p_val) { void erase(const T &p_val) {
@ -129,7 +129,7 @@ public:
template <class T_val> template <class T_val>
int find(const T_val &p_val, int p_from = 0) const; int find(const T_val &p_val, int p_from = 0) const;
void set(int p_index, T p_elem); void set(int p_index, const T &p_elem);
T get(int p_index) const; T get(int p_index) const;
inline T &operator[](int p_index) { inline T &operator[](int p_index) {
@ -336,7 +336,7 @@ void Vector<T>::invert() {
} }
template <class T> template <class T>
void Vector<T>::set(int p_index, T p_elem) { void Vector<T>::set(int p_index, const T &p_elem) {
operator[](p_index) = p_elem; operator[](p_index) = p_elem;
} }
@ -348,7 +348,7 @@ T Vector<T>::get(int p_index) const {
} }
template <class T> template <class T>
bool Vector<T>::push_back(T p_elem) { bool Vector<T>::push_back(const T &p_elem) {
Error err = resize(size() + 1); Error err = resize(size() + 1);
ERR_FAIL_COND_V(err, true) ERR_FAIL_COND_V(err, true)

2
drivers/unix/packet_peer_udp_posix.cpp
View file

@ -127,7 +127,7 @@ int PacketPeerUDPPosix::get_max_packet_size() const {
return 512; // uhm maybe not return 512; // uhm maybe not
} }
Error PacketPeerUDPPosix::listen(int p_port, IP_Address p_bind_address, int p_recv_buffer_size) { Error PacketPeerUDPPosix::listen(int p_port, const IP_Address &p_bind_address, int p_recv_buffer_size) {
ERR_FAIL_COND_V(sockfd != -1, ERR_ALREADY_IN_USE); ERR_FAIL_COND_V(sockfd != -1, ERR_ALREADY_IN_USE);
ERR_FAIL_COND_V(!p_bind_address.is_valid() && !p_bind_address.is_wildcard(), ERR_INVALID_PARAMETER); ERR_FAIL_COND_V(!p_bind_address.is_valid() && !p_bind_address.is_wildcard(), ERR_INVALID_PARAMETER);

2
drivers/unix/packet_peer_udp_posix.h
View file

@ -67,7 +67,7 @@ public:
virtual int get_max_packet_size() const; virtual int get_max_packet_size() const;
virtual Error listen(int p_port, IP_Address p_bind_address = IP_Address("*"), int p_recv_buffer_size = 65536); virtual Error listen(int p_port, const IP_Address &p_bind_address = IP_Address("*"), int p_recv_buffer_size = 65536);
virtual void close(); virtual void close();
virtual Error wait(); virtual Error wait();
virtual bool is_listening() const; virtual bool is_listening() const;

2
drivers/unix/tcp_server_posix.cpp
View file

@ -69,7 +69,7 @@ void TCPServerPosix::make_default() {
TCP_Server::_create = TCPServerPosix::_create; TCP_Server::_create = TCPServerPosix::_create;
}; };
Error TCPServerPosix::listen(uint16_t p_port, const IP_Address p_bind_address) { Error TCPServerPosix::listen(uint16_t p_port, const IP_Address &p_bind_address) {
ERR_FAIL_COND_V(listen_sockfd != -1, ERR_ALREADY_IN_USE); ERR_FAIL_COND_V(listen_sockfd != -1, ERR_ALREADY_IN_USE);
ERR_FAIL_COND_V(!p_bind_address.is_valid() && !p_bind_address.is_wildcard(), ERR_INVALID_PARAMETER); ERR_FAIL_COND_V(!p_bind_address.is_valid() && !p_bind_address.is_wildcard(), ERR_INVALID_PARAMETER);

2
drivers/unix/tcp_server_posix.h
View file

@ -41,7 +41,7 @@ class TCPServerPosix : public TCP_Server {
static TCP_Server *_create(); static TCP_Server *_create();
public: public:
virtual Error listen(uint16_t p_port, IP_Address p_bind_address = IP_Address("*")); virtual Error listen(uint16_t p_port, const IP_Address &p_bind_address = IP_Address("*"));
virtual bool is_connection_available() const; virtual bool is_connection_available() const;
virtual Ref<StreamPeerTCP> take_connection(); virtual Ref<StreamPeerTCP> take_connection();

4
platform/uwp/export/export.cpp
View file

@ -171,7 +171,7 @@ class AppxPackager {
} }
Vector<uint8_t> make_file_header(FileMeta p_file_meta); Vector<uint8_t> make_file_header(FileMeta p_file_meta);
void store_central_dir_header(const FileMeta p_file, bool p_do_hash = true); void store_central_dir_header(const FileMeta &p_file, bool p_do_hash = true);
Vector<uint8_t> make_end_of_central_record(); Vector<uint8_t> make_end_of_central_record();
String content_type(String p_extension); String content_type(String p_extension);
@ -329,7 +329,7 @@ Vector<uint8_t> AppxPackager::make_file_header(FileMeta p_file_meta) {
return buf; return buf;
} }
void AppxPackager::store_central_dir_header(const FileMeta p_file, bool p_do_hash) { void AppxPackager::store_central_dir_header(const FileMeta &p_file, bool p_do_hash) {
Vector<uint8_t> &buf = central_dir_data; Vector<uint8_t> &buf = central_dir_data;
int offs = buf.size(); int offs = buf.size();

2
platform/windows/packet_peer_udp_winsock.cpp
View file

@ -118,7 +118,7 @@ void PacketPeerUDPWinsock::_set_sock_blocking(bool p_blocking) {
}; };
} }
Error PacketPeerUDPWinsock::listen(int p_port, IP_Address p_bind_address, int p_recv_buffer_size) { Error PacketPeerUDPWinsock::listen(int p_port, const IP_Address &p_bind_address, int p_recv_buffer_size) {
ERR_FAIL_COND_V(sockfd != -1, ERR_ALREADY_IN_USE); ERR_FAIL_COND_V(sockfd != -1, ERR_ALREADY_IN_USE);
ERR_FAIL_COND_V(!p_bind_address.is_valid() && !p_bind_address.is_wildcard(), ERR_INVALID_PARAMETER); ERR_FAIL_COND_V(!p_bind_address.is_valid() && !p_bind_address.is_wildcard(), ERR_INVALID_PARAMETER);

2
platform/windows/packet_peer_udp_winsock.h
View file

@ -67,7 +67,7 @@ public:
virtual int get_max_packet_size() const; virtual int get_max_packet_size() const;
virtual Error listen(int p_port, IP_Address p_bind_address = IP_Address("*"), int p_recv_buffer_size = 65536); virtual Error listen(int p_port, const IP_Address &p_bind_address = IP_Address("*"), int p_recv_buffer_size = 65536);
virtual void close(); virtual void close();
virtual Error wait(); virtual Error wait();
virtual bool is_listening() const; virtual bool is_listening() const;

2
platform/windows/tcp_server_winsock.cpp
View file

@ -63,7 +63,7 @@ void TCPServerWinsock::cleanup() {
}; };
}; };
Error TCPServerWinsock::listen(uint16_t p_port, const IP_Address p_bind_address) { Error TCPServerWinsock::listen(uint16_t p_port, const IP_Address &p_bind_address) {
ERR_FAIL_COND_V(listen_sockfd != -1, ERR_ALREADY_IN_USE); ERR_FAIL_COND_V(listen_sockfd != -1, ERR_ALREADY_IN_USE);
ERR_FAIL_COND_V(!p_bind_address.is_valid() && !p_bind_address.is_wildcard(), ERR_INVALID_PARAMETER); ERR_FAIL_COND_V(!p_bind_address.is_valid() && !p_bind_address.is_wildcard(), ERR_INVALID_PARAMETER);

2
platform/windows/tcp_server_winsock.h
View file

@ -40,7 +40,7 @@ class TCPServerWinsock : public TCP_Server {
static TCP_Server *_create(); static TCP_Server *_create();
public: public:
virtual Error listen(uint16_t p_port, const IP_Address p_bind_address = IP_Address("*")); virtual Error listen(uint16_t p_port, const IP_Address &p_bind_address = IP_Address("*"));
virtual bool is_connection_available() const; virtual bool is_connection_available() const;
virtual Ref<StreamPeerTCP> take_connection(); virtual Ref<StreamPeerTCP> take_connection();