BlueGit

timfa frameworkv3

force array tags/types

timfa Tim · pushed by timfa

Authored 2024-04-21 · 2 years ago

Hash
4f118e895af16392a19361f399831f020dbae13f
Parent
2c78a6ec
1 file changed +6 −2
framework/util/quadTree.js +6 −2
@@ -99,6 +99,8 @@ class QuadTree
99 99
100 100 let nodes = [];
101 101
102 types = Array.isArray(types) ? types : [types];
103
102 104 nodes.push(this.root);
103 105
104 106 while (nodes.length > 0)
@@ -135,6 +137,8 @@ class QuadTree
135 137
136 138 let nodes = [];
137 139
140 tags = Array.isArray(tags) ? tags : [tags];
141
138 142 nodes.push(this.root);
139 143
140 144 while (nodes.length > 0)
@@ -148,9 +152,9 @@ class QuadTree
148 152 let filtered = node.getObjects()
149 153 .filter(obj => obj.transform.position.distanceTo(position) < range && obj.transform.position.distanceTo(position) > 0);
150 154
151 if (types != null)
155 if (tags != null)
152 156 {
153 filtered = filtered.filter(obj => types.some(t => obj.tags.some(tag => tag == t)));
157 filtered = filtered.filter(obj => tags.some(t => obj.tags.some(tag => tag == t)));
154 158 }
155 159
156 160 result.push(...filtered);
@@ -99,6 +99,8 @@ class QuadTree
99
99
100 let nodes = [];
100 let nodes = [];
101
101
102 types = Array.isArray(types) ? types : [types];
103
102 nodes.push(this.root);
104 nodes.push(this.root);
103
105
104 while (nodes.length > 0)
106 while (nodes.length > 0)
@@ -135,6 +137,8 @@ class QuadTree
135
137
136 let nodes = [];
138 let nodes = [];
137
139
140 tags = Array.isArray(tags) ? tags : [tags];
141
138 nodes.push(this.root);
142 nodes.push(this.root);
139
143
140 while (nodes.length > 0)
144 while (nodes.length > 0)
@@ -148,9 +152,9 @@ class QuadTree
148 let filtered = node.getObjects()
152 let filtered = node.getObjects()
149 .filter(obj => obj.transform.position.distanceTo(position) < range && obj.transform.position.distanceTo(position) > 0);
153 .filter(obj => obj.transform.position.distanceTo(position) < range && obj.transform.position.distanceTo(position) > 0);
150
154
151 if (types != null)
155 if (tags != null)
152 {
156 {
153 filtered = filtered.filter(obj => types.some(t => obj.tags.some(tag => tag == t)));
157 filtered = filtered.filter(obj => tags.some(t => obj.tags.some(tag => tag == t)));
154 }
158 }
155
159
156 result.push(...filtered);
160 result.push(...filtered);