diff options
Diffstat (limited to 'apps/opencs/view/render/cellarrow.cpp')
| -rw-r--r-- | apps/opencs/view/render/cellarrow.cpp | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/apps/opencs/view/render/cellarrow.cpp b/apps/opencs/view/render/cellarrow.cpp index 776dbf7890..278c49883f 100644 --- a/apps/opencs/view/render/cellarrow.cpp +++ b/apps/opencs/view/render/cellarrow.cpp @@ -1,14 +1,12 @@ - #include "cellarrow.hpp" #include <osg/Group> #include <osg/PositionAttitudeTransform> -#include <osg/Geode> +#include <osg/Billboard> #include <osg/Geometry> #include <osg/PrimitiveSet> #include "../../model/prefs/state.hpp" -#include "../../model/prefs/shortcutmanager.hpp" #include <components/misc/constants.hpp> @@ -96,7 +94,7 @@ void CSVRender::CellArrow::buildShape() const int arrowLength = 1350; const int arrowHeight = 300; - osg::Vec3Array *vertices = new osg::Vec3Array; + auto *vertices = new osg::Vec3Array; for (int i2=0; i2<2; ++i2) for (int i=0; i<2; ++i) { @@ -108,7 +106,7 @@ void CSVRender::CellArrow::buildShape() geometry->setVertexArray (vertices); - osg::DrawElementsUShort *primitives = new osg::DrawElementsUShort (osg::PrimitiveSet::TRIANGLES, 0); + auto *primitives = new osg::DrawElementsUShort (osg::PrimitiveSet::TRIANGLES, 0); // top primitives->push_back (0); @@ -148,7 +146,7 @@ void CSVRender::CellArrow::buildShape() geometry->addPrimitiveSet (primitives); - osg::Vec4Array *colours = new osg::Vec4Array; + auto *colours = new osg::Vec4Array; for (int i=0; i<6; ++i) colours->push_back (osg::Vec4f (0.11f, 0.6f, 0.95f, 1.0f)); @@ -159,10 +157,7 @@ void CSVRender::CellArrow::buildShape() geometry->getOrCreateStateSet()->setMode (GL_LIGHTING, osg::StateAttribute::OFF); - osg::ref_ptr<osg::Geode> geode (new osg::Geode); - geode->addDrawable (geometry); - - mBaseNode->addChild (geode); + mBaseNode->addChild (geometry); } CSVRender::CellArrow::CellArrow (osg::Group *cellNode, Direction direction, |