Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Mar 20, 2005, 10:38:59 PM (20 years ago)
Author:
patrick
Message:

orxonox/trunk: stdincl was still included everywhere. removed it out of the stdincl.h file to enable the possibility of compile-speedup. added some testclasses for vector/quaternion.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • orxonox/trunk/src/world_entities/primitive.cc

    r3590 r3607  
    2020#include "stdincl.h"
    2121#include "world_entity.h"
    22 #include "vector.h"
    2322#include "objModel.h"
    2423
     
    3938
    4039  this->material = new Material("Sphere");
    41   this->material->setDiffuseMap("../data/pictures/load_screen.jpg");
     40  //this->material->setDiffuseMap("../data/pictures/load_screen.jpg");
    4241  this->material->setIllum(3);
    43   this->material->setSpecular(1, 1, 1);
     42  this->material->setAmbient(1, .5, 1);
     43  Vector* v = new Vector();
     44
    4445}
    4546
     
    7475void Primitive::tick (float time)
    7576{
    76   //  Vector v(0.0, 0.0, 1.0);
    77   //  Quaternion q(10.0, v);
    78   //  this->setRelDir(&(this->relDirection * q));
     77  // Vector v(0.0, 0.0, 1.0);
     78  // Quaternion q(10.0, v);
     79  // this->setRelDir(&(this->relDirection * q));
    7980}
    8081
     
    9394  //glMultMatrixf((float*)matrix);
    9495  this->material->select();
    95   gluSphere(this->object, 2, 20, 20);
     96  gluSphere(this->object, 1, 6, 6);
     97  //gluCylinder(this->object, 1, 1, 2, 6, 6);
     98  //gluDisk(this->object, 1, 2, 6, 6);
    9699
    97100  glPopMatrix();
Note: See TracChangeset for help on using the changeset viewer.