Changeset 4593 in orxonox.OLD for orxonox

Timestamp:

Jun 10, 2005, 7:42:49 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: cooler testBullet

File:

• orxonox/trunk/src/world_entities/test_bullet.cc (modified) (7 diffs)

orxonox/trunk/src/world_entities/test_bullet.cc

@@ -1 +1 @@
 
 
-/* 
+/*
    orxonox - the future of 3D-vertical-scrollers
 
@@ -13 +13 @@
    ### File Specific
    main-programmer: Patrick Boenzli
-   co-programmer: 
+   co-programmer:
 */
 
@@ -34 +34 @@
 {
   this->setClassID(CL_TEST_BULLET, "TestBullet");
-  this->model = (Model*)ResourceManager::getInstance()->load("models/test_projectile.obj", OBJ, RP_LEVEL);
+  float modelSize = .5;
+  this->model = (Model*)ResourceManager::getInstance()->load("models/Rocket1.obj", OBJ, RP_LEVEL, (void*) &modelSize);
 }
 
@@ -41 +42 @@
    \brief standard deconstructor
 */
-TestBullet::~TestBullet () 
+TestBullet::~TestBullet ()
 {
-  /* 
-     do not delete the test projectModel, since it is pnode 
-     and will be cleaned out by world 
+  /*
+     do not delete the test projectModel, since it is pnode
+     and will be cleaned out by world
   */
   //delete this->projectileModel;
@@ -56 +57 @@
    \param time since last tick
 */
-void TestBullet::tick (float time) 
+void TestBullet::tick (float time)
 {
   //Vector v = *this->flightDirection * ( this->speed * time * 1000 + 0.1);
@@ -78 +79 @@
    \param place where it is hit
 */
-void TestBullet::hit (WorldEntity* entity, Vector* place) 
+void TestBullet::hit (WorldEntity* entity, Vector* place)
 {}
 
@@ -85 +86 @@
    \brief the function gets called, when the projectile is destroyed
 */
-void TestBullet::destroy () 
+void TestBullet::destroy ()
 {}
 
 
-void TestBullet::draw () 
+void TestBullet::draw ()
 {
   glMatrixMode(GL_MODELVIEW);
   glPushMatrix();
 
-  float matrix[4][4];  
+  float matrix[4][4];
   glTranslatef (this->getAbsCoor ().x, this->getAbsCoor ().y, this->getAbsCoor ().z);
   this->getAbsDir().matrix (matrix);
-  glMultMatrixf((float*)matrix);  
+  glMultMatrixf((float*)matrix);
   glScalef(2.0, 2.0, 2.0);
   this->model->draw();