Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 10751


Ignore:
Timestamp:
Nov 2, 2015, 3:19:00 PM (9 years ago)
Author:
meierman
Message:

working cpp object generation

Location:
code/branches/hoverHS15
Files:
4 added
5 edited

Legend:

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

    r10708 r10751  
    4242    </attached>
    4343    <collisionShapes>
    44       <BoxCollisionShape yaw="0" pitch="0" roll="0" position="0,0,0" halfExtents="500, 30, 2" />
    45       <BoxCollisionShape yaw="0" pitch="0" roll="0" position="0,0,1000" halfExtents="500, 30, 2" />
     44      <BoxCollisionShape yaw="0" pitch="0" roll="0" position="500,0,0" halfExtents="500, 30, 2" />
     45      <BoxCollisionShape yaw="0" pitch="0" roll="0" position="500,0,1000" halfExtents="500, 30, 2" />
    4646      <BoxCollisionShape yaw="0" pitch="0" roll="0" position="0,0,500" halfExtents="2, 30, 500" />
    47       <BoxCollisionShape yaw="0" pitch="0" roll="0" position="1000,500,0" halfExtents="2, 30, 500" />
     47      <BoxCollisionShape yaw="0" pitch="0" roll="0" position="1000,0,500" halfExtents="2, 30, 500" />
    4848
    4949    </collisionShapes>
     
    6060
    6161
     62    <MovableEntity>
     63      <attached>
     64        <HoverOrigin>
     65
     66          <attached>
     67
     68          </attached>
     69        </HoverOrigin>
     70      </attached>
     71    </MovableEntity>
     72
     73
     74
    6275   
    6376    <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"/>
  • code/branches/hoverHS15/src/modules/hover/CMakeLists.txt

    r10708 r10751  
    33HoverShip.cc
    44HoverWall.cc
     5HoverOrigin.cc
    56)
    67
  • code/branches/hoverHS15/src/modules/hover/Hover.cc

    r10708 r10751  
    4040namespace orxonox
    4141{
     42    bool firstTick = true;
    4243    RegisterUnloadableClass(Hover);
    4344
     
    4647       
    4748        RegisterObject(Hover);
    48         new HoverWall(context);
    4949        //this->setHUDTemplate("HoverHUD");
    5050    }
     
    5555    {
    5656        SUPER(Hover, tick, dt);
     57
     58        if(firstTick){
     59            firstTick = false;
     60            new HoverWall(origin_->getContext(), 1, 2);
     61        }     
     62
     63
    5764    }
    5865
  • code/branches/hoverHS15/src/modules/hover/Hover.h

    r10664 r10751  
    3737
    3838#include "HoverPrereqs.h"
    39 //#include "HoverCenterPoint.h" // Necessary for WeakPointer??
     39#include "HoverOrigin.h" // Necessary for WeakPointer
    4040//#include "HoverShip.h"        DO NOT include in Header. Will cause forward declaration issues
    4141
     
    7171            virtual void tick(float dt);
    7272
    73  //           void setCenterpoint(HoverCenterPoint* center)
    74   //                     { this->center_ = center; }
     73            // void setOrigin(HoverOrigin* center)
     74            //    { center_ = center; }           
    7575
     76            void setOrigin(HoverOrigin* origin)
     77                       { this->origin_ = origin; }
     78
     79
     80            WeakPtr<HoverOrigin> origin_;
    7681
    7782    };
  • code/branches/hoverHS15/src/modules/hover/HoverPrereqs.h

    r10708 r10751  
    7171    class HoverShip;
    7272    class HoverWall;
     73    class HoverOrigin;
    7374}
    7475
Note: See TracChangeset for help on using the changeset viewer.