Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 5357 in orxonox.OLD for trunk/src


Ignore:
Timestamp:
Oct 10, 2005, 9:15:05 PM (19 years ago)
Author:
bensch
Message:

orxonox/trunk: some minor cleanup, of the mess i made with AutoMake-sh

Location:
trunk/src
Files:
32 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/defs/debug.h

    r5300 r5357  
    7070#define DEBUG_MODULE_GRAPHICS           2
    7171#define DEBUG_MODULE_EVENT              2
    72 #define DEBUG_MODULE_FONT               2
    73 #define DEBUG_MODULE_PARTICLE           2
    7472#define DEBUG_MODULE_PHYSICS            2
    7573#define DEBUG_MODULE_GARBAGE_COLLECTOR  2
    … …  
    8280#define DEBUG_MODULE_TRACK_MANAGER      2
    8381#define DEBUG_MODULE_MATH               2
    84 #define DEBUG_MODULE_LIGHT              2
    8582
    8683#define DEBUG_MODULE_PNODE              2
    8784#define DEBUG_MODULE_WORLD_ENTITY       2
    8885
    89 #define DEBUG_MODULE_PLAYER             2
    9086#define DEBUG_MODULE_WEAPON             2
    9187

  • trunk/src/lib/graphics/light.cc

    r5212 r5357  
    1616*/
    1717
    18 #define DEBUG_SPECIAL_MODULE DEBUG_MODULE_LIGHT
     18#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_GRAPHICS
    1919
    2020#include "light.h"

  • trunk/src/lib/graphics/text_engine/font.cc

    r5347 r5357  
    1414*/
    1515
    16 #define DEBUG_SPECIAL_MODULE DEBUG_MODULE_FONT
     16#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_GRAPHICS
    1717
    1818#include "font.h"

  • trunk/src/lib/graphics/text_engine/text.cc

    r5345 r5357  
    1414*/
    1515
    16 #define DEBUG_SPECIAL_MODULE DEBUG_MODULE_FONT
     16#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_GRAPHICS
    1717
    1818#include "text.h"

  • trunk/src/lib/graphics/text_engine/text_engine.cc

    r5347 r5357  
    2020*/
    2121
    22 #define DEBUG_SPECIAL_MODULE DEBUG_MODULE_FONT
     22#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_GRAPHICS
    2323
    2424#include "text_engine.h"

  • trunk/src/lib/particles/particle_emitter.cc

    r4836 r5357  
    1414*/
    1515
    16 #define DEBUG_SPECIAL_MODULE DEBUG_MODULE_PARTICLE
     16#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_GRAPHICS
    1717
    1818#include "particle_emitter.h"

  • trunk/src/lib/particles/particle_engine.cc

    r5115 r5357  
    1414*/
    1515
    16 #define DEBUG_SPECIAL_MODULE DEBUG_MODULE_PARTICLE
     16#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_GRAPHICS
    1717
    1818#include "particle_engine.h"

  • trunk/src/lib/particles/particle_system.cc

    r5155 r5357  
    1414*/
    1515
    16 #define DEBUG_SPECIAL_MODULE DEBUG_MODULE_PARTICLE
     16#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_GRAPHICS
    1717
    1818#include "particle_system.h"

  • trunk/src/lib/physics/fields/field.cc

    r4836 r5357  
    1414*/
    1515
    16 //#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_
     16#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_PHYSICS
    1717
    1818#include "field.h"

  • trunk/src/lib/physics/fields/gravity.cc

    r4836 r5357  
    1414*/
    1515
    16 //#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_
     16#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_PHYSICS
    1717
    1818#include "gravity.h"

  • trunk/src/lib/physics/fields/point_gravity.cc

    r4836 r5357  
    1414*/
    1515
    16 //#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_
     16#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_PHYSICS
    1717
    1818#include "point_gravity.h"

  • trunk/src/lib/physics/fields/twirl.cc

    r4836 r5357  
    1414*/
    1515
    16 //#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_
     16#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_PHYSICS
    1717
    1818#include "twirl.h"

  • trunk/src/lib/physics/physics_connection.cc

    r5155 r5357  
    1414*/
    1515
    16 //#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_
     16#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_PHYSICS
    1717
    1818#include "physics_connection.h"

  • trunk/src/util/fast_factory.h

    r5355 r5357  
    139139tFastFactory<T>* tFastFactory<T>::getFastFactory(ClassID classID, const char* fastFactoryName)
    140140{
    141   printf("cool\n");
    142141  tFastFactory<T>* tmpFac = NULL;
    143142  if (FastFactory::getFirst() != NULL)

  • trunk/src/util/loading/factory.h

    r5356 r5357  
    8484tFactory<T>::tFactory(const char* factoryName) : Factory(factoryName)
    8585{
    86  printf("Class: %s loadable\n", this->getName());
     86  PRINTF(4)("Class: %s loadable\n", this->getName());
    8787}
    8888

  • trunk/src/world_entities/camera.cc

    r5354 r5357  
    1515   co-programmer: ...
    1616*/
     17#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_WORLD_ENTITY
    1718
    1819#include "camera.h"

  • trunk/src/world_entities/environment.cc

    r5308 r5357  
    1515   co-programmer:
    1616*/
     17#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_WORLD_ENTITY
    1718
    1819

  • trunk/src/world_entities/npc.cc

    r5266 r5357  
    1515   co-programmer:
    1616*/
     17#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_WORLD_ENTITY
    1718
    1819

  • trunk/src/world_entities/npc2.cc

    r5333 r5357  
    1515   co-programmer:
    1616*/
     17#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_WORLD_ENTITY
    1718
    1819

  • trunk/src/world_entities/player.cc

    r5355 r5357  
    1414*/
    1515
    16 #define DEBUG_SPECIAL_MODULE DEBUG_MODULE_PLAYER
     16#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_WORLD_ENTITY
    1717
    1818#include "player.h"

  • trunk/src/world_entities/satellite.cc

    r5302 r5357  
    1515   co-programmer:
    1616*/
     17#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_WORLD_ENTITY
    1718
    1819

  • trunk/src/world_entities/skybox.cc

    r5356 r5357  
    1 
    21/*
    32   orxonox - the future of 3D-vertical-scrollers
    … …  
    1716#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_WORLD_ENTITY
    1817
    19 
    2018#include "skybox.h"
    2119
    2220#include "load_param.h"
    2321#include "factory.h"
    24 #include "list.h"
    2522
    2623using namespace std;
     24
    2725CREATE_FACTORY(SkyBox);
    2826
    2927/**
    30  *  Constructs a SkyBox and takes fileName as a map.
     28 * Constructs a SkyBox and takes fileName as a map.
    3129 * @param fileName the file to take as input for the SkyBox
    3230*/

  • trunk/src/world_entities/skybox.h

    r5039 r5357  
    11/*!
    22 * @file skybox.h
    3   *  Definition of the SkyBox, that handles the Display of an atmosphere for orxonox.
    4 
    5    A SkyBox is always centered at the current working Camera, and will only obey the cameras
    6    movment but not its rotation.
     3 *  Definition of the SkyBox, that handles the Display of an atmosphere for orxonox.
     4 *
     5 * A SkyBox is always centered at the current working Camera, and will only obey the cameras
     6 * movment but not its rotation.
    77*/
    88
    … …  
    1414
    1515/* FORWARD DEFINITION */
    16 class Material;
    17 class Vector;
    1816
    1917//! A Class to handle a SkyBox
    … …  
    2624  virtual ~SkyBox();
    2725
     26  void init();
    2827  void preInit();
    2928
    … …  
    3534  void setSize(float size);
    3635  /** assumes jpg as input-format */
    37   void setTexture(const char* name) { setTextureAndType (name, "jpg"); };
     36  void setTexture(const char* name) { this->setTextureAndType (name, "jpg"); };
    3837
    3938  void setTextureAndType(const char* name, const char* extension);

  • trunk/src/world_entities/terrain.cc

    r5356 r5357  
    1313   co-programmer: ...
    1414*/
     15#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_WORLD_ENTITY
    1516
    1617
    … …  
    2728/**
    2829 *  standard constructor
    29 
    30 */
     30 */
    3131Terrain::Terrain (const TiXmlElement* root)
    3232{

  • trunk/src/world_entities/terrain.h

    r5308 r5357  
    1313#include "world_entity.h"
    1414
    15 // FORWARD DEFINITION \\
    16 class TiXmlElement;
     15// FORWARD DEFINITION
    1716class SpatialSeparation;
    1817

  • trunk/src/world_entities/test_entity.cc

    r5285 r5357  
    1515   co-programmer:
    1616*/
     17#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_WORLD_ENTITY
    1718
    1819

  • trunk/src/world_entities/weapons/crosshair.cc

    r5280 r5357  
    1414*/
    1515
    16 //#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_
     16#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_WEAPON
    1717
    1818#include "crosshair.h"

  • trunk/src/world_entities/weapons/projectile.cc

    r5063 r5357  
    1515   co-programmer:
    1616*/
    17 
     17#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_WEAPON
    1818
    1919#include "projectile.h"

  • trunk/src/world_entities/weapons/test_bullet.cc

    r5257 r5357  
    1515   co-programmer:
    1616*/
    17 
     17#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_WEAPON
    1818
    1919#include "test_bullet.h"

  • trunk/src/world_entities/weapons/test_gun.cc

    r5356 r5357  
    1919   @todo: a target to set/hit
    2020*/
    21 
     21#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_WEAPON
    2222
    2323#include "test_gun.h"

  • trunk/src/world_entities/weapons/turret.cc

    r5356 r5357  
    1313   co-programmer:
    1414*/
    15 
     15#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_WEAPON
    1616
    1717#include "turret.h"

  • trunk/src/world_entities/weapons/weapon.cc

    r5356 r5357  
    169169void Weapon::prepareProjectiles(unsigned int count)
    170170{
    171   if (this->projectileFactory != NULL)
     171  if (likely(this->projectileFactory != NULL))
    172172    projectileFactory->prepare(count);
    173173  else
    174     PRINTF(2)("unable to create %d projectile for Weapon %s\n", count, this->getName());
     174    PRINTF(2)("unable to create %d projectile for Weapon %s (%s)\n", count, this->getName(), this->getClassName());
    175175}
    176176
    … …  
    181181Projectile* Weapon::getProjectile()
    182182{
    183   if (this->projectileFactory)
     183  if (likely (this->projectileFactory != NULL))
    184184    return dynamic_cast<Projectile*>(this->projectileFactory->resurrect());
    185185  else
    186186  {
    187     PRINTF(2)("No projectile defined for Weapon %s cant return any\n", this->getName());
     187    PRINTF(2)("No projectile defined for Weapon %s(%s) cant return any\n", this->getName(), this->getClassName());
    188188    return NULL;
    189189  }
Note: See TracChangeset for help on using the changeset viewer.