Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 3519 in orxonox.OLD


Ignore:
Timestamp:
Mar 12, 2005, 1:26:46 PM (19 years ago)
Author:
bensch
Message:

orxonox/branches/trackManager: merged trunk back to trackManager (again)
merged with command:
svn merge ../trunk/ trackManager/ -r 3498:HEAD
no conflicts

Location:
orxonox/branches/trackManager/src
Files:
12 edited

Legend:

Unmodified
Added
Removed

  • orxonox/branches/trackManager/src/Makefile.in

    r3500 r3519  
    315315          esac; \
    316316        done; \
    317         echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/Makefile'; \
     317        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/Makefile'; \
    318318        cd $(top_srcdir) && \
    319           $(AUTOMAKE) --gnu  src/Makefile
     319          $(AUTOMAKE) --foreign  src/Makefile
    320320.PRECIOUS: Makefile
    321321Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

  • orxonox/branches/trackManager/src/defs/debug.h

    r3498 r3519  
    4646#define PRINTF1 \
    4747    if (verbose >= ERR) \
    48       printf("%s:%d::ERROR:", __FILE__, __LINE__) && printf
     48      printf("ERROR::%s:%d:", __FILE__, __LINE__) && printf
    4949#else
    5050#define PRINTF1 if (NO)
    … …  
    5454#define PRINTF2 \
    5555     if (verbose >= WARN) \
    56        printf("%s:%d::WARNING:", __FILE__, __LINE__) && printf
     56       printf("WARNING::%s:%d:", __FILE__, __LINE__) && printf
    5757         
    5858#else
    … …  
    6363#define PRINTF3 \
    6464     if (verbose >= INFO) \
    65        printf("%s:%d::INFO:", __FILE__, __LINE__) && printf
     65       printf("INFO::%s:%d:", __FILE__, __LINE__) && printf
    6666#else
    6767#define PRINTF3 if (NO)
    … …  
    7171#define PRINTF4 \
    7272     if (verbose >= DEBUGING) \
    73        printf("%s:%d::DEBUG:", __FILE__, __LINE__) && printf
     73       printf("DEBUG::%s:%d:", __FILE__, __LINE__) && printf
    7474#else
    7575#define PRINTF4 if (NO)

  • orxonox/branches/trackManager/src/lib/Makefile.in

    r3498 r3519  
    181181          esac; \
    182182        done; \
    183         echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/lib/Makefile'; \
     183        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/lib/Makefile'; \
    184184        cd $(top_srcdir) && \
    185           $(AUTOMAKE) --gnu  src/lib/Makefile
     185          $(AUTOMAKE) --foreign  src/lib/Makefile
    186186.PRECIOUS: Makefile
    187187Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

  • orxonox/branches/trackManager/src/lib/coord/p_node.cc

    r3498 r3519  
    304304void PNode::setParent (PNode* parent)
    305305{
    306   this->parent = parent;
     306  parent->addChild(this);
    307307}
    308308

  • orxonox/branches/trackManager/src/lib/graphics/Makefile.in

    r3498 r3519  
    175175          esac; \
    176176        done; \
    177         echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/lib/graphics/Makefile'; \
     177        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/lib/graphics/Makefile'; \
    178178        cd $(top_srcdir) && \
    179           $(AUTOMAKE) --gnu  src/lib/graphics/Makefile
     179          $(AUTOMAKE) --foreign  src/lib/graphics/Makefile
    180180.PRECIOUS: Makefile
    181181Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

  • orxonox/branches/trackManager/src/lib/graphics/importer/Makefile.in

    r3498 r3519  
    215215          esac; \
    216216        done; \
    217         echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/lib/graphics/importer/Makefile'; \
     217        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/lib/graphics/importer/Makefile'; \
    218218        cd $(top_srcdir) && \
    219           $(AUTOMAKE) --gnu  src/lib/graphics/importer/Makefile
     219          $(AUTOMAKE) --foreign  src/lib/graphics/importer/Makefile
    220220.PRECIOUS: Makefile
    221221Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

  • orxonox/branches/trackManager/src/lib/gui/Makefile.in

    r3498 r3519  
    177177          esac; \
    178178        done; \
    179         echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/lib/gui/Makefile'; \
     179        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/lib/gui/Makefile'; \
    180180        cd $(top_srcdir) && \
    181           $(AUTOMAKE) --gnu  src/lib/gui/Makefile
     181          $(AUTOMAKE) --foreign  src/lib/gui/Makefile
    182182.PRECIOUS: Makefile
    183183Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

  • orxonox/branches/trackManager/src/lib/gui/console/Makefile.in

    r3498 r3519  
    203203          esac; \
    204204        done; \
    205         echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/lib/gui/console/Makefile'; \
     205        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/lib/gui/console/Makefile'; \
    206206        cd $(top_srcdir) && \
    207           $(AUTOMAKE) --gnu  src/lib/gui/console/Makefile
     207          $(AUTOMAKE) --foreign  src/lib/gui/console/Makefile
    208208.PRECIOUS: Makefile
    209209Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

  • orxonox/branches/trackManager/src/lib/gui/gui/Makefile.in

    r3498 r3519  
    236236          esac; \
    237237        done; \
    238         echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/lib/gui/gui/Makefile'; \
     238        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/lib/gui/gui/Makefile'; \
    239239        cd $(top_srcdir) && \
    240           $(AUTOMAKE) --gnu  src/lib/gui/gui/Makefile
     240          $(AUTOMAKE) --foreign  src/lib/gui/gui/Makefile
    241241.PRECIOUS: Makefile
    242242Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

  • orxonox/branches/trackManager/src/story_entities/world.cc

    r3518 r3519  
    7373  this->localCamera->destroy();
    7474  this->nullParent->destroy(); 
    75   delete this->skySphere;
     75  //delete this->skySphere;
    7676
    7777  //delete this->trackManager;
    … …  
    116116      trackManager->addPoint(Vector(30,0,5));
    117117      trackManager->addPoint(Vector(40,0,5));
    118       trackManager->setDuration(20);
     118      trackManager->setDuration(4);
    119119      int fork11, fork12, fork13;
    120120      trackManager->fork(3, &fork11, &fork12, &fork13);
    … …  
    123123      trackManager->addPoint(Vector(100, 0, -15));
    124124      trackManager->addPoint(Vector(300, 0, -15));
    125       trackManager->setDuration(4);
     125      trackManager->setDuration(10);
    126126      trackManager->workOn(fork12);
    127127      trackManager->addPoint(Vector(70,  0, 0));
    … …  
    191191            this->localCamera->bind (myPlayer);
    192192            //this->localPlayer->addChild (this->localCamera);
     193            /*monitor progress*/
     194            this->glmis->step();           
    193195
    194196            // Create SkySphere
    195197            skySphere = new Skysphere("../data/pictures/sky-replace.jpg");
     198            this->localPlayer->addChild(this->skySphere);
    196199
    197200            /*monitor progress*/
    … …  
    240243            // Create SkySphere
    241244            skySphere = new Skysphere("../data/pictures/sky-replace.jpg");
     245            this->localPlayer->addChild(this->skySphere);
    242246
    243247            break;
    … …  
    731735          entity = entities->nextElement();
    732736        }
    733       skySphere->updatePosition(localCamera->absCoordinate);
     737      //skySphere->updatePosition(localCamera->absCoordinate);
    734738     
    735739      /* update tick the rest */

  • orxonox/branches/trackManager/src/world_entities/skysphere.cc

    r3498 r3519  
    4141}
    4242
     43
    4344/**
    4445   \brief Constructs a SkySphere and takes fileName as a map.
    … …  
    4950  initialize(fileName);
    5051}
     52
    5153
    5254/**
    … …  
    5961  free(sphereObj);
    6062}
     63
    6164
    6265/**
    … …  
    7982
    8083/**
    81    \brief sets the Radius of the Sphere.
    82    \param radius The Radius of The Sphere
    83 */
    84 void Skysphere::setRadius(float radius)
    85 {
    86   this->sphereRadius = radius;
    87 }
    88 
    89 
    90 /**
    9184   \brief Defines which texture should be loaded onto the skysphere.
    9285   \param fileName The filename of the Texture
    … …  
    9588{
    9689  this->skyMaterial->setDiffuseMap(fileName);
    97 }
    98 
    99 
    100 /**
    101    \brief updates the position of the Skysphere
    102    \param sphereCenter The coordinate of the Center of the Sphere
    103    
    104    This is normally done in the update-phase of world, so the Skysphere is always centered at the Camera.
    105 */
    106 void Skysphere::updatePosition(Vector sphereCenter)
    107 {
    108   this->sphereCenter = sphereCenter;
    10990}
    11091
    … …  
    120101  skyMaterial->select();
    121102  glPushMatrix();
    122   glTranslatef(this->sphereCenter.x,this->sphereCenter.y,this->sphereCenter.z);
    123  
    124   glRotatef(-30, 1, 0, 0);
    125   glRotatef(95.0f, 0.0f, 0.0f, 1.0f);
    126   glRotatef(-250.0f, 0.0, 1.0f, 0.0f);
     103  glTranslatef(this->absCoordinate.x,
     104               this->absCoordinate.y,
     105               this->absCoordinate.z);
     106
     107  //glRotatef(-30, 1, 0, 0);
     108  //glRotatef(95.0f, 0.0f, 0.0f, 1.0f);
     109  //glRotatef(-250.0f, 0.0, 1.0f, 0.0f);
    127110 
    128111  gluSphere(sphereObj, sphereRadius, 20, 20);
    … …  
    130113  glDisable(GL_TEXTURE_2D);
    131114}
     115
     116
     117/**
     118   \brief sets the Radius of the Sphere.
     119   \param radius The Radius of The Sphere
     120*/
     121void Skysphere::setRadius(float radius)
     122{
     123  this->sphereRadius = radius;
     124}

  • orxonox/branches/trackManager/src/world_entities/skysphere.h

    r3498 r3519  
    1515/* INCLUDES */
    1616#include "p_node.h"
     17#include "world_entity.h"
    1718
    1819/* FORWARD DEFINITION */
    … …  
    2122
    2223//! A Class to handle a SkySphere
    23 class Skysphere : public PNode
     24class Skysphere : public WorldEntity
    2425{
    2526
    … …  
    3233  void setTexture(char* fileName);
    3334
    34   void updatePosition(Vector sphereCenter);
    35   void draw();
     35  virtual void draw();
    3636
    3737 private:
    3838  GLUquadricObj *sphereObj; //!< A Placeholder for the SkySphere.
    3939  Material *skyMaterial;    //!< A Material for the SkySphere.
    40   Vector sphereCenter;      //!< Center of the SkySphere.
    4140  float sphereRadius;       //!< Radius of the SkySphere. This should match the frustum maximum range.
    42 
    43 
     41   
    4442  void initialize(char* fileName); 
    4543};
Note: See TracChangeset for help on using the changeset viewer.