diff --git a/modules/gfx/src/scene.cc b/modules/gfx/src/scene.cc index a5727ba713185c53be869ff6d36664ce0ec4f8a8..6166f009ad357f62ec8f7c8ac79fffd2308d6818 100644 --- a/modules/gfx/src/scene.cc +++ b/modules/gfx/src/scene.cc @@ -97,7 +97,7 @@ Scene::Scene(): gl_init_(false), fov_(30.0), znear_(1.0),zfar_(1000.0), - fnear_(1.0), ffar_(1000.0), + fnear_(0.0), ffar_(0.0), vp_width_(1000),vp_height_(1000), scene_view_stack_(), aspect_ratio_(1.0), diff --git a/modules/io/src/mol/entity_io_mae_handler.cc b/modules/io/src/mol/entity_io_mae_handler.cc index b48cdd551bc4279f02668ab682e90a6f346f2f04..90242007016ee67c24d86808a96fb1cd6c91d285 100644 --- a/modules/io/src/mol/entity_io_mae_handler.cc +++ b/modules/io/src/mol/entity_io_mae_handler.cc @@ -127,16 +127,16 @@ void MAEReader::Import(mol::EntityHandle& ent) if(in_atom_block) { if(parsing_atoms) { if(boost::regex_match(line,r_delim)) { - LOG_DEBUG( "stopping atom parsing" ); + //LOG_DEBUG( "stopping atom parsing" ); parsing_atoms=false; prop_list.clear(); } else { // parsing atom line std::vector<std::string> tokens=tokenize(line); for(size_t i=0;i<tokens.size();++i) { - LOG_DEBUG( "[" << tokens[i] << "] "); + //LOG_DEBUG( "[" << tokens[i] << "] "); } - LOG_DEBUG(""); + //LOG_DEBUG(""); add_atom(ent,editor, tokens[i_atom_name], tokens[i_atom_xpos], @@ -157,17 +157,17 @@ void MAEReader::Import(mol::EntityHandle& ent) i_chain_name==-1) { throw IOException("missing atom prop"); } - LOG_DEBUG( "starting atom parsing" ); + //LOG_DEBUG( "starting atom parsing" ); parsing_atoms=true; } else if(line[0]=='}') { - LOG_DEBUG( "exiting atom block" ); + //LOG_DEBUG( "exiting atom block" ); in_atom_block=false; } else { // parsing property line if(line[0]!='#') { int pid=prop_list.size()+1; prop_list.push_back(line); - LOG_DEBUG( "found property '" << prop_list.back() << "' id=" << pid ); + //LOG_DEBUG( "found property '" << prop_list.back() << "' id=" << pid ); if(line=="s_m_pdb_atom_name") i_atom_name=pid; else if(line=="r_m_x_coord") i_atom_xpos=pid; else if(line=="r_m_y_coord") i_atom_ypos=pid; @@ -180,16 +180,16 @@ void MAEReader::Import(mol::EntityHandle& ent) } } else { // not in atom block if(boost::regex_match(line,r_atom_block)) { - LOG_DEBUG( "entering atom block" ); + //LOG_DEBUG( "entering atom block" ); in_atom_block=true; } else if(line[0]=='}') { - LOG_DEBUG( "exiting ct block" ); + //LOG_DEBUG( "exiting ct block" ); in_ct_block=false; } } } else { // not in ct block if(boost::regex_match(line,r_ct_block)) { - LOG_DEBUG( "entering ct block" ); + //LOG_DEBUG( "entering ct block" ); in_ct_block=true; } } @@ -245,10 +245,10 @@ void MAEReader::add_atom(mol::EntityHandle ent, if(update_chain) { if (!(curr_chain_=ent.FindChain(cname))) { curr_chain_=editor.InsertChain(cname); - LOG_DEBUG("new chain " << curr_chain_); + //LOG_DEBUG("new chain " << curr_chain_); ++chain_count_; } else { - LOG_DEBUG("old chain " << curr_chain_); + //LOG_DEBUG("old chain " << curr_chain_); } } @@ -256,15 +256,15 @@ void MAEReader::add_atom(mol::EntityHandle ent, if (!(curr_residue_=curr_chain_.FindResidue(rnum))) { curr_residue_=editor.AppendResidue(curr_chain_, rkey, rnum); assert(curr_residue_.IsValid()); - LOG_DEBUG(" new residue " << curr_residue_); + //LOG_DEBUG(" new residue " << curr_residue_); ++residue_count_; } else { - LOG_DEBUG(" old residue " << curr_residue_); + //LOG_DEBUG(" old residue " << curr_residue_); } } // finally add atom - LOG_DEBUG(" atom " << aname << " (" << ele << ") @" << apos); + //LOG_DEBUG(" atom " << aname << " (" << ele << ") @" << apos); mol::AtomHandle ah = editor.InsertAtom(curr_residue_, aname, apos, ele); }