Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 5693 in orxonox.OLD for trunk


Ignore:
Timestamp:
Nov 22, 2005, 12:53:48 AM (19 years ago)
Author:
patrick
Message:

orxonox: work flush

Location:
trunk/src
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/Makefile.in

    r5691 r5693  
    341341          esac; \
    342342        done; \
    343         echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/Makefile'; \
     343        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/Makefile'; \
    344344        cd $(top_srcdir) && \
    345           $(AUTOMAKE) --gnu  src/Makefile
     345          $(AUTOMAKE) --foreign  src/Makefile
    346346.PRECIOUS: Makefile
    347347Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

  • trunk/src/lib/Makefile.in

    r5691 r5693  
    280280          esac; \
    281281        done; \
    282         echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/lib/Makefile'; \
     282        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/lib/Makefile'; \
    283283        cd $(top_srcdir) && \
    284           $(AUTOMAKE) --gnu  src/lib/Makefile
     284          $(AUTOMAKE) --foreign  src/lib/Makefile
    285285.PRECIOUS: Makefile
    286286Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

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

    r5687 r5693  
    219219          esac; \
    220220        done; \
    221         echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/lib/collision_detection/Makefile'; \
     221        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/lib/collision_detection/Makefile'; \
    222222        cd $(top_srcdir) && \
    223           $(AUTOMAKE) --gnu  src/lib/collision_detection/Makefile
     223          $(AUTOMAKE) --foreign  src/lib/collision_detection/Makefile
    224224.PRECIOUS: Makefile
    225225Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

  • trunk/src/lib/collision_detection/bv_tree.cc

    r4836 r5693  
    2121
    2222
     23
    2324/**
    2425 *  standard constructor

  • trunk/src/lib/collision_detection/obb_tree_node.cc

    r5692 r5693  
    5151  this->bvElement = NULL;
    5252
    53   if(OBBTreeNode::coMat == NULL)
     53  if( OBBTreeNode::coMat == NULL)
    5454  {
    5555    OBBTreeNode::coMat = new float*[4];
    … …  
    5757      OBBTreeNode::coMat[i] = new float[4];
    5858  }
    59   if(OBBTreeNode::eigvMat == NULL)
     59  if( OBBTreeNode::eigvMat == NULL)
    6060  {
    6161    OBBTreeNode::eigvMat = new float*[4];
    62     for(int i = 0; i < 4; i++)
     62    for( int i = 0; i < 4; i++)
    6363      OBBTreeNode::eigvMat[i] = new float[4];
    6464  }
    … …  
    7070    OBBTreeNode::rotCount = new int;
    7171
    72   if (OBBTreeNode_sphereObj == NULL)
     72  if( OBBTreeNode_sphereObj == NULL)
    7373    OBBTreeNode_sphereObj = gluNewQuadric();
    7474}

  • trunk/src/lib/collision_detection/obb_tree_node.h

    r5688 r5693  
    4545    void calculateBoxEigenvectors(OBB* box, const sVec3D* verticesList, unsigned int length);
    4646    void calculateBoxAxis(OBB* box, const sVec3D* verticesList, unsigned int length);
    47    
     47
    4848    void calculateBoxCovariance(OBB* box, const modelInfo& modInfo);
    4949    void calculateBoxEigenvectors(OBB* box, const modelInfo& modInfo);
    5050    void calculateBoxAxis(OBB* box, const modelInfo& modInfo);
    5151
    52    
     52
    5353    void forkBox(OBB* box);
    5454
    … …  
    6767    static OBBTree*     obbTree;                    //!< reference to the obb tree
    6868    Plane*              separationPlane;            //!< the separation plane of the obb
    69     const sVec3D*       sepPlaneCenter;             //!< only needed to draw plane @todo: separationPlane drawing
     69    const sVec3D*       sepPlaneCenter;             //!< only needed to draw plane
    7070    int                 longestAxisIndex;           //!< only needed to draw plane
    7171

  • trunk/src/world_entities/weapons/rocket.cc

    r5511 r5693  
    104104    Rocket::explosionParticles->setName("RocketExplosionParticles");
    105105    Rocket::explosionParticles->setMaterialTexture("maps/radial-trans-noise.png");
    106     Rocket::explosionParticles->setLifeSpan(.6, .3);
     106    Rocket::explosionParticles->setLifeSpan(.5, .3);
    107107    Rocket::explosionParticles->setRadius(0.0, 10);
    108     Rocket::explosionParticles->setRadius(.5, 20.0);
    109     Rocket::explosionParticles->setRadius(1.0, 20.0);
     108    Rocket::explosionParticles->setRadius(.5, 15.0);
     109    Rocket::explosionParticles->setRadius(1.0, 10.0);
    110110    Rocket::explosionParticles->setColor(0.0, 0,1,0,1);
    111111    Rocket::explosionParticles->setColor(0.5, .8,.8,0,.8);
Note: See TracChangeset for help on using the changeset viewer.