Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Scale BaseAxis properly #88

Merged
merged 12 commits into from
May 29, 2020
Merged

Scale BaseAxis properly #88

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
bc80023
add ogre2 arrow and axis visual
iche033 May 20, 2020
2a7c554
changelog and remove unused code
iche033 May 20, 2020
ff5d5dd
changelog
iche033 May 20, 2020
bb91a44
Scale BaseAxis properly
ahcorde May 22, 2020
d31da36
Merge remote-tracking branch 'origin/ogre2_arrow_axis' into ahcorde/f…
ahcorde May 25, 2020
2047255
Overwrite only SetLocalScale math::Vector3d in BaseAxisVisual and rem…
ahcorde May 25, 2020
71f4e44
changelog
iche033 May 26, 2020
a03c5c7
Merge branch 'master' into ahcorde/fix/scale_baseaxis
ahcorde May 27, 2020
3e76ab6
Merge branch 'ahcorde/fix/scale_baseaxis' of https://github.com/ignit…
ahcorde May 28, 2020
605242c
Fixed UNIT_VisualAxis_TEST
ahcorde May 28, 2020
27a228b
Fixed linters
ahcorde May 28, 2020
ca745c9
Remove compiler warning in BaseAxisVisual
ahcorde May 28, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 42 additions & 3 deletions include/ignition/rendering/base/BaseAxisVisual.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,18 @@ namespace ignition
public: virtual ~BaseAxisVisual();

public: virtual void Init();

public: virtual void SetLocalScale(double _x, double _y, double _z) override;

public: virtual void SetLocalScale(double _scale) override;

public: virtual void SetLocalScale(const math::Vector3d &_scale) override;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think you should be able to just override this version with math::Vector3d arg. The other two just calls this function so can be removed.


private: ArrowVisualPtr xArrow;

private: ArrowVisualPtr yArrow;

private: ArrowVisualPtr zArrow;
};

//////////////////////////////////////////////////
Expand All @@ -51,25 +63,52 @@ namespace ignition
{
}

//////////////////////////////////////////////////
template <class T>
void BaseAxisVisual<T>::SetLocalScale(double _x, double _y, double _z)
{
xArrow->SetLocalScale(_x, _y, _z);
yArrow->SetLocalScale(_x, _y, _z);
zArrow->SetLocalScale(_x, _y, _z);
}

//////////////////////////////////////////////////
template <class T>
void BaseAxisVisual<T>::SetLocalScale(double _scale)
{
xArrow->SetLocalScale(_scale, _scale, _scale);
yArrow->SetLocalScale(_scale, _scale, _scale);
zArrow->SetLocalScale(_scale, _scale, _scale);
}

//////////////////////////////////////////////////
template <class T>
void BaseAxisVisual<T>::SetLocalScale(const math::Vector3d &_scale)
{
xArrow->SetLocalScale(_scale.X(), _scale.Y(), _scale.Z());
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

how about:

      for (unsigned int i = 0; i < this->ChildCount(); ++i)
        this->ChildByIndex(i)->SetLocalScale(_scale);

this way we don't need to declare the private xArrow, yArrow, zArrow variables

yArrow->SetLocalScale(_scale.X(), _scale.Y(), _scale.Z());
zArrow->SetLocalScale(_scale.X(), _scale.Y(), _scale.Z());
}

//////////////////////////////////////////////////
template <class T>
void BaseAxisVisual<T>::Init()
{
T::Init();

ArrowVisualPtr xArrow = this->Scene()->CreateArrowVisual();
xArrow = this->Scene()->CreateArrowVisual();
xArrow->SetLocalPosition(0, 0, 0);
xArrow->SetLocalRotation(0, IGN_PI / 2, 0);
xArrow->SetMaterial("Default/TransRed");
this->AddChild(xArrow);

ArrowVisualPtr yArrow = this->Scene()->CreateArrowVisual();
yArrow = this->Scene()->CreateArrowVisual();
yArrow->SetLocalPosition(0, 0, 0);
yArrow->SetLocalRotation(-IGN_PI / 2, 0, 0);
yArrow->SetMaterial("Default/TransGreen");
this->AddChild(yArrow);

ArrowVisualPtr zArrow = this->Scene()->CreateArrowVisual();
zArrow = this->Scene()->CreateArrowVisual();
zArrow->SetLocalPosition(0, 0, 0);
zArrow->SetLocalRotation(0, 0, 0);
zArrow->SetMaterial("Default/TransBlue");
Expand Down