removed in_sequence hack for backbone trace objects, added as option in gfx...

removed in_sequence hack for backbone trace objects, added as option in gfx entity interface; code cleanup in gfx render options and gfx py export

modules/gfx/src/render_options/sline_render_options.cc

@@ -21,9 +21,7 @@
 */
 #include "sline_render_options.hh"
 
-namespace ost {
-
-namespace gfx {
+namespace ost { namespace gfx {
 
 SlineRenderOptions::SlineRenderOptions():
   spline_detail_(6)
@@ -55,8 +53,4 @@ uint SlineRenderOptions::GetSplineDetail(){
   return spline_detail_;
 }
 
-SlineRenderOptions::~SlineRenderOptions() {}
-
-}
-
-}
+}} // ns

modules/gfx/src/render_options/sline_render_options.hh

@@ -26,28 +26,29 @@
 #include <boost/shared_ptr.hpp>
 
 #include <ost/gfx/module_config.hh>
-#include <ost/gfx/render_options/line_render_options.hh>
+
+#include "line_render_options.hh"
 
 namespace ost { namespace gfx {
 
-class DLLEXPORT_OST_GFX SlineRenderOptions: public ost::gfx::LineRenderOptions {
+class DLLEXPORT_OST_GFX SlineRenderOptions: public LineRenderOptions {
 public:
   SlineRenderOptions();
 
+  // RenderOptions interface
   virtual RenderMode::Type GetRenderMode();
   virtual bool CanApplyRenderOptions(RenderOptionsPtr render_options);
   virtual void ApplyRenderOptions(RenderOptionsPtr render_options);
 
-  virtual void SetSplineDetail(uint spline_detail);
-  virtual uint GetSplineDetail();
+  void SetSplineDetail(uint spline_detail);
+  uint GetSplineDetail();
 
-  virtual ~SlineRenderOptions();
 private:
   uint spline_detail_;
 };
 
 typedef boost::shared_ptr<SlineRenderOptions> SlineRenderOptionsPtr;
 
-}}
+}} // ns
 
-#endif /* OST_GFX_SIMPLE_RENDER_OPTIONS_HH */
+#endif

modules/gfx/src/render_options/trace_render_options.cc

@@ -29,7 +29,7 @@ TraceRenderOptions::TraceRenderOptions():
   arc_detail_(4),
   smooth_factor_(0.0),
   tube_radius_(0.4)
-{ }
+{}
 
 RenderMode::Type TraceRenderOptions::GetRenderMode()
 {
@@ -84,8 +84,4 @@ float TraceRenderOptions::GetTubeRadius() const{
   return tube_radius_;
 }
 
-TraceRenderOptions::~TraceRenderOptions() {}
-
-}
-
-}
+}}

modules/gfx/src/render_options/trace_render_options.hh

@@ -27,31 +27,28 @@
 
 #include <ost/gfx/module_config.hh>
 
-#include <ost/gfx/render_options/render_options.hh>
+#include "render_options.hh"
 
 namespace ost { namespace gfx {
 
-class DLLEXPORT_OST_GFX TraceRenderOptions: public ost::gfx::RenderOptions {
+class DLLEXPORT_OST_GFX TraceRenderOptions: public RenderOptions {
 public:
   TraceRenderOptions();
 
+  // RenderOptions interface
   virtual RenderMode::Type GetRenderMode();
-
   virtual bool CanApplyRenderOptions(RenderOptionsPtr render_options);
   virtual void ApplyRenderOptions(RenderOptionsPtr render_options);
 
+  // own interface
   void SetArcDetail(uint arc_detail);
   uint GetArcDetail() const;
-
   void SetNormalSmoothFactor(float smooth_factor);
   float GetNormalSmoothFactor() const;
-
   void SetTubeRadius(float tube_radius);
   float GetTubeRadius() const;
   float GetMaxRad() const;
 
-  virtual ~TraceRenderOptions();
-
 private:
   uint spline_detail_;
   uint poly_mode_;
@@ -62,6 +59,6 @@ private:
 
 typedef boost::shared_ptr<TraceRenderOptions> TraceRenderOptionsPtr;
 
-}}
+}} // ns
 
-#endif /* OST_GFX_CARTOON_RENDER_OPTIONS_HH */
+#endif