diff --git a/modules/gfx/src/impl/custom_renderer.cc b/modules/gfx/src/impl/custom_renderer.cc index ff559b6047e7cfa9d807a0cee4333a707dcdea98..652c997f18d412dbed3b3b2e60db7a1efe7fffc7 100644 --- a/modules/gfx/src/impl/custom_renderer.cc +++ b/modules/gfx/src/impl/custom_renderer.cc @@ -58,7 +58,7 @@ void CustomRenderer::PrepareRendering(GfxView& view, // draw all spheres for (AtomEntryMap::const_iterator it=view.atom_map.begin();it!=view.atom_map.end();++it) { va.AddSphere(SpherePrim(it->second.atom.GetPos(), - it->second.radius+plus, + options_->GetSphereRad(), it->second.color), options_->GetSphereDetail()); } @@ -67,9 +67,9 @@ void CustomRenderer::PrepareRendering(GfxView& view, const geom::Vec3& p0=it->bond.GetFirst().GetPos(); const geom::Vec3& p2=it->bond.GetSecond().GetPos(); geom::Vec3 p1=(p0+p2)*0.5; - va.AddCylinder(CylinderPrim(p0,p1,it->radius+plus,it->atom1->color), + va.AddCylinder(CylinderPrim(p0,p1,options_->GetBondRad(),it->atom1->color), options_->GetArcDetail()); - va.AddCylinder(CylinderPrim(p1,p2,it->radius+plus,it->atom2->color), + va.AddCylinder(CylinderPrim(p1,p2,options_->GetBondRad(),it->atom2->color), options_->GetArcDetail()); } } @@ -83,7 +83,7 @@ void CustomRenderer::RenderPov(PovState& pov, const std::string& name) for (AtomEntryMap::const_iterator it=view_.atom_map.begin();it!=view_.atom_map.end();++it) { pov.write_sphere(it->second.atom.GetPos(), - it->second.radius, + options_->GetSphereRad(), it->second.color, name); } @@ -92,8 +92,8 @@ void CustomRenderer::RenderPov(PovState& pov, const std::string& name) const geom::Vec3& p0=it->bond.GetFirst().GetPos(); const geom::Vec3& p2=it->bond.GetSecond().GetPos(); geom::Vec3 p1=(p0+p2)*0.5; - pov.write_cyl(p0,p1,it->radius,it->atom1->color,name,true); - pov.write_cyl(p1,p2,it->radius,it->atom2->color,name,true); + pov.write_cyl(p0,p1,options_->GetArcDetail(),it->atom1->color,name,true); + pov.write_cyl(p1,p2,options_->GetArcDetail(),it->atom2->color,name,true); } pov.inc() << " }\n"; } @@ -106,21 +106,6 @@ bool CustomRenderer::CanSetOptions(RenderOptionsPtr& render_options) void CustomRenderer::SetOptions(RenderOptionsPtr& render_options) { options_ = boost::static_pointer_cast<CustomRenderOptions>(render_options); - if(options_) { - for (AtomEntryMap::iterator it=view_.atom_map.begin();it!=view_.atom_map.end();++it) { - it->second.radius=options_->GetSphereRad(); - } - for (AtomEntryMap::iterator it=sel_view_.atom_map.begin();it!=sel_view_.atom_map.end();++it) { - it->second.radius=options_->GetSphereRad(); - } - - for(BondEntryList::iterator it=view_.bond_list.begin();it!=view_.bond_list.end();++it) { - it->radius=options_->GetBondRad(); - } - for(BondEntryList::iterator it=sel_view_.bond_list.begin();it!=sel_view_.bond_list.end();++it) { - it->radius=options_->GetBondRad(); - } - } } RenderOptionsPtr CustomRenderer::GetOptions()