Changeset 845 for code/branches/core/src/orxonox/objects

Timestamp:

Mar 1, 2008, 9:29:23 PM (17 years ago)

Author:

landauf

Message:

(1) removed ExportClass and ExportAbstractClass macros
(2) removed _UtilExport from templates

reto, i hope (2) removed some of your compiler errors and orxonox works still on your system with (1)

Location:

code/branches/core/src/orxonox/objects

Files:

• Ambient.cc (modified) (1 diff)
• Ambient.h (modified) (1 diff)
• Camera.h (modified) (1 diff)
• Explosion.h (modified) (1 diff)
• Fighter.h (modified) (1 diff)
• Model.h (modified) (1 diff)
• NPC.h (modified) (1 diff)
• Projectile.h (modified) (1 diff)
• Skybox.h (modified) (1 diff)
• SpaceShip.h (modified) (1 diff)
• Tickable.h (modified) (1 diff)
• WorldEntity.h (modified) (1 diff)
• weapon/AmmunitionDump.h (modified) (1 diff)
• weapon/BarrelGun.h (modified) (1 diff)
• weapon/BaseWeapon.h (modified) (1 diff)
• weapon/Bullet.h (modified) (1 diff)
• weapon/BulletManager.h (modified) (1 diff)

code/branches/core/src/orxonox/objects/Ambient.cc

@@ -45 +45 @@
 namespace orxonox
 {
-    // create a template instantiations
-    //template class _OrxonoxExport ClassIdentifier<Ambient>;
-
     CreateFactory(Ambient);
 

code/branches/core/src/orxonox/objects/Ambient.h

@@ -14 +14 @@
             virtual ~Ambient();
 
-            
+
             void loadParams(TiXmlElement* xmlElem);
 
         private:
-            
+
 
     };
-    ExportClass(Ambient, Orxonox);
 }
 

code/branches/core/src/orxonox/objects/Camera.h

@@ -14 +14 @@
             virtual ~Camera();
 
-            
+
             void loadParams(TiXmlElement* xmlElem);
 
         private:
-            
+
 
     };
-    ExportClass(Camera, Orxonox);
 }
 

code/branches/core/src/orxonox/objects/Explosion.h

@@ -21 +21 @@
             ParticleInterface* particle_;
     };
-    ExportClass(Explosion, Orxonox);
 }
 

code/branches/core/src/orxonox/objects/Fighter.h

@@ -90 +90 @@
             int emitterRate_;
     };
-    ExportClass(Fighter, Orxonox);
 }
 

code/branches/core/src/orxonox/objects/Model.h

@@ -25 +25 @@
             void registerAllVariables();
     };
-    ExportClass(Model, Orxonox);
 }
 

code/branches/core/src/orxonox/objects/NPC.h

@@ -44 +44 @@
       static int const NUMELEMENTS = 9;  //number of elements
   };
-  ExportClass(NPC, Orxonox);
-
 }
 #endif /* _NPC_H__ */

code/branches/core/src/orxonox/objects/Projectile.h

@@ -28 +28 @@
             Timer<Projectile> destroyTimer_;
     };
-    ExportClass(Projectile, Orxonox);
 }
 

code/branches/core/src/orxonox/objects/Skybox.h

@@ -16 +16 @@
             virtual ~Skybox();
 
-            
+
             void loadParams(TiXmlElement* xmlElem);
 
         private:
-            
+
 
     };
-    ExportClass(Skybox, Orxonox);
 }
 

code/branches/core/src/orxonox/objects/SpaceShip.h

@@ -75 +75 @@
             int emitterRate_;
     };
-    ExportClass(SpaceShip, Orxonox);
 }
 

code/branches/core/src/orxonox/objects/Tickable.h

@@ -67 +67 @@
             Tickable() { RegisterRootObject(Tickable); }
     };
-    ExportAbstractClass(Tickable, Orxonox);
 
     //! The TickFrameListener calls the tick(dt) function of all Tickables every frame.

code/branches/core/src/orxonox/objects/WorldEntity.h

@@ -147 +147 @@
       bool bStatic_;
   };
-  ExportClass(WorldEntity, Orxonox);
 }
 

code/branches/core/src/orxonox/objects/weapon/AmmunitionDump.h

@@ -66 +66 @@
     int *capacity_;
   };
-  ExportClass(AmmunitionDump, Orxonox);
 }
 

code/branches/core/src/orxonox/objects/weapon/BarrelGun.h

@@ -60 +60 @@
 
   };
-  ExportClass(BarrelGun, Orxonox);
 }
 

code/branches/core/src/orxonox/objects/weapon/BaseWeapon.h

@@ -122 +122 @@
 
   };
-  ExportAbstractClass(BaseWeapon, Orxonox);
 }
 

code/branches/core/src/orxonox/objects/weapon/Bullet.h

@@ -47 +47 @@
     inline virtual void loadParams(TiXmlElement* xmlElem) { Model::loadParams(xmlElem); };
  };
-  ExportClass(Bullet, Orxonox);
 }
 

code/branches/core/src/orxonox/objects/weapon/BulletManager.h

@@ -67 +67 @@
           int bulletsIndex_;
   };
-  ExportClass(BulletManager, Orxonox);
 }