Changeset 4332 in orxonox.OLD for orxonox/branches/physics/src/world_entities

Timestamp:

May 27, 2005, 7:14:55 PM (19 years ago)

Author:

bensch

Message:

orxonox/branches/physics: merged the trunk back to the physics-branche
merged with command:
svn merge -r 4301:HEAD trunk/ branches/physics/
little conflict in particle-system resolved easily

Location:

orxonox/branches/physics/src/world_entities

Files:

• camera.cc (modified) (2 diffs)
• character_attributes.cc (modified) (1 diff)
• projectile.cc (modified) (1 diff)
• satellite.cc (modified) (1 diff)
• skybox.cc (modified) (1 diff)
• terrain.cc (modified) (1 diff)
• test_bullet.cc (modified) (1 diff)
• test_entity.cc (modified) (1 diff)
• test_gun.cc (modified) (3 diffs)
• world_entity.cc (modified) (1 diff)

orxonox/branches/physics/src/world_entities/camera.cc

@@ -33 +33 @@
 Camera::Camera(void)
 {
-  this->setClassName("Camera");
+  this->setClassID(CL_CAMERA, "Camera");
   this->target = new CameraTarget();
 
@@ -190 +190 @@
 CameraTarget::CameraTarget()
 {
-  this->setClassName("CameraTarget");
+  this->setClassID(CL_CAMERA_TARGET, "CameraTarget");
   this->setMode(PNODE_MOVEMENT);
 }

orxonox/branches/physics/src/world_entities/character_attributes.cc

@@ -29 +29 @@
 CharacterAttributes::CharacterAttributes () 
 {
-   this->setClassName ("CharacterAttributes");
+   this->setClassID(CL_CHARACTER_ATTRIBUTES, "CharacterAttributes");
 }
 

orxonox/branches/physics/src/world_entities/projectile.cc

@@ -33 +33 @@
 Projectile::Projectile (Weapon* weapon) : WorldEntity()
 {
+  this->setClassID(CL_PROJECTILE, "Projectile");
   this->weapon = weapon;
   this->flightDirection = NULL;

orxonox/branches/physics/src/world_entities/satellite.cc

@@ -31 +31 @@
 Satellite::Satellite (Vector axis, float speed)
 {
-  this->setClassName ("Satellite");
+  this->setClassID(CL_SATELLITE, "Satellite");
   this->model = (Model*) ResourceManager::getInstance()->load("cube", RP_LEVEL);
   this->speed = speed;

orxonox/branches/physics/src/world_entities/skybox.cc

@@ -62 +62 @@
 void SkyBox::preInit(void)
 {
-  this->setClassName("SkyBox");
+  this->setClassID(CL_SKYBOX, "SkyBox");
   this->skyModel = NULL;
   this->material = new Material*[6];

orxonox/branches/physics/src/world_entities/terrain.cc

@@ -77 +77 @@
 void Terrain::init(void)
 {
-  this->setClassName ("Terrain");
-  
+  this->setClassID(CL_TERRAIN, "Terrain");
   this->objectList = 0;
 }

orxonox/branches/physics/src/world_entities/test_bullet.cc

@@ -33 +33 @@
 TestBullet::TestBullet (Weapon* weapon) : Projectile(weapon)
 {
+  this->setClassID(CL_TEST_BULLET, "TestBullet");
   this->model = (Model*)ResourceManager::getInstance()->load("models/test_projectile.obj", OBJ, RP_LEVEL);
 }

orxonox/branches/physics/src/world_entities/test_entity.cc

@@ -28 +28 @@
 TestEntity::TestEntity () : WorldEntity()
 {  
+  this->setClassID(CL_TEST_ENTITY, "TestEntity");
   this->md2Model = new MD2Model();
   this->md2Model->loadModel(ResourceManager::getFullName("models/tris.md2"));

orxonox/branches/physics/src/world_entities/test_gun.cc

@@ -45 +45 @@
   :  Weapon (parent, coordinate, direction) 
 {
+  this->setClassID(CL_TEST_GUN, "TestGun");
   this->model = (Model*)ResourceManager::getInstance()->load("models/test_gun.obj", OBJ, RP_CAMPAIGN);
   this->idleTime = 0.2f;
@@ -89 +90 @@
     }
 
-  BaseObject* p = new TestBullet(this);
-  ObjectManager::getInstance()->cache(CL_TEST_BULLET, 100, *p);
+  Projectile* p = new TestBullet(this);
+  ObjectManager::getInstance()->cache(CL_TEST_BULLET, 100, p);
   ObjectManager::getInstance()->debug();
 }
@@ -143 +144 @@
     }
 
-  Projectile* pj = new TestBullet(this);
+  Projectile* pj = (TestBullet*)ObjectManager::getInstance()->getFromDeadList(CL_TEST_BULLET);
+
+  //printf( "object ref %p\n", ObjectManager::getInstance()->getFromDeadList(CL_TEST_BULLET));
+
+  //Projectile* pj = new TestBullet(this);
   pj->setAbsCoor(this->getAbsCoor() + this->projectileOffset);
   pj->setAbsDir(this->getAbsDir());

orxonox/branches/physics/src/world_entities/world_entity.cc

@@ -30 +30 @@
 WorldEntity::WorldEntity(const TiXmlElement* root)
 {
-  this->setClassName ("WorldEntity");
+  this->setClassID(CL_WORLD_ENTITY, "WorldEntity");
   this->model = NULL;