Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 4438 in orxonox.OLD


Ignore:
Timestamp:
Jun 1, 2005, 8:15:59 PM (19 years ago)
Author:
patrick
Message:

orxonox/trunk: pilot node correction in control speed

Location:
orxonox/trunk/src
Files:
15 edited

Legend:

Unmodified
Added
Removed

  • orxonox/trunk/src/Makefile.in

    r4432 r4438  
    426426          esac; \
    427427        done; \
    428         echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/Makefile'; \
     428        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/Makefile'; \
    429429        cd $(top_srcdir) && \
    430           $(AUTOMAKE) --gnu  src/Makefile
     430          $(AUTOMAKE) --foreign  src/Makefile
    431431.PRECIOUS: Makefile
    432432Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

  • orxonox/trunk/src/lib/Makefile.in

    r4432 r4438  
    185185          esac; \
    186186        done; \
    187         echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/lib/Makefile'; \
     187        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/lib/Makefile'; \
    188188        cd $(top_srcdir) && \
    189           $(AUTOMAKE) --gnu  src/lib/Makefile
     189          $(AUTOMAKE) --foreign  src/lib/Makefile
    190190.PRECIOUS: Makefile
    191191Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

  • orxonox/trunk/src/lib/coord/pilot_node.cc

    r4424 r4438  
    3434   this->setClassID(CL_PILOT_PARENT, "PilotNode");
    3535
    36    travelSpeed = 60.0;
     36   travelSpeed = 30.0;
    3737   velocity = new Vector();
    3838   bUp = bDown = bLeft = bRight = false;
    … …  
    6666  /* FIXME: calculating the direction and orthDirection every timeSlice is redundant! save it somewhere */
    6767  /* calculate the direction in which the craft is heading  */
    68   Vector direction (1.0, 0.0, 0.0);
     68  //Vector direction (1.0, 0.0, 0.0);
    6969  //direction = this->absDirection.apply (direction);
    70   Vector orthDirection (0.0, 0.0, 1.0);
     70  //Vector orthDirection (0.0, 0.0, 1.0);
    7171  //orthDirection = orthDirection.cross (direction);
    7272
    73   if( this->bUp)
    74     accel = accel+(direction*acceleration);
    75   if( this->bDown)
    76     accel = accel -(direction*acceleration);
    77   if( this->bLeft)
    78     accel = accel - (orthDirection*acceleration);
    79   if( this->bRight)
    80     accel = accel + (orthDirection*acceleration);
     73   Quaternion q = this->getAbsDir();
     74   Vector direction(1,0,0);
     75   direction = q.apply(direction);
    8176
    82   Vector move = accel * time;
    83   this->shiftCoor (move);
     77   
    8478
    85   Quaternion q1(M_PI/4 * this->pitch/400.0, Vector(1,0,0));
    86   this->shiftDir(q1);
     79   Vector orthDirection(0,0,1);
     80   orthDirection = q.apply(orthDirection);
     81   
     82   if( this->bUp)
     83     accel = accel+(direction*acceleration);
     84   if( this->bDown)
     85     accel = accel -(direction*acceleration);
     86   if( this->bLeft)
     87     accel = accel - (orthDirection*acceleration);
     88   if( this->bRight)
     89     accel = accel + (orthDirection*acceleration);
     90   
     91   Vector move = accel * time;
     92   this->shiftCoor (move);
     93   
     94   Quaternion q1(-M_PI/4 * this->roll/40000.0, Vector(0,0,1));
     95   Quaternion q2(-M_PI/4 * this->pitch/30000.0, Vector(0,1,0));
     96   //this->shiftDir(q1*q2);
     97   this->shiftDir(q1*q2);
    8798}
    8899
    … …  
    108119  else if( event.type == EV_MOUSE_MOTION)
    109120    {
    110       PRINTF(0)("Mouse moved by %d,%d to (%d,%d)\n", event.xRel, event.yRel,
    111             event.x, event.y);
    112121      this->pitch = event.x - 400;
    113122      this->roll = event.y - 300;

  • orxonox/trunk/src/lib/graphics/Makefile.in

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

  • orxonox/trunk/src/lib/graphics/importer/Makefile.in

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

  • orxonox/trunk/src/lib/gui/Makefile.in

    r4432 r4438  
    241241          esac; \
    242242        done; \
    243         echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/lib/gui/Makefile'; \
     243        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/lib/gui/Makefile'; \
    244244        cd $(top_srcdir) && \
    245           $(AUTOMAKE) --gnu  src/lib/gui/Makefile
     245          $(AUTOMAKE) --foreign  src/lib/gui/Makefile
    246246.PRECIOUS: Makefile
    247247Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

  • orxonox/trunk/src/lib/particles/Makefile.in

    r4432 r4438  
    209209          esac; \
    210210        done; \
    211         echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/lib/particles/Makefile'; \
     211        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/lib/particles/Makefile'; \
    212212        cd $(top_srcdir) && \
    213           $(AUTOMAKE) --gnu  src/lib/particles/Makefile
     213          $(AUTOMAKE) --foreign  src/lib/particles/Makefile
    214214.PRECIOUS: Makefile
    215215Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

  • orxonox/trunk/src/lib/physics/Makefile.in

    r4432 r4438  
    217217          esac; \
    218218        done; \
    219         echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/lib/physics/Makefile'; \
     219        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/lib/physics/Makefile'; \
    220220        cd $(top_srcdir) && \
    221           $(AUTOMAKE) --gnu  src/lib/physics/Makefile
     221          $(AUTOMAKE) --foreign  src/lib/physics/Makefile
    222222.PRECIOUS: Makefile
    223223Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

  • orxonox/trunk/src/lib/tinyxml/Makefile.in

    r4432 r4438  
    204204          esac; \
    205205        done; \
    206         echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/lib/tinyxml/Makefile'; \
     206        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/lib/tinyxml/Makefile'; \
    207207        cd $(top_srcdir) && \
    208           $(AUTOMAKE) --gnu  src/lib/tinyxml/Makefile
     208          $(AUTOMAKE) --foreign  src/lib/tinyxml/Makefile
    209209.PRECIOUS: Makefile
    210210Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

  • orxonox/trunk/src/story_entities/world.cc

    r4434 r4438  
    645645        this->pilotNode->addChild(this->localPlayer);
    646646        this->pilotNode->addChild(this->localCamera);
    647         this->localCamera->lookAt(this->pilotNode);
     647        this->localCamera->lookAt(this->localPlayer);
    648648
    649649        this->eventHandler->subscribe(this->pilotNode, ES_GAME, KeyMapper::PEV_UP);

  • orxonox/trunk/src/subprojects/Makefile.in

    r4432 r4438  
    186186          esac; \
    187187        done; \
    188         echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/subprojects/Makefile'; \
     188        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/subprojects/Makefile'; \
    189189        cd $(top_srcdir) && \
    190           $(AUTOMAKE) --gnu  src/subprojects/Makefile
     190          $(AUTOMAKE) --foreign  src/subprojects/Makefile
    191191.PRECIOUS: Makefile
    192192Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

  • orxonox/trunk/src/subprojects/gui/Makefile.in

    r4432 r4438  
    229229          esac; \
    230230        done; \
    231         echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/subprojects/gui/Makefile'; \
     231        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/subprojects/gui/Makefile'; \
    232232        cd $(top_srcdir) && \
    233           $(AUTOMAKE) --gnu  src/subprojects/gui/Makefile
     233          $(AUTOMAKE) --foreign  src/subprojects/gui/Makefile
    234234.PRECIOUS: Makefile
    235235Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

  • orxonox/trunk/src/subprojects/importer/Makefile.in

    r4432 r4438  
    228228          esac; \
    229229        done; \
    230         echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/subprojects/importer/Makefile'; \
     230        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/subprojects/importer/Makefile'; \
    231231        cd $(top_srcdir) && \
    232           $(AUTOMAKE) --gnu  src/subprojects/importer/Makefile
     232          $(AUTOMAKE) --foreign  src/subprojects/importer/Makefile
    233233.PRECIOUS: Makefile
    234234Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

  • orxonox/trunk/src/subprojects/particles/Makefile.in

    r4432 r4438  
    257257          esac; \
    258258        done; \
    259         echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/subprojects/particles/Makefile'; \
     259        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/subprojects/particles/Makefile'; \
    260260        cd $(top_srcdir) && \
    261           $(AUTOMAKE) --gnu  src/subprojects/particles/Makefile
     261          $(AUTOMAKE) --foreign  src/subprojects/particles/Makefile
    262262.PRECIOUS: Makefile
    263263Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

  • orxonox/trunk/src/subprojects/testmain/Makefile.in

    r4432 r4438  
    197197          esac; \
    198198        done; \
    199         echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/subprojects/testmain/Makefile'; \
     199        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/subprojects/testmain/Makefile'; \
    200200        cd $(top_srcdir) && \
    201           $(AUTOMAKE) --gnu  src/subprojects/testmain/Makefile
     201          $(AUTOMAKE) --foreign  src/subprojects/testmain/Makefile
    202202.PRECIOUS: Makefile
    203203Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
Note: See TracChangeset for help on using the changeset viewer.