Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
dde0315
[algorithm] Remove projection operation on tip in the InsertionAlgori…
th-skam Sep 18, 2025
9b6039c
Merge branch 'master' into improve-projective
epernod Sep 22, 2025
71782d1
[algorithm] Changed FindClosestProximityAlgorithm to find the closest…
th-skam Sep 4, 2025
69ded04
[algorithm] Auto-format code
th-skam Sep 18, 2025
38608bb
[algorithm] Rewrite some comments
th-skam Sep 18, 2025
7241d39
[algorithm] Place shared operations at the top
th-skam Sep 18, 2025
adf8d79
[algorithm] Add a bool to enable/disable the puncture sequence
th-skam Sep 18, 2025
62b077a
[algorithm] Add a bool to enable/disable insertion sequence
th-skam Sep 18, 2025
4400991
[algorithm] Add a bool to enable/disable shaft collision sequence
th-skam Sep 18, 2025
ec35524
[algorithm] auto format code
th-skam Sep 18, 2025
91ad07d
[algorithm] Absorb the FindClosestProximity for shaft collision
th-skam Sep 18, 2025
f57b898
[algorithm] Add an experimental component in the algorithm
th-skam Sep 23, 2025
181dc54
[algorithm] Remove FindClosestProximityAlgorithm
th-skam Sep 23, 2025
6a25270
[cmake] Remove FindClosestProximityAlgorithm from CMakeLists
th-skam Sep 23, 2025
7e138a6
[algorithm] Make sanity checks happen only when appropriate for some …
th-skam Sep 23, 2025
c221011
[algorithm] Place geometry checks in InsertionAlgorithm when they mak…
th-skam Sep 23, 2025
5541b80
Merge branch 'master' into rework-proxAlgo
th-skam Sep 24, 2025
0cadd27
Merge branch 'master' into rework-proxAlgo from *_API macro mechanism…
th-skam Sep 24, 2025
5a33a5c
[timer] Add the name of the AABBBroadPhase component during profiling
th-skam Sep 17, 2025
1f78f08
[timer] Add a timer to the doDetection function
th-skam Sep 17, 2025
9442d61
[timer] Add a timer inside the doUpdate broadphase function
th-skam Sep 19, 2025
193b847
[timer] Add advanced timers in the InsertionAlgorithm
th-skam Sep 17, 2025
0072225
[algorithm] Modify loop to suppress warning
th-skam Sep 19, 2025
dd3c4f2
[algorithm] Move function definitions in source file
th-skam Sep 24, 2025
82a129b
[src] Explicitly define default copy/move construtors/operators in De…
th-skam Sep 24, 2025
0b90a1d
[algorithm] Move puncture phase code in dedicated method
th-skam Sep 24, 2025
a438b01
[algorithm] Moved shaft collision code to dedicated function
th-skam Sep 24, 2025
dd81a05
[src] Overload add function with DetectionOutput signature to shorten…
th-skam Sep 24, 2025
3c9cd8a
[algorithm] Moved insertion code to separate functions
th-skam Sep 24, 2025
190f21a
[algorithm] Leave some space in code lines
th-skam Sep 24, 2025
03ab753
[cmake] Fix ommission
th-skam Sep 24, 2025
d97a2d0
[algorithm] Remove duplicated code for coupling point pruning - merge…
th-skam Sep 25, 2025
64a490f
Merge branch 'master' into split-phases
th-skam Sep 26, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions src/CollisionAlgorithm/DataDetectionOutput.h
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,17 @@ class DetectionOutput {
public:
typedef std::pair<typename FIRST::SPtr,typename SECOND::SPtr> PairDetection;

DetectionOutput() = default;
~DetectionOutput() = default;

// Copy
DetectionOutput(const DetectionOutput&) = default;
DetectionOutput& operator=(const DetectionOutput&) = default;

// Move
DetectionOutput(DetectionOutput&&) noexcept = default;
DetectionOutput& operator=(DetectionOutput&&) noexcept = default;

friend std::ostream& operator<<(std::ostream& os, const DetectionOutput& t) {
os << t.m_output.size() << ":" ;
for (unsigned i=0;i<t.m_output.size();i++) {
Expand Down Expand Up @@ -47,6 +58,11 @@ class DetectionOutput {
m_output.push_back(PairDetection(p1,p2));
}

inline void add(const DetectionOutput& addition) {
for (auto& it : addition)
this->add(it.first, it.second);
}

inline const PairDetection & operator[](int i) const {
return m_output[i];
}
Expand Down
Loading
Loading