Skip to content

Commit 33b605a

Browse files
authored
anti-frontiers from ROS1 (#78)
* anti-frontiers from ROS1 * Version bump
1 parent bbd6152 commit 33b605a

File tree

6 files changed

+13
-3
lines changed

6 files changed

+13
-3
lines changed

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
cmake_minimum_required(VERSION 3.22)
2-
project(spark_dsg VERSION 1.1.2)
2+
project(spark_dsg VERSION 1.1.3)
33

44
set(CMAKE_CXX_STANDARD 20)
55
set(CMAKE_CXX_STANDARD_REQUIRED ON)

include/spark_dsg/node_attributes.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -292,6 +292,7 @@ struct PlaceNodeAttributes : public SemanticNodeAttributes {
292292
bool real_place = true;
293293
bool need_cleanup = false;
294294
bool active_frontier = false;
295+
bool anti_frontier = false;
295296
Eigen::Vector3d frontier_scale;
296297
Eigen::Quaterniond orientation;
297298
size_t num_frontier_voxels = 0;

package.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0"?>
22
<package format="2">
33
<name>spark_dsg</name>
4-
<version>1.1.2</version>
4+
<version>1.1.3</version>
55
<description>Dynamic Scene Graph (DSG) type definitions and core library code</description>
66

77
<author email="na26933@mit.edu">Nathan Hughes</author>

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ build-backend = "scikit_build_core.build"
44

55
[project]
66
name = "spark_dsg"
7-
version = "1.1.2"
7+
version = "1.1.3"
88
description = "Library for representing 3D scene graphs"
99
readme = "README.md"
1010
license = "BSD-3-Clause"

python/bindings/src/attributes.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -160,6 +160,7 @@ void init_attributes(py::module_& m) {
160160
.def_readwrite("deformation_connections", &PlaceNodeAttributes::deformation_connections)
161161
.def_readwrite("real_place", &PlaceNodeAttributes::real_place)
162162
.def_readwrite("active_frontier", &PlaceNodeAttributes::active_frontier)
163+
.def_readwrite("anti_frontier", &PlaceNodeAttributes::anti_frontier)
163164
.def_readwrite("frontier_scale", &PlaceNodeAttributes::frontier_scale)
164165
.def_property(
165166
"orientation",

src/node_attributes.cpp

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -328,6 +328,7 @@ std::ostream& PlaceNodeAttributes::fill_ostream(std::ostream& out) const {
328328
out << std::boolalpha << "\n - real place: " << real_place;
329329
out << std::boolalpha << "\n - need cleanup: " << need_cleanup;
330330
out << std::boolalpha << "\n - active frontier: " << active_frontier;
331+
out << std::boolalpha << "\n - anti frontier: " << active_frontier;
331332
out << "\n - num frontier voxels: " << num_frontier_voxels;
332333
return out;
333334
}
@@ -346,6 +347,12 @@ void PlaceNodeAttributes::serialization_info() {
346347
serialization::field("orientation", orientation);
347348
serialization::field("need_cleanup", need_cleanup);
348349
serialization::field("num_frontier_voxels", num_frontier_voxels);
350+
const auto& header = io::GlobalInfo::loadedHeader();
351+
if (header.version < io::Version(1, 1, 3)) {
352+
io::warnOutdatedHeader(header);
353+
} else {
354+
serialization::field("anti_frontier", anti_frontier);
355+
}
349356
}
350357

351358
bool PlaceNodeAttributes::is_equal(const NodeAttributes& other) const {
@@ -366,6 +373,7 @@ bool PlaceNodeAttributes::is_equal(const NodeAttributes& other) const {
366373
deformation_connections == derived->deformation_connections &&
367374
real_place == derived->real_place &&
368375
active_frontier == derived->active_frontier &&
376+
anti_frontier == derived->anti_frontier &&
369377
frontier_scale == derived->frontier_scale &&
370378
quaternionsEqual(orientation, derived->orientation) &&
371379
need_cleanup == derived->need_cleanup &&

0 commit comments

Comments
 (0)