This commit is contained in:
Jan Möbius
2019-05-28 14:22:36 +02:00
parent f468efacd0
commit 8cffe1c3b9
8 changed files with 11 additions and 11 deletions

View File

@@ -144,7 +144,7 @@ public:
public: // inherited public: // inherited
bool open_mesh(const char* _filename, OpenMesh::IO::Options _opt) bool open_mesh(const char* _filename, OpenMesh::IO::Options _opt) override
{ {
bool rc; bool rc;
@@ -170,7 +170,7 @@ protected slots:
protected: protected:
virtual void keyPressEvent(QKeyEvent* _event); virtual void keyPressEvent(QKeyEvent* _event) override;
private: private:

View File

@@ -94,7 +94,7 @@ public:
public: public:
/// default constructor /// default constructor
ProgViewerWidget(QWidget* _parent=0) explicit ProgViewerWidget(QWidget* _parent=0)
: MeshViewerWidget(_parent), : MeshViewerWidget(_parent),
n_base_vertices_(0), n_base_vertices_(0),
n_base_faces_(0), n_base_faces_(0),

View File

@@ -117,7 +117,7 @@ public:
protected: protected:
/// inherited drawing method /// inherited drawing method
virtual void draw_scene(const std::string& _draw_mode); virtual void draw_scene(const std::string& _draw_mode) override;
protected: protected:
@@ -171,7 +171,7 @@ protected: // Strip support
protected: // inherited protected: // inherited
virtual void keyPressEvent( QKeyEvent* _event); virtual void keyPressEvent( QKeyEvent* _event) override;
protected: protected:

View File

@@ -105,7 +105,7 @@ private:
{ {
public: public:
Material() { cleanup(); } Material():Tr_(0),index_Kd_(0) { cleanup(); }
void cleanup() void cleanup()
{ {
@@ -137,7 +137,7 @@ private:
void set_Tr( float t ) void set_Tr( float t )
{ Tr_=t; Tr_is_set_=true; } { Tr_=t; Tr_is_set_=true; }
void set_map_Kd( std::string _name, int _index_Kd ) void set_map_Kd( const std::string& _name, int _index_Kd )
{ map_Kd_ = _name, index_Kd_ = _index_Kd; map_Kd_is_set_ = true; }; { map_Kd_ = _name, index_Kd_ = _index_Kd; map_Kd_is_set_ = true; };
const Vec3f& Kd( void ) const { return Kd_; } const Vec3f& Kd( void ) const { return Kd_; }

View File

@@ -79,7 +79,7 @@ private:
public: public:
JacobiLaplaceSmootherT( Mesh& _mesh ) : LaplaceSmootherT<Mesh>(_mesh) {} explicit JacobiLaplaceSmootherT( Mesh& _mesh ) : LaplaceSmootherT<Mesh>(_mesh) {}
// override: alloc umbrellas // override: alloc umbrellas
void smooth(unsigned int _n); void smooth(unsigned int _n);

View File

@@ -83,7 +83,7 @@ public:
typedef typename SmootherT<Mesh>::EdgeHandle EdgeHandle; typedef typename SmootherT<Mesh>::EdgeHandle EdgeHandle;
LaplaceSmootherT( Mesh& _mesh ); explicit LaplaceSmootherT( Mesh& _mesh );
virtual ~LaplaceSmootherT(); virtual ~LaplaceSmootherT();

View File

@@ -146,7 +146,7 @@ public:
public: public:
/// Constructor /// Constructor
CompositeT(Mesh& _mesh) explicit CompositeT(Mesh& _mesh)
: subdiv_type_(0), : subdiv_type_(0),
subdiv_rule_(NULL), /*first_rule_(NULL), last_rule_(NULL),*/ mesh_(_mesh) subdiv_rule_(NULL), /*first_rule_(NULL), last_rule_(NULL),*/ mesh_(_mesh)
{ } { }

View File

@@ -118,7 +118,7 @@ public:
protected: protected:
/// Default constructor /// Default constructor
RuleInterfaceT(Mesh& _mesh) : mesh_(_mesh) {}; RuleInterfaceT(Mesh& _mesh) : mesh_(_mesh),prev_rule_(nullptr),subdiv_rule_(nullptr),subdiv_type_(0),number_(0),n_rules_(0) {};
public: public: