From be5fed16b06766cb10dd1ed51d49be29aa9d800d Mon Sep 17 00:00:00 2001 From: Joseph Mirabel <jmirabel@laas.fr> Date: Thu, 7 Dec 2017 11:43:46 +0100 Subject: [PATCH] [doc] Update doc of setCurveMode --- doc/opengl_primitives.png | Bin 0 -> 5316 bytes idl/gepetto/viewer/graphical-interface.idl | 4 +++- include/gepetto/viewer/corba/windows-manager.hh | 3 +-- 3 files changed, 4 insertions(+), 3 deletions(-) create mode 100644 doc/opengl_primitives.png diff --git a/doc/opengl_primitives.png b/doc/opengl_primitives.png new file mode 100644 index 0000000000000000000000000000000000000000..1121812ad648f4cff422bffb0e2592d21b17406b GIT binary patch literal 5316 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%0AesV_>I$*T3T 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 literal 0 HcmV?d00001 diff --git a/idl/gepetto/viewer/graphical-interface.idl b/idl/gepetto/viewer/graphical-interface.idl index 41d2b42..420c1df 100644 --- a/idl/gepetto/viewer/graphical-interface.idl +++ b/idl/gepetto/viewer/graphical-interface.idl @@ -189,8 +189,10 @@ typedef sequence<Position> PositionSeq; /// \param input lineName : name of the line. /// \param input pos : waypoints of the curve. boolean setCurvePoints(in string curveName, in PositionSeq pos) raises (Error); - + /// \param mode The list of possible GL modes is provided in + /// WindowsManager::setCurveMode. + /// From the GL modes, remove "GL_" and put it lower case. boolean setCurveMode (in string curveName, in string mode) raises (Error); boolean setCurvePointsSubset (in string curveName, in long first, in long count) raises (Error); diff --git a/include/gepetto/viewer/corba/windows-manager.hh b/include/gepetto/viewer/corba/windows-manager.hh index 59898fc..424e014 100644 --- a/include/gepetto/viewer/corba/windows-manager.hh +++ b/include/gepetto/viewer/corba/windows-manager.hh @@ -197,8 +197,7 @@ namespace graphics { virtual bool setCurvePoints(const std::string& curveName, const Vec3ArrayPtr_t& pos); - /// See http://svn.openscenegraph.org/osg/OpenSceneGraph-Data/trunk/Images/primitives.gif for - /// possible values + /// \image html opengl_primitives.png virtual bool setCurveMode (const std::string& curveName, const GLenum mode); virtual bool setCurvePointsSubset (const std::string& curveName, const int first, const std::size_t count); virtual bool setCurveLineWidth (const std::string& curveName, const float& width); -- GitLab