Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 12393 for code


Ignore:
Timestamp:
May 16, 2019, 5:16:22 PM (6 years ago)
Author:
ahuwyler
Message:

BOUNCE

Location:
code/branches/OrxoBlox_FS19
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • code/branches/OrxoBlox_FS19/data/levels/orxoblox.oxw

    r12391 r12393  
    5050
    5151 
    52   <Template name=OrxoBloxstone>
    53     <OrxoBloxStones>
     52  <!-- <Template name=OrxoBloxstone>
     53    <OrxoBloxStones collisionType=static>
    5454      <attached>
    55         <Model position="0,0,0" mesh="CuboidBody.mesh" scale=4.5 />
     55        <Model position="0,0,0" mesh="CuboidBody.mesh" scale3D="4.5,4.5,4.5" />
    5656        <Model position="0,0,0" mesh="cube_orange.mesh" scale=4.3 />
    5757      </attached>
    58       <collisionShapes>
    59                 <BoxCollisionShape position="0,0,0" halfExtents="4.5, 4.5, 4.5" />
    60       </collisionShapes>
     58      <collisionShapes> 
     59        <BoxCollisionShape position="0,0,0" halfExtents="2,2,2" />
     60      </collisionShapes> 
    6161    </OrxoBloxStones>
    62   </Template>
     62  </Template> -->
     63
     64  <!-- <StaticEntity position="0,-10000,0" direction="0,-1,0" collisionType=static mass=100000 friction=0.01 > -->
     65   
    6366 
    6467 
    … …  
    6972  </Template>
    7073
    71 
     74   
    7275<Level
    7376  plugins = "OrxoBlox"
    … …  
    8588   skybox       = "Orxonox/skyBoxBasic"
    8689  >
     90
    8791    <!-- <Light type=directional position="0,0,0" direction="0.253, 0.593, -0.765" diffuse="1.0, 0.9, 0.9, 1.0" specular="1.0, 0.9, 0.9, 1.0"/> -->
    8892    <Light type=directional position="-100, 10000, -700" direction="0.2, -1, 0" diffuse="1.0, 0.9, 0.9, 1.0" specular="1.0, 0.9, 0.9, 1.0" />
    … …  
    104108    </OrxoBloxCenterpoint>
    105109     
     110 
    106111
    107112  </Scene>

  • code/branches/OrxoBlox_FS19/data/levels/templates/spaceshipOrxoBlox.oxt

    r12373 r12393  
    9494  </MultiStateEngine>
    9595</Template>
     96
     97
     98<Template name=OrxoBloxstone>
     99  <OrxoBloxStones collisionType=dynamic>
     100    <attached>
     101      <Model position="0,0,0" mesh="CuboidBody.mesh" scale3D="4.5,4.5,4.5" />
     102      <Model position="0,0,0" mesh="cube_orange.mesh" scale=4.3 />
     103    </attached>
     104    <collisionShapes>
     105          <BoxCollisionShape position="0,0,0" halfExtents="2,2,2" />
     106    </collisionShapes>
     107  </OrxoBloxStones>
     108</Template>

  • code/branches/OrxoBlox_FS19/data/overlays/OrxoBloxHUD.oxo

    r12382 r12393  
    2828     colour    = "1.0, 1.0, 1.0, 1.0"
    2929     align     = "left"
    30      
     30
     31     showhealth  = true
    3132    />
    3233
    … …  
    3435  </OverlayGroup>
    3536</Template>
    36 <Template name="spaceshiphud">
    37   <OverlayGroup name = "spaceshiphud" scale = "1, 1">
    38     <HUDNavigation
    39      name          = "Navigation"
    40      correctaspect = true
    41      font          = "Monofur"
    42      textsize      = 0
    43      navMarkerSize = 0.06
    44      aimMarkerSize = 0
    45      healthMarkerSize = 0
    46      healthLevelMarkerSize = 0
    47     />
    48   </OverlayGroup>
    49 </Template>
     37
    5038
    5139

  • code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBloxStones.cc

    r12360 r12393  
    1313        Constructor. Registers and initializes the object.
    1414    */
    15     OrxoBloxStones::OrxoBloxStones(Context* context) : StaticEntity(context)
     15    OrxoBloxStones::OrxoBloxStones(Context* context) : Pawn(context)
    1616    {
    1717        RegisterObject(OrxoBloxStones);

  • code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBloxStones.h

    r12360 r12393  
    77
    88#include "worldentities/StaticEntity.h"
     9#include "worldentities/pawns/Pawn.h"
    910#include "tools/Timer.h"
    1011
    … …  
    1920    @ingroup OrxoBlox
    2021    */
    21     class _OrxoBloxExport OrxoBloxStones : public StaticEntity
     22    class _OrxoBloxExport OrxoBloxStones : public Pawn
    2223    {
    2324        public:

  • code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBloxWall.cc

    r12392 r12393  
    3535                this->size_ = 9.0f;
    3636                OrxoBloxStones* stone = new OrxoBloxStones(this->center_->getContext());
     37                stone->addTemplate(this->orxoblox_->getCenterpoint()->getStoneTemplate());
    3738                if (stone == nullptr) {
    3839                    std::abort();

  • code/branches/OrxoBlox_FS19/src/modules/weapons/projectiles/BallProjectile.cc

    r12388 r12393  
    142142                Bounce(otherObject, contactPoint, cs);
    143143                orxout() << "BOUNCED!" << endl;
     144               
    144145            }
    145146        }
Note: See TracChangeset for help on using the changeset viewer.