Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 10928


Ignore:
Timestamp:
Dec 7, 2015, 2:05:58 PM (8 years ago)
Author:
meierman
Message:

Before finishing touch

Location:
code/branches/hoverHS15
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • code/branches/hoverHS15/data/levels/Hover.oxw

    r10926 r10928  
    3030    ambientlight = "0.8, 0.8, 0.8"
    3131    skybox       = "Orxonox/Starbox"
    32     gravity      = "0, -100, 0"
     32    gravity      = "0, -200, 0"
    3333  >
    3434 
     
    3939  <StaticEntity position="0,0,0" collisionType="static">
    4040    <attached>
    41       <Model position="500, 0, 0" yaw="0" pitch="0" roll="0" scale3D="500, 30, 2" mesh="cube_red.mesh" />
    42       <Model position="500, 0, 1000" yaw="0" pitch="0" roll="0" scale3D="500, 30, 2" mesh="cube_red.mesh" />     
    43       <Model position="0, 0, 500" yaw="0" pitch="0" roll="0" scale3D="2, 30, 500" mesh="cube_green.mesh" />     
    44       <Model position="1000, 0, 500" yaw="0" pitch="0" roll="0" scale3D="2, 30, 500" mesh="cube_green.mesh" />
    4541    </attached>
    4642    <collisionShapes>
     
    5551  <StaticEntity position="0,0,0" collisionType="static">
    5652    <attached>
    57       <Model position="500, -10,500" yaw="0" pitch="0" roll="0" scale3D="500, 10, 500" mesh="CubeGround.mesh" />     
     53      <Model position="500, -16,500" yaw="0" pitch="0" roll="0" scale3D="500, 16, 500" mesh="CubeGround.mesh" />     
    5854    </attached>
    5955    <collisionShapes>
     56      <BoxCollisionShape yaw="0" pitch="0" roll="0" position="0,500,0" halfExtents="10000, 1, 10000" />
    6057      <BoxCollisionShape yaw="0" pitch="0" roll="0" position="0,-10,0" halfExtents="10000, 10, 10000" />
    6158      <BoxCollisionShape yaw="0" pitch="0" roll="0" position="500, 0,0" halfExtents="1000, 1000, 1" />
     
    8380
    8481   
    85     <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"/>
     82    <Light type=directional position="-50,500,-50" direction="0.577, -0.577, 0.577" diffuse="1.0, 0.9, 0.9, 1.0" specular="1.0, 0.9, 0.9, 1.0"/>
    8683    <SpawnPoint team=0 position="50,20,50" lookat="100,20,100" spawnclass=HoverShip pawndesign=spaceshiphover />
    8784   
  • code/branches/hoverHS15/data/levels/templates/spaceshipHover.oxt

    r10926 r10928  
    1818   reloadwaittime      = 0.5
    1919
    20    primaryThrust     = 100
     20   primaryThrust     = 200
    2121   auxilaryThrust    = 30
    2222   rotationThrust    = 25
    2323
    24    jumpBoost = 30
     24   jumpBoost = 90
    2525
    2626   lift = 1;
  • code/branches/hoverHS15/src/modules/hover/Hover.cc

    r10900 r10928  
    109109    void Hover::tick(float dt)
    110110    {
     111
    111112        SUPER(Hover, tick, dt);
    112113
     
    125126            LevelOut();
    126127            firstTick = false;
     128
     129            //Outer Walls
     130            for(int i = 0; i<10; i++){
     131                new HoverWall(origin_->getContext(), 0, i+1, 1);
     132                new HoverWall(origin_->getContext(), 10, i+1, 1);
     133                new HoverWall(origin_->getContext(), i+1, 0, 2);
     134                new HoverWall(origin_->getContext(), i+1, 10, 2);
     135            }
    127136
    128137            for(int y=0; y<10; y++){
  • code/branches/hoverHS15/src/modules/hover/HoverFlag.cc

    r10894 r10928  
    9696    {
    9797        SUPER(HoverFlag, XMLPort, xmlelement, mode);
    98 
    99        // XMLPortParam(HoverFlag, "height", setHeight, getHeight, xmlelement, mode);
    100         //XMLPortParam(HoverFlag, "width", setWidth, getWidth, xmlelement, mode);
    10198    }
    10299
     
    119116    bool HoverFlag::collidesAgainst(WorldEntity* otherObject, const btCollisionShape* ownCollisionShape, btManifoldPoint& contactPoint)
    120117    {
    121        
    122 
    123         if(otherObject->isA(Class(HoverShip))){
    124 
    125             orxout()<<"TestCollision"<<endl;
     118        if(otherObject->isA(Class(HoverShip)))
    126119            collided_ = true;
    127             //this->destroyLater();
    128         }
    129 
    130 
    131         /*if (GameMode::isMaster() && enableCollisionDamage_)
    132         {
    133             Pawn* victim = orxonox_cast<Pawn*>(otherObject);
    134             if (victim)
    135             {
    136                 float damage = this->collisionDamage_ * (victim->getVelocity() - this->getVelocity()).length();
    137                 victim->hit(0, contactPoint, ownCollisionShape, damage);
    138             }
    139         }*/
    140 
    141120        return false;
    142121    }
Note: See TracChangeset for help on using the changeset viewer.