Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 7725 in orxonox.OLD for trunk


Ignore:
Timestamp:
May 19, 2006, 11:58:19 AM (19 years ago)
Author:
bensch
Message:

trunk: const Executor introduced

Location:
trunk
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/ChangeLog

    r7223 r7725  
     12006-05-19      Benjamin Grauerb <bensch@orxonox.net>
     2        New Design of the Executor (constant instead of linear time)
     3
     42006-05-18      Patrick Boenzli <patrick@orxonox.net>
     5        Total redesign of the Collision-Detection Engine.
     6
     72006-05-17      Benjamin Grauer <bensch@orxonox.net>
     8        Introduced new QT-style Gui.
     9
    1102006-03-12      orxonox <info@orxonox.net>
    211        Mayor switch to std::string (almost complete)
     
    514         MoviePlayer
    615         HeightMap
    7          New SpaceShip Helicopter and Hover 
     16         New SpaceShip Helicopter and Hover
    817         PowerUps
    918         Water
  • trunk/src/lib/coord/p_node.cc

    r7428 r7725  
    2929
    3030#include "synchronizeable.h"
    31 
    32 using namespace std;
    33 
    3431
    3532/**
     
    595592void PNode::removeNode()
    596593{
    597   list<PNode*>::iterator child = this->children.begin();
    598   list<PNode*>::iterator reparenter;
     594  std::list<PNode*>::iterator child = this->children.begin();
     595  std::list<PNode*>::iterator reparenter;
    599596  while (child != this->children.end())
    600597  {
     
    857854  if(!this->children.empty() && (this->bActive || this->parentMode & PNODE_UPDATE_CHILDREN_IF_INACTIVE ))
    858855  {
    859     list<PNode*>::iterator child;
     856    std::list<PNode*>::iterator child;
    860857    for (child = this->children.begin(); child != this->children.end(); child ++)
    861858    {
     
    888885{
    889886  nodes++;
    890   list<PNode*>::const_iterator child;
     887  std::list<PNode*>::const_iterator child;
    891888  for (child = this->children.begin(); child != this->children.end(); child ++)
    892889    (*child)->countChildNodes(nodes);
     
    928925  if (depth >= 2 || depth == 0)
    929926  {
    930     list<PNode*>::const_iterator child;
     927    std::list<PNode*>::const_iterator child;
    931928    for (child = this->children.begin(); child != this->children.end(); child ++)
    932929    {
     
    10061003    /* rotate the current color in HSV space around 20 degree */
    10071004    Vector childColor =  Color::HSVtoRGB(Color::RGBtoHSV(color)+Vector(20,0,.0));
    1008     list<PNode*>::const_iterator child;
     1005    std::list<PNode*>::const_iterator child;
    10091006    for (child = this->children.begin(); child != this->children.end(); child ++)
    10101007    {
     
    11761173  //   int n = children.size();
    11771174  //   //check if camera is in children
    1178   //   for (std::list<PNode*>::const_iterator it = children.begin(); it!=children.end(); it++)
     1175  //   for (std::std::list<PNode*>::const_iterator it = children.begin(); it!=children.end(); it++)
    11791176  //   {
    11801177  //     if ( (*it)->isA(CL_CAMERA) )
  • trunk/src/lib/coord/p_node.h

    r7221 r7725  
    178178  // DEBUG //
    179179  void countChildNodes(int& nodes) const;
    180   void debugNodeSC (unsigned int depth = 1, unsigned int level = 0) { this->debugNode(depth, level); };
    181180  void debugNode (unsigned int depth = 1, unsigned int level = 0) const;
    182181  void debugDraw(unsigned int depth = 1, float size = 1.0, const Vector& color = Vector(1, 0, 0), unsigned int level = 0) const;
  • trunk/src/lib/shell/some_shell_commands.cc

    r7457 r7725  
    1717 * @file some_shell_commands.cc
    1818 * @brief All the ShellCommands, that should not pollute the SourceCode.
     19 *
     20 * This File is here, so that we do not have to pollute the Library-files
     21 * with unneccessary other modules.
     22 * Like this
    1923 */
    2024
     
    2731
    2832#include "class_list.h"
    29   SHELL_COMMAND_STATIC(debug, ClassList, ClassList::debugS)
     33  SHELL_COMMAND(debug, ClassList, ClassList::debugS)
    3034      ->describe("Shows all registered classes, if param1: is a valid ClassName only values of this class are shown. param2: how much output")
    3135      ->defaultValues(MT_NULL, 1);
    3236
    3337#include "p_node.h"
    34   SHELL_COMMAND(debugNode, PNode, debugNodeSC);
     38  SHELL_COMMAND(debugNode, PNode, debugNode);
    3539  SHELL_COMMAND(setPosition, PNode, setAbsCoor);
    3640
  • trunk/src/lib/util/executor/executor.h

    r7722 r7725  
    7878
    7979#include "executor/executor_functional.h"
     80#define EXECUTOR_FUNCTIONAL_USE_CONST
     81#include "executor/executor_functional.h"
    8082#define EXECUTOR_FUNCTIONAL_USE_STATIC
    8183#include "executor/executor_functional.h"
  • trunk/src/lib/util/executor/executor_functional.h

    r7724 r7725  
    6565 #undef __EXECUTOR_FUNCTIONAL_NAME
    6666 #define __EXECUTOR_FUNCTIONAL_NAME(ParamCount) Executor##ParamCount##Params_const
    67  #undef EXECUTOR_FUNCTIONAL_USE_CONST
    6867#endif
    6968
     
    8079 #define __EXECUTOR_FUNCTIONAL_FUNCTION_POINTER    *functionPointer
    8180
    82 #undef EXECUTOR_FUNCTIONAL_USE_STATIC
    8381#endif /* EXECUTOR_FUNCTIONAL_USE_STATIC */
    8482
     
    426424#undef __EXECUTOR_FUNCTIONAL_FUNCTION_EXEC
    427425#undef __EXECUTOR_FUNCTIONAL_FUNCTION_POINTER
     426
     427#ifdef EXECUTOR_FUNCTIONAL_USE_CONST
     428 #undef EXECUTOR_FUNCTIONAL_USE_CONST
     429#endif
     430#ifdef EXECUTOR_FUNCTIONAL_USE_STATIC
     431 #undef EXECUTOR_FUNCTIONAL_USE_STATIC
     432#endif
Note: See TracChangeset for help on using the changeset viewer.