/[xmakemol]/xmakemol/file.c
ViewVC logotype

Diff of /xmakemol/file.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.161 by MPHodges, Tue Sep 30 21:39:02 2003 UTC revision 1.162 by MPHodges, Mon Oct 27 22:42:30 2003 UTC
# Line 1085  open_file(char *file_name, Boolean rever Line 1085  open_file(char *file_name, Boolean rever
1085    
1086    FILE *in_file;    FILE *in_file;
1087    
1088    #ifdef GL
1089      enum gl_render_types gl_current_render_type = DEFAULT;
1090    #endif
1091    
1092    if (opendir (file_name))    if (opendir (file_name))
1093      {      {
1094        sprintf (buf, "Cannot open directory %s", file_name);        sprintf (buf, "Cannot open directory %s", file_name);
# Line 1119  open_file(char *file_name, Boolean rever Line 1123  open_file(char *file_name, Boolean rever
1123    
1124    no_frames = 0;    no_frames = 0;
1125    
1126    /* Change to 0 if we find otherwise */    /* change to 0 if we find otherwise */
1127    
1128    while (1)    while (1)
1129      {      {
# Line 1354  open_file(char *file_name, Boolean rever Line 1358  open_file(char *file_name, Boolean rever
1358                current_frame->atom[i].has_color_name = True;                current_frame->atom[i].has_color_name = True;
1359                optional++;                optional++;
1360              }              }
1361                          
1362    #ifdef GL
1363              while (optional && strstr (optional, "render_ball_and_stick"))
1364                {
1365                  optional = strstr (optional, "render_ball_and_stick");
1366    
1367                  gl_current_render_type = BALL_AND_STICK;
1368                  optional++;
1369                }
1370    
1371              while (optional && strstr (optional, "render_tube"))
1372                {
1373                  optional = strstr (optional, "render_tube");
1374    
1375                  gl_current_render_type = TUBES;
1376                  optional++;
1377                }
1378    
1379              current_frame->atom[i].gl_render_type = gl_current_render_type;
1380    #endif /* GL */
1381    
1382            /* store the atom label */            /* store the atom label */
1383    
1384            strcpy (current_frame->atom[i].label, atom_label);            strcpy (current_frame->atom[i].label, atom_label);
# Line 1593  void post_load_file_hooks (Boolean rever Line 1617  void post_load_file_hooks (Boolean rever
1617    
1618  }  }
1619    
   
1620  void  void
1621  reset_any_atoms (void)  reset_any_atoms (void)
1622  {  {
# Line 3740  get_atom_data (struct frame *this_frame, Line 3763  get_atom_data (struct frame *this_frame,
3763          {          {
3764            atoms[io].is_hydrogen = 0;            atoms[io].is_hydrogen = 0;
3765          }          }
3766            /* Render type */
3767          atoms[io].gl_render_type = this_frame->atom[i].gl_render_type;
3768      }      }
3769  }  }
3770    

Legend:
Removed from v.1.161  
changed lines
  Added in v.1.162

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26