Stowage/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-12-08 06:09:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

Replace most uses of Map by HashMap

Browse source 
* Map is unnecessary and inefficient in almost every case.
* Replaced by the new HashMap.
* Renamed Map to RBMap and Set to RBSet for cases that still make sense
  (order matters) but use is discouraged.

There were very few cases where replacing by HashMap was undesired because
keeping the key order was intended.
I tried to keep those (as RBMap) as much as possible, but might have missed
some. Review appreciated!
This commit is contained in:
reduz 2022-05-13 15:04:37 +02:00 • committed by Rémi Verschelde
parent 396def9b66
commit 746dddc067
587 changed files with 3707 additions and 3538 deletions
Download patch file Download diff file Expand all files Collapse all files

17
thirdparty/enet/godot.cpp vendored
View file

@ -259,7 +259,7 @@ public:
class ENetDTLSServer : public ENetGodotSocket {
Ref<DTLSServer> server;
Ref<UDPServer> udp_server;
Map<String, Ref<PacketPeerDTLS>> peers;
HashMap<String, Ref<PacketPeerDTLS>> peers;
int last_service = 0;
IPAddress local_address;
@ -331,15 +331,16 @@ public:
List<String> remove;
Error err = ERR_BUSY;
// TODO this needs to be fair!
for (Map<String, Ref<PacketPeerDTLS>>::Element *E = peers.front(); E; E = E->next()) {
Ref<PacketPeerDTLS> peer = E->get();
for (KeyValue<String, Ref<PacketPeerDTLS>> & E : peers) {
Ref<PacketPeerDTLS> peer = E.value;
peer->poll();
if (peer->get_status() == PacketPeerDTLS::STATUS_HANDSHAKING) {
continue;
} else if (peer->get_status() != PacketPeerDTLS::STATUS_CONNECTED) {
// Peer disconnected, removing it.
remove.push_back(E->key());
remove.push_back(E.key);
continue;
}
@ -348,12 +349,12 @@ public:
err = peer->get_packet(&buffer, r_read);
if (err != OK || p_len < r_read) {
// Something wrong with this peer, removing it.
remove.push_back(E->key());
remove.push_back(E.key);
err = FAILED;
continue;
}
Vector<String> s = E->key().rsplit(":", false, 1);
Vector<String> s = E.key.rsplit(":", false, 1);
ERR_CONTINUE(s.size() != 2); // BUG!
memcpy(p_buffer, buffer, r_read);
@ -376,8 +377,8 @@ public:
}
void close() {
for (Map<String, Ref<PacketPeerDTLS>>::Element *E = peers.front(); E; E = E->next()) {
E->get()->disconnect_from_peer();
for (KeyValue<String, Ref<PacketPeerDTLS>> &E : peers) {
E.value->disconnect_from_peer();
}
peers.clear();
udp_server->stop();

12
thirdparty/misc/polypartition.cpp vendored
View file

@ -1357,12 +1357,12 @@ int TPPLPartition::MonotonePartition(TPPLPolyList *inpolys, TPPLPolyList *monoto
// Note that while set doesn't actually have to be implemented as
// a tree, complexity requirements for operations are the same as
// for the balanced binary search tree.
Set<ScanLineEdge> edgeTree;
RBSet<ScanLineEdge> edgeTree;
// Store iterators to the edge tree elements.
// This makes deleting existing edges much faster.
Set<ScanLineEdge>::Element **edgeTreeIterators, *edgeIter;
edgeTreeIterators = new Set<ScanLineEdge>::Element *[maxnumvertices];
//Pair<Set<ScanLineEdge>::iterator, bool> edgeTreeRet;
RBSet<ScanLineEdge>::Element **edgeTreeIterators, *edgeIter;
edgeTreeIterators = new RBSet<ScanLineEdge>::Element *[maxnumvertices];
//Pair<RBSet<ScanLineEdge>::iterator, bool> edgeTreeRet;
for (i = 0; i < numvertices; i++) {
edgeTreeIterators[i] = nullptr;
}
@ -1569,8 +1569,8 @@ int TPPLPartition::MonotonePartition(TPPLPolyList *inpolys, TPPLPolyList *monoto
// Adds a diagonal to the doubly-connected list of vertices.
void TPPLPartition::AddDiagonal(MonotoneVertex *vertices, long *numvertices, long index1, long index2,
TPPLVertexType *vertextypes, Set<ScanLineEdge>::Element **edgeTreeIterators,
Set<ScanLineEdge> *edgeTree, long *helpers) {
TPPLVertexType *vertextypes, RBSet<ScanLineEdge>::Element **edgeTreeIterators,
RBSet<ScanLineEdge> *edgeTree, long *helpers) {
long newindex1, newindex2;
newindex1 = *numvertices;

6
thirdparty/misc/polypartition.h vendored
View file

@ -26,7 +26,7 @@
#include "core/math/vector2.h"
#include "core/templates/list.h"
#include "core/templates/set.h"
#include "core/templates/rb_set.h"
typedef double tppl_float;
@ -224,8 +224,8 @@ public:
// Helper functions for MonotonePartition.
bool Below(TPPLPoint &p1, TPPLPoint &p2);
void AddDiagonal(MonotoneVertex *vertices, long *numvertices, long index1, long index2,
TPPLVertexType *vertextypes, Set<ScanLineEdge>::Element **edgeTreeIterators,
Set<ScanLineEdge> *edgeTree, long *helpers);
TPPLVertexType *vertextypes, RBSet<ScanLineEdge>::Element **edgeTreeIterators,
RBSet<ScanLineEdge> *edgeTree, long *helpers);
// Triangulates a monotone polygon, used in Triangulate_MONO.
int TriangulateMonotone(TPPLPoly *inPoly, TPPLPolyList *triangles);