Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 4279 in orxonox.OLD for orxonox/trunk


Ignore:
Timestamp:
May 24, 2005, 11:33:33 AM (20 years ago)
Author:
patrick
Message:

orxonox/trunk: changed header struct name, fixed windows compile problem (definition of point animation)

Location:
orxonox/trunk/src/lib/graphics/importer
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • orxonox/trunk/src/lib/graphics/importer/anorms.h

    r4245 r4279  
    1616along with this program; if notf, write to the Free Software
    1717Foundationf, Inc.f, 59 Temple Place - Suite 330f, Bostonf, MA  02111-1307f, USA.
     18*/
    1819
    19 */
    2020{-0.525731f, 0.000000f, 0.850651f},
    2121{-0.442863f, 0.238856f, 0.864188f},

  • orxonox/trunk/src/lib/graphics/importer/md2Model.cc

    r4277 r4279  
    5454    {  95, 111, 10 },   // FALLBACK
    5555    { 112, 122,  7 },   // WAVE
    56     { 123, 134,  6 },   // POINT
     56    { 123, 134,  6 },   // POINTT
    5757    { 135, 153, 10 },   // CROUCH_STAND
    5858    { 154, 159,  7 },   // CROUCH_WALK
    … …  
    111111      return false;
    112112    }
    113   this->header = new tMd2Header;
    114   fread(this->header, 1, sizeof(tMd2Header), pFile);
     113  this->header = new MD2Header;
     114  fread(this->header, 1, sizeof(MD2Header), pFile);
    115115  /* check for the header version: make sure its a md2 file :) */
    116116  if( unlikely(this->header->version != MD2_VERSION) && unlikely(this->header->ident != MD2_IDENT))

  • orxonox/trunk/src/lib/graphics/importer/md2Model.h

    r4278 r4279  
    4141
    4242//! This holds the header information that is read in at the beginning of the file: id software definition
    43 struct tMd2Header
     43struct MD2Header
    4444{
    4545   int ident;                           //!< This is used to identify the file
    … …  
    8080    FALLBACK,
    8181    WAVE,
    82     POINT,
     82    POINTT,
    8383    CROUCH_STAND,
    8484    CROUCH_WALK,
    … …  
    117117  char* fileName;
    118118  char* skinFileName;
    119   tMd2Header* header;
     119  MD2Header* header;
    120120
    121121  sVec3D* pVertices;
    … …  
    171171  char* fileName;
    172172  char* skinFileName;
    173   tMd2Header* header;
     173  MD2Header* header;
    174174
    175175  sVec3D* pVertices;
Note: See TracChangeset for help on using the changeset viewer.