Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 2848 in orxonox.OLD for orxonox/trunk/importer


Ignore:
Timestamp:
Nov 13, 2004, 12:49:28 AM (20 years ago)
Author:
bensch
Message:

orxonox/trunk/importer: delete [] array only if finalized. Typo.

Location:
orxonox/trunk/importer
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • orxonox/trunk/importer/array.cc

    r2847 r2848  
    4040      delete last;
    4141    }
    42   delete [] array;
     42  if (finalized)
     43    delete [] array;
    4344}
    4445
  • orxonox/trunk/importer/framework.cc

    r2847 r2848  
    55WindowHandler wHandler;  // Create an instance of the whandler basecode class
    66Object* obj;
     7Object* obj2;
     8Object* obj3;
    79float rotator = 0.0;
    810  GLfloat whiteLight[] = {1.0, 1.0, 0.0,1.0};
     
    5052  else if (argc>=2)
    5153    obj = new Object(argv[1]);
    52   else obj = new Object();
     54  else
     55    obj = new Object();
     56
    5357  GLfloat lmodelAmbient[] = {.1, .1, .1, 1.0};
    5458  glLightfv(GL_LIGHT0, GL_DIFFUSE, whiteLight);
     
    8993
    9094  // Kill the GL & SDL screens
     95  delete obj;
    9196  wHandler.KillGLWindow();
    9297  // And quit
  • orxonox/trunk/importer/object.cc

    r2847 r2848  
    194194      }
    195195
    196       // case vt
     196      // case VertexTextureCoordinate
    197197      else if (!strncmp(Buffer, "vt ", 2))
    198198      {
    199199        readVertexTexture(Buffer+3);
    200200      }
     201      // case group
     202      else if (!strncmp(Buffer, "g", 1))
     203        {
     204          printf("ERROR GROUPS NOT IMPLEMENTED YET\n");
     205        }
    201206    }
    202207  OBJ_FILE->close();
Note: See TracChangeset for help on using the changeset viewer.