Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 5720


Ignore:
Timestamp:
Aug 31, 2009, 5:03:29 PM (15 years ago)
Author:
landauf
Message:

moved overlays to modules

Location:
code/branches/libraries2/src
Files:
1 added
8 edited
1 copied
10 moved

Legend:

Unmodified
Added
Removed

  • code/branches/libraries2/src/modules/CMakeLists.txt

    r5719 r5720  
    2121
    2222ADD_SUBDIRECTORY(gamestates)
     23ADD_SUBDIRECTORY(overlays)

  • code/branches/libraries2/src/modules/overlays/CMakeLists.txt

    r5714 r5720  
    1 ADD_SOURCE_FILES(ORXONOX_SRC_FILES
    2   OrxonoxOverlay.cc
    3   OverlayGroup.cc
    4 )
    5 
    61SET_SOURCE_FILES(OVERLAYS_SRC_FILES
    72  OverlayText.cc
    … …  
    1914  DEFINE_SYMBOL
    2015    "OVERLAYS_SHARED_BUILD"
    21   PCH_FILE
    22     ../OrxonoxPrecompiledHeaders.h
    2316  LINK_LIBRARIES
    2417    orxonox

  • code/branches/libraries2/src/modules/overlays/GUIOverlay.h

    r5714 r5720  
    3333
    3434#include <string>
    35 #include "OrxonoxOverlay.h"
     35#include "overlays/OrxonoxOverlay.h"
    3636
    3737namespace orxonox

  • code/branches/libraries2/src/modules/overlays/OverlayText.h

    r5714 r5720  
    3535#include "util/Math.h"
    3636#include "util/OgreForwardRefs.h"
    37 #include "OrxonoxOverlay.h"
     37#include "overlays/OrxonoxOverlay.h"
    3838
    3939namespace orxonox

  • code/branches/libraries2/src/orxonox/objects/quest/QuestEffectBeacon.cc

    r3280 r5720  
    3737#include "core/XMLPort.h"
    3838#include "core/EventIncludes.h"
    39 #include "orxonox/objects/worldentities/pawns/Pawn.h"
    40 #include "orxonox/objects/worldentities/triggers/PlayerTrigger.h"
     39#include "objects/worldentities/pawns/Pawn.h"
     40#include "objects/worldentities/triggers/PlayerTrigger.h"
    4141#include "QuestEffect.h"
    4242
    … …  
    5252    {
    5353        RegisterObject(QuestEffectBeacon);
    54        
     54
    5555        this->status_ = QuestEffectBeaconStatus::Active;
    5656        this->times_ = INFINITE_TIME;
    … …  
    6363    {
    6464    }
    65    
     65
    6666    /**
    6767    @brief
    … …  
    7474        XMLPortParam(QuestEffectBeacon, "times", setTimes, getTimes, xmlelement, mode);
    7575        XMLPortObject(QuestEffectBeacon, QuestEffect, "effects", addEffect, getEffect, xmlelement, mode);
    76        
     76
    7777        COUT(3) << "New QuestEffectBeacon created." << std::endl;
    7878    }
    79    
     79
    8080    /**
    8181    @brief
    … …  
    8585    {
    8686        SUPER(QuestEffectBeacon, processEvent, event);
    87    
     87
    8888        ORXONOX_SET_SUBCLASS_EVENT(QuestEffectBeacon, "execute", execute, event, PlayerTrigger);
    8989    }
    90    
     90
    9191    /**
    9292    @brief
    … …  
    109109            return false;
    110110        }
    111        
     111
    112112        if(!trigger->isForPlayer()) //!< The PlayerTrigger is not exclusively for ControllableEntities which means we cannot extract one.
    113113        {
    … …  
    123123            return false;
    124124        }
    125        
     125
    126126        //! Extract the PlayerInfo from the ControllableEntity.
    127127        PlayerInfo* player = pawn->getPlayer();
    128        
     128
    129129        if(player == NULL)
    130130        {
    … …  
    144144        return false;
    145145    }
    146    
     146
    147147    /**
    148148    @brief
    … …  
    159159            return false;
    160160        }
    161        
     161
    162162        if(activate)
    163163        {
    … …  
    165165        return true;
    166166        }
    167        
     167
    168168        this->status_ = QuestEffectBeaconStatus::Inactive;
    169169        return true;
    170170    }
    171    
     171
    172172    /**
    173173    @brief
    … …  
    186186            return true;
    187187        }
    188        
     188
    189189        this->times_ = this->times_ - 1; //!< Decrement number of times the QuestEffectBeacon can be executed.
    190190        if(this->getTimes() == 0) //!< Set the QuestEffectBeacon to inactive when the number of times it can be executed is reduced to 0.
    … …  
    192192            this->status_ = QuestEffectBeaconStatus::Inactive;
    193193        }
    194        
    195         return true;
    196     }
    197    
     194
     195        return true;
     196    }
     197
    198198    /**
    199199    @brief
    … …  
    212212            return false;
    213213        }
    214        
     214
    215215        this->times_ = n;
    216216        return true;
    217217    }
    218    
     218
    219219    /**
    220220    @brief
    … …  
    238238        return true;
    239239    }
    240    
     240
    241241    /**
    242242    @brief

  • code/branches/libraries2/src/orxonox/objects/quest/QuestEffectBeacon.h

    r5693 r5720  
    3838
    3939#include <list>
    40 #include "orxonox/objects/worldentities/StaticEntity.h"
     40#include "objects/worldentities/StaticEntity.h"
    4141
    4242namespace orxonox

  • code/branches/libraries2/src/orxonox/objects/quest/notifications/NotificationOverlay.h

    r5693 r5720  
    3939
    4040#include <string>
    41 #include "orxonox/overlays/OverlayText.h"
     41#include "overlays/OverlayText.h"
    4242
    4343namespace orxonox

  • code/branches/libraries2/src/orxonox/objects/worldentities/triggers/DistanceTrigger.cc

    r3325 r5720  
    3131#include "core/CoreIncludes.h"
    3232#include "core/XMLPort.h"
    33 #include "orxonox/objects/worldentities/pawns/Pawn.h"
     33#include "objects/worldentities/pawns/Pawn.h"
    3434
    3535namespace orxonox

  • code/branches/libraries2/src/orxonox/overlays/CMakeLists.txt

    r5693 r5720  
    33  OverlayGroup.cc
    44)
    5 
    6 SET_SOURCE_FILES(OVERLAYS_SRC_FILES
    7   OverlayText.cc
    8   FadeoutText.cc
    9   GUIOverlay.cc
    10 )
    11 
    12 ADD_SUBDIRECTORY(debug)
    13 ADD_SUBDIRECTORY(hud)
    14 ADD_SUBDIRECTORY(stats)
    15 
    16 ORXONOX_ADD_LIBRARY(overlays
    17   MODULE
    18   FIND_HEADER_FILES
    19   DEFINE_SYMBOL
    20     "OVERLAYS_SHARED_BUILD"
    21   PCH_FILE
    22     ../OrxonoxPrecompiledHeaders.h
    23   LINK_LIBRARIES
    24     orxonox
    25   SOURCE_FILES ${OVERLAYS_SRC_FILES}
    26 )

  • code/branches/libraries2/src/orxonox/sound/SoundBase.cc

    r5695 r5720  
    3737#include "core/Core.h"
    3838#include "core/Resource.h"
    39 #include "orxonox/objects/worldentities/WorldEntity.h"
     39#include "objects/worldentities/WorldEntity.h"
    4040#include "SoundManager.h"
    4141
    42 namespace orxonox 
     42namespace orxonox
    4343{
    4444    SoundBase::SoundBase(WorldEntity* entity)

  • code/branches/libraries2/src/orxonox/sound/SoundManager.cc

    r3370 r5720  
    3232
    3333#include "util/Math.h"
    34 #include "orxonox/CameraManager.h"
    35 #include "orxonox/objects/worldentities/Camera.h"
     34#include "CameraManager.h"
     35#include "objects/worldentities/Camera.h"
    3636#include "SoundBase.h"
    3737
    … …  
    146146        Vector3 at = orient.zAxis();
    147147
    148         ALfloat orientation[6] = { at.x, at.y, at.z, 
     148        ALfloat orientation[6] = { at.x, at.y, at.z,
    149149                                 up.x, up.y, up.z };
    150150
    … …  
    158158            (*i)->update();
    159159    }
    160    
     160
    161161    /**
    162162    * Check if sound is available
Note: See TracChangeset for help on using the changeset viewer.