Skip to content

Commit 176440d

Browse files
committed
Merge branch 'develop'
2 parents 6d8b4f4 + e0669f4 commit 176440d

File tree

6 files changed

+22
-19
lines changed

6 files changed

+22
-19
lines changed

.github/workflows/build-windows.yml

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,12 @@ jobs:
1919
matrix:
2020
# Github Actions requires a single row to be added to the build matrix.
2121
# See https://help.github.com/en/articles/workflow-syntax-for-github-actions.
22-
name: [
23-
windows-2019,
24-
]
22+
name: [windows-latest]
2523

26-
build_type: [
27-
Release
28-
]
24+
build_type: [Release]
2925
include:
30-
- name: windows-2019
31-
os: windows-2019
26+
- name: windows-latest
27+
os: windows-latest
3228
compiler: cl
3329
platform: 64
3430

appveyor.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# version format
2-
version: 2.14.10-{branch}-build{build}
2+
version: 2.14.12-{branch}-build{build}
33

44
os: Visual Studio 2019
55

doc/source/doxygen-docs/changelog.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
\page changelog Change Log
22

3+
# Version 2.14.12: Released Aug 31rd, 2025
4+
- Changes in libraries:
5+
- \ref mrpt_opengl_grp
6+
- New method mrpt::opengl::CPointCloudColoured::setAllPointsAlpha().
7+
38
# Version 2.14.11: Released May 31rd, 2025
49
- BUG FIXES:
510
- Fix build against all tf2 versions in all active ROS 2 distributions.

libs/opengl/include/mrpt/opengl/CPointCloud.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,6 @@ namespace mrpt::opengl
2323
*
2424
* To load from a points-map, CPointCloud::loadFromPointsMap().
2525
*
26-
* This class uses smart optimizations while rendering to efficiently draw
27-
* clouds of millions of points, using octrees.
28-
*
2926
* ![mrpt::opengl::CPointCloud](preview_CPointCloud.png)
3027
*
3128
* \sa opengl::CPlanarLaserScan, opengl::Scene,

libs/opengl/include/mrpt/opengl/CPointCloudColoured.h

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,10 @@
1717

1818
namespace mrpt::opengl
1919
{
20-
/** A cloud of points, each one with an individual colour (R,G,B). The alpha
21-
* component is shared by all the points and is stored in the base member
22-
* m_color_A.
20+
/** A cloud of points, each one with an individual color (R,G,B,A).
2321
*
2422
* To load from a points-map, CPointCloudColoured::loadFromPointsMap().
2523
*
26-
* This class uses smart optimizations while rendering to efficiently draw
27-
* clouds of millions of points, using octrees.
28-
*
2924
* ![mrpt::opengl::CPointCloudColoured](preview_CPointCloudColoured.png)
3025
*
3126
* \sa opengl::Scene, opengl::CPointCloud
@@ -143,6 +138,16 @@ class CPointCloudColoured :
143138
m_point_colors[index].B = b;
144139
m_point_colors[index].A = a;
145140
}
141+
/** Overwrites the alpha (transparency) channel for all existing points */
142+
void setAllPointsAlpha(uint8_t alpha_channel)
143+
{
144+
std::unique_lock<std::shared_mutex> wfWriteLock(CRenderizableShaderPoints::m_pointsMtx.data);
145+
for (auto& pt : m_point_colors)
146+
{
147+
pt.A = alpha_channel;
148+
}
149+
markAllPointsAsNew();
150+
}
146151
/** Like \c getPointColor but without checking for out-of-index errors */
147152
void getPointColor_fast(size_t index, float& R, float& G, float& B) const
148153
{

version_prefix.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
2.14.11
1+
2.14.12
22
# IMPORTANT: This file is parsed by CMake, don't add any comment to
33
# the first line.
44
# This file is used in both Windows and Linux scripts to automatically

0 commit comments

Comments
 (0)