Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 7574 in orxonox.OLD for branches


Ignore:
Timestamp:
May 10, 2006, 3:43:27 PM (20 years ago)
Author:
stefalie
Message:

check in material changes

Location:
branches/bsp_model/src/lib/graphics/importer
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • branches/bsp_model/src/lib/graphics/importer/material.cc

    r7525 r7574  
    7777
    7878
    79 Material* Material::selectedMaterial = NULL;
     79const Material* Material::selectedMaterial = NULL;
    8080
    8181const GLenum Material::glTextureArbs[] =
    8282{
    83   GL_TEXTURE0_ARB,
    84   GL_TEXTURE1_ARB,
    85   GL_TEXTURE2_ARB,
    86   GL_TEXTURE3_ARB,
    87   GL_TEXTURE4_ARB,
    88   GL_TEXTURE5_ARB,
    89   GL_TEXTURE6_ARB,
    90   GL_TEXTURE7_ARB
     83  GL_TEXTURE0,
     84  GL_TEXTURE1,
     85  GL_TEXTURE2,
     86  GL_TEXTURE3,
     87  GL_TEXTURE4,
     88  GL_TEXTURE5,
     89  GL_TEXTURE6,
     90  GL_TEXTURE7
    9191};
    9292
    … …  
    158158        glActiveTexture(Material::glTextureArbs[i]);
    159159        glBindTexture(GL_TEXTURE_2D, 0);
     160        glDisable(GL_TEXTURE_2D);
    160161    }
    161162  }
    … …  
    174175    }
    175176  }
     177  Material::selectedMaterial = this;
    176178
    177179  /*  if (this->diffuseTexture != NULL)

  • branches/bsp_model/src/lib/graphics/importer/material.h

    r7524 r7574  
    6969
    7070  private:
    71     static Material* selectedMaterial; //!< The currently selected material.
     71    static const Material* selectedMaterial; //!< The currently selected material.
    7272
    7373    int              illumModel;       //!< The IlluminationModel is either flat or smooth.
Note: See TracChangeset for help on using the changeset viewer.