"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "src/3d/symbols/qgspoint3dsymbol_p.cpp" between
QGIS-final-3_14_15.tar.gz and QGIS-final-3_14_16.tar.gz

About: QGIS (Quantum GIS) is a Geographic Information System that supports vector, raster, and database formats. Latest release (3.14.x series).

qgspoint3dsymbol_p.cpp  (QGIS-final-3_14_15):qgspoint3dsymbol_p.cpp  (QGIS-final-3_14_16)
skipping to change at line 86 skipping to change at line 86
//! temporary data we will pass to the tessellator //! temporary data we will pass to the tessellator
struct PointData struct PointData
{ {
QVector<QVector3D> positions; // contains triplets of float x,y,z for eac h point QVector<QVector3D> positions; // contains triplets of float x,y,z for eac h point
}; };
void makeEntity( Qt3DCore::QEntity *parent, const Qgs3DRenderContext &contex t, PointData &out, bool selected ); void makeEntity( Qt3DCore::QEntity *parent, const Qgs3DRenderContext &contex t, PointData &out, bool selected );
// input specific for this class // input specific for this class
const QgsPoint3DSymbol &mSymbol; QgsPoint3DSymbol mSymbol;
// inputs - generic // inputs - generic
QgsFeatureIds mSelectedIds; QgsFeatureIds mSelectedIds;
// outputs // outputs
PointData outNormal; //!< Features that are not selected PointData outNormal; //!< Features that are not selected
PointData outSelected; //!< Features that are selected PointData outSelected; //!< Features that are selected
}; };
bool QgsInstancedPoint3DSymbolHandler::prepare( const Qgs3DRenderContext &contex t, QSet<QString> &attributeNames ) bool QgsInstancedPoint3DSymbolHandler::prepare( const Qgs3DRenderContext &contex t, QSet<QString> &attributeNames )
{ {
skipping to change at line 370 skipping to change at line 370
//! temporary data we will pass to the tessellator //! temporary data we will pass to the tessellator
struct PointData struct PointData
{ {
QVector<QVector3D> positions; // contains triplets of float x,y,z for eac h point QVector<QVector3D> positions; // contains triplets of float x,y,z for eac h point
}; };
void makeEntity( Qt3DCore::QEntity *parent, const Qgs3DRenderContext &contex t, PointData &out, bool selected ); void makeEntity( Qt3DCore::QEntity *parent, const Qgs3DRenderContext &contex t, PointData &out, bool selected );
// input specific for this class // input specific for this class
const QgsPoint3DSymbol &mSymbol; QgsPoint3DSymbol mSymbol;
// inputs - generic // inputs - generic
QgsFeatureIds mSelectedIds; QgsFeatureIds mSelectedIds;
// outputs // outputs
PointData outNormal; //!< Features that are not selected PointData outNormal; //!< Features that are not selected
PointData outSelected; //!< Features that are selected PointData outSelected; //!< Features that are selected
}; };
bool QgsModelPoint3DSymbolHandler::prepare( const Qgs3DRenderContext &context, Q Set<QString> &attributeNames ) bool QgsModelPoint3DSymbolHandler::prepare( const Qgs3DRenderContext &context, Q Set<QString> &attributeNames )
{ {
skipping to change at line 452 skipping to change at line 452
entity->addComponent( transform( position, symbol ) ); entity->addComponent( transform( position, symbol ) );
entity->setParent( parent ); entity->setParent( parent );
// cppcheck wrongly believes entity will leak // cppcheck wrongly believes entity will leak
// cppcheck-suppress memleak // cppcheck-suppress memleak
} }
} }
void QgsModelPoint3DSymbolHandler::addMeshEntities( const Qgs3DMapSettings &map, const QVector<QVector3D> &positions, const QgsPoint3DSymbol &symbol, Qt3DCore:: QEntity *parent, bool are_selected ) void QgsModelPoint3DSymbolHandler::addMeshEntities( const Qgs3DMapSettings &map, const QVector<QVector3D> &positions, const QgsPoint3DSymbol &symbol, Qt3DCore:: QEntity *parent, bool are_selected )
{ {
if ( positions.empty() )
return;
// build the default material // build the default material
Qt3DExtras::QPhongMaterial *mat = Qgs3DUtils::phongMaterial( symbol.material() ); Qt3DExtras::QPhongMaterial *mat = Qgs3DUtils::phongMaterial( symbol.material() );
if ( are_selected ) if ( are_selected )
{ {
mat->setDiffuse( map.selectionColor() ); mat->setDiffuse( map.selectionColor() );
mat->setAmbient( map.selectionColor().darker() ); mat->setAmbient( map.selectionColor().darker() );
} }
// get nodes // get nodes
skipping to change at line 514 skipping to change at line 517
//! temporary data we will pass to the tessellator //! temporary data we will pass to the tessellator
struct PointData struct PointData
{ {
QVector<QVector3D> positions; // contains triplets of float x,y,z for eac h point QVector<QVector3D> positions; // contains triplets of float x,y,z for eac h point
}; };
void makeEntity( Qt3DCore::QEntity *parent, const Qgs3DRenderContext &contex t, PointData &out, bool selected ); void makeEntity( Qt3DCore::QEntity *parent, const Qgs3DRenderContext &contex t, PointData &out, bool selected );
// input specific for this class // input specific for this class
const QgsPoint3DSymbol &mSymbol; QgsPoint3DSymbol mSymbol;
// inputs - generic // inputs - generic
QgsFeatureIds mSelectedIds; QgsFeatureIds mSelectedIds;
// outputs // outputs
PointData outNormal; //!< Features that are not selected PointData outNormal; //!< Features that are not selected
PointData outSelected; //!< Features that are selected PointData outSelected; //!< Features that are selected
}; };
bool QgsPoint3DBillboardSymbolHandler::prepare( const Qgs3DRenderContext &contex t, QSet<QString> &attributeNames ) bool QgsPoint3DBillboardSymbolHandler::prepare( const Qgs3DRenderContext &contex t, QSet<QString> &attributeNames )
{ {
 End of changes. 4 change blocks. 
3 lines changed or deleted 6 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)