Ticket #46218: pymol-clang.diff

File pymol-clang.diff, 4.3 KB (added by howarth.at.macports@…, 10 years ago)

add back pymol-clang.diff to remove some unused variables

  • layer0/ShaderMgr.cpp

    void CShaderPrg_Update_Shaders_For_Backg 
    665665}
    666666
    667667int CShaderPrg_Reload(PyMOLGlobals * G, char *name, char *v, char *f){
    668   int status, howLong, needAttach = 0;
     668  int status, howLong;
    669669  CShaderPrg * I = CShaderMgr_GetShaderPrg_NoSet(G->ShaderMgr, name);
    670670  if (!I){
    671671    CShaderMgr *SM = G->ShaderMgr;
  • layer0/Sphere.cpp

    Z* ------------------------------------- 
    3232#define tau 0.8506508084F       /* t=(1+sqrt(5))/2, tau=t/sqrt(1+t^2)  */
    3333#define one 0.5257311121F       /* one=1/sqrt(1+t^2) , unit sphere     */
    3434
     35#define FAST_SPHERE_INIT
     36
     37#ifndef FAST_SPHERE_INIT
    3538static const float start_points[13][3] = {
    3639  {tau, one, 0},
    3740  {-tau, one, 0},
    static const int icosahedron[21][3] = { 
    6972  {7, 2, 9},
    7073  {6, 10, 2}
    7174};
     75#endif
    7276
    7377static const int mesh[30][2] = {
    7478  {0, 3},
    static const int mesh[30][2] = { 
    103107  {9, 10}
    104108};
    105109
    106 #define FAST_SPHERE_INIT
    107 
    108110#ifdef FAST_SPHERE_INIT
    109111#include"SphereData.h"
    110112
  • layer2/RepNonbonded.cpp

    static void RepNonbondedRender(RepNonbon 
    199199  int ok = true;
    200200  // 0.018f is found by trial and error
    201201  // TODO: this is not sufficient to solve the problem of disappearing cylinders
    202   float scale_bound = SettingGetGlobal_f(G, cSetting_field_of_view)  * cPI / 180.0f * 0.018f;
     202  // float scale_bound = SettingGetGlobal_f(G, cSetting_field_of_view)  * cPI / 180.0f * 0.018f;
    203203
    204204  alpha =
    205205    SettingGet_f(G, I->R.cs->Setting, I->R.obj->Setting, cSetting_nonbonded_transparency);
    static void RepNonbondedRender(RepNonbon 
    208208    alpha = 1.0F;
    209209  if(ray) {
    210210    float radius;
    211     float pixel_radius = ray->PixelRadius;
    212211    ray->transparentf(1.0F - alpha);
    213212
    214213    if(I->Radius == 0.0F) {
    static void RepNonbondedRender(RepNonbon 
    360359          CShaderPrg *shaderPrg;
    361360          if (nonbonded_as_cylinders){
    362361            // vertex scale is bound so that cylinders cannot disappear when it gets too low
    363             float vertex_scale = info->vertex_scale;
    364362            float pixel_scale_value = SettingGetGlobal_f(G, cSetting_ray_pixel_scale);
    365363            if(pixel_scale_value < 0)
    366364              pixel_scale_value = 1.0F;
    static void RepNonbondedRender(RepNonbon 
    596594          CShaderPrg *shaderPrg;
    597595          if (nonbonded_as_cylinders){
    598596            // vertex scale is bound so that cylinders cannot disappear when it gets too low
    599             float vertex_scale = info->vertex_scale;
    600597            float pixel_scale_value = SettingGetGlobal_f(G, cSetting_ray_pixel_scale);
    601598            if(pixel_scale_value < 0)
    602599              pixel_scale_value = 1.0F;
  • layer2/RepWireBond.cpp

    static void RepWireBondRender(RepWireBon 
    779779          CShaderPrg *shaderPrg;
    780780          if (line_as_cylinders){
    781781            // vertex scale is bound so that cylinders cannot disappear when it gets too low
    782             float vertex_scale = info->vertex_scale;
    783782            float pixel_scale_value = SettingGetGlobal_f(G, cSetting_ray_pixel_scale);
    784783            if(pixel_scale_value < 0)
    785784              pixel_scale_value = 1.0F;
    static void RepWireBondRender(RepWireBon 
    973972          CShaderPrg *shaderPrg;
    974973          if (line_as_cylinders){
    975974            // vertex scale is bound so that cylinders cannot disappear when it gets too low
    976             float vertex_scale = info->vertex_scale;
    977975            float pixel_scale_value = SettingGetGlobal_f(G, cSetting_ray_pixel_scale);
    978976            if(pixel_scale_value < 0)
    979977              pixel_scale_value = 1.0F;
  • layer3/Executive.cpp

    void ExecutiveFullScreen(PyMOLGlobals *  
    1397813978
    1397913979#ifndef _PYMOL_NO_GLUT
    1398013980  if(G->HaveGUI && G->ValidContext) {
    13981     CExecutive *I = G->Executive;
    1398213981    if (flag) {
    1398313982#ifndef GLUT_FULL_SCREEN
    1398413983      if(wm_flag < 1) {