Changeset 361 in flair-src


Ignore:
Timestamp:
Jun 8, 2020, 11:52:29 AM (5 months ago)
Author:
Sanahuja Guillaume
Message:

add ball for Julio

Location:
trunk/lib/FlairSimulator/src
Files:
2 added
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/lib/FlairSimulator/src/Model.cpp

    r167 r361  
    1919#include "Simulator.h"
    2020#include <DoubleSpinBox.h>
     21#include <Vector3DSpinBox.h>
    2122
    2223#ifdef GL
     
    7576}
    7677
     78core::Vector3Df Model::InitialPosition(void) {
     79    return pimpl_->pos_init->Value();
     80}
     81
    7782} // end namespace simulator
    7883} // end namespace flair
  • trunk/lib/FlairSimulator/src/Model.h

    r167 r361  
    9898  double dT(void) const;
    9999  virtual void CalcModel(void) = 0;
     100  core::Vector3Df InitialPosition(void);
    100101#ifdef GL
    101102  FollowMeCamera *getFollowMeCamera(void) const;
  • trunk/lib/FlairSimulator/src/Model_impl.cpp

    r318 r361  
    239239    pos_rel = pos - nodePosition;
    240240    // printf("collision %f %f %f\n",pos.X,pos.Y,pos.Z);
    241     // printf("drone %f %f %f\n",nodePosition.X,nodePosition.Y,nodePosition.Z);
     241    // printf("object %f %f %f\n",nodePosition.X,nodePosition.Y,nodePosition.Z);
    242242    // printf("rel %f %f %f\n",pos_rel.X,pos_rel.Z,pos_rel.Y);
    243243
     
    257257    self->state[-1].Pos = self->state[0].Pos;
    258258    self->state[-2].Pos = self->state[0].Pos;
     259    self->state[0].Vel=0;
     260    self->state[-1].Vel=0;
     261    self->state[-2].Vel=0;
    259262    states_mutex->ReleaseMutex();
    260263  }
  • trunk/lib/FlairSimulator/src/unexported/Model_impl.h

    r286 r361  
    9090  flair::gui::DoubleSpinBox *dT;
    9191  int modelId;
     92  flair::gui::Vector3DSpinBox *pos_init;
    9293
    9394private:
    94   flair::gui::Vector3DSpinBox *pos_init;
    9595  flair::gui::SpinBox *yaw_init;
    9696  flair::gui::CheckBox *enable_opti;
Note: See TracChangeset for help on using the changeset viewer.