This commit is contained in:
Jan Möbius
2019-05-29 08:49:18 +02:00
parent 669b1b789e
commit 8a178e16ac
2 changed files with 7 additions and 7 deletions

View File

@@ -256,15 +256,15 @@ protected:
protected: // helper protected: // helper
// get current generation from state // get current generation from state
state_t generation(state_t _s) { return _s-(_s % n_rules()); } state_t generation(state_t _s) const { return _s-(_s % n_rules()); }
state_t generation( VH _vh ) { return generation(mesh_.data(_vh).state()); } state_t generation( VH _vh ) const { return generation(mesh_.data(_vh).state()); }
state_t generation( EH _eh ) { return generation(mesh_.data(_eh).state()); } state_t generation( EH _eh ) const { return generation(mesh_.data(_eh).state()); }
state_t generation( FH _fh ) { return generation(mesh_.data(_fh).state()); } state_t generation( FH _fh ) const { return generation(mesh_.data(_fh).state()); }
private: private:
// short cuts // short cuts
Rule* t_rule() { return subdiv_rule_; } Rule* t_rule() const { return subdiv_rule_; }
Rule* f_rule() { return rule_sequence_.front(); } Rule* f_rule() { return rule_sequence_.front(); }
Rule* l_rule() { return rule_sequence_.back(); } Rule* l_rule() { return rule_sequence_.back(); }

View File

@@ -358,12 +358,12 @@ protected:
Self* prev_rule() { return prev_rule_; } Self* prev_rule() { return prev_rule_; }
void set_subdiv_rule(Self*& _n) { subdiv_rule_ = _n; } void set_subdiv_rule(Self*& _n) { subdiv_rule_ = _n; }
Self* subdiv_rule() { return subdiv_rule_; } Self* subdiv_rule() const { return subdiv_rule_; }
void set_number(int _n) { number_ = _n; } void set_number(int _n) { number_ = _n; }
void set_n_rules(int _n) { n_rules_ = _n; } void set_n_rules(int _n) { n_rules_ = _n; }
int n_rules() { return n_rules_; } int n_rules() const { return n_rules_; }
void set_subdiv_type(int _n) void set_subdiv_type(int _n)
{ assert(_n == 3 || _n == 4); subdiv_type_ = _n; } { assert(_n == 3 || _n == 4); subdiv_type_ = _n; }