Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 9744


Ignore:
Timestamp:
Nov 4, 2013, 3:58:01 PM (11 years ago)
Author:
zifloria
Message:

Added everything I modified and a few funky things

Location:
code/branches/invaders
Files:
5 added
6 edited

Legend:

Unmodified
Added
Removed
  • code/branches/invaders/data/levels/templates/spaceshipInvader.oxt

    r9724 r9744  
    5757    </collisionShapes>
    5858<?lua
    59   include("../includes/weaponSettingsEscort.oxi")
     59  include("../includes/invaderWeapon.oxi")
    6060?>
    6161  </InvaderShip>
  • code/branches/invaders/src/modules/invader/CMakeLists.txt

    r9709 r9744  
    44  InvaderCenterPoint.cc
    55  InvaderShip.cc
     6  InvaderWeapon.cc
    67END_BUILD_UNIT
    78)
     
    1314    orxonox
    1415    overlays
     16    weapons
    1517  SOURCE_FILES ${Invader_SRC_FILES}
    1618)
  • code/branches/invaders/src/modules/invader/InvaderPrereqs.h

    r9709 r9744  
    7171    class InvaderCenterPoint;
    7272    class InvaderShip;
     73    class InvaderWeapon;
    7374}
    7475
  • code/branches/invaders/src/modules/invader/InvaderShip.cc

    r9725 r9744  
    5050
    5151        speed = 500;
     52        isFireing = false;
    5253        damping = 10;
     54
    5355    }
    5456
    5557    void InvaderShip::tick(float dt)
    5658    {
    57         // If the bat is controlled (but not over the network).
     59        // if (camera == NULL)
     60        //     camera = this->getCamera();
     61        // if (camera != NULL)
     62        //     camera->setPosition(Vector3(0, 0, 0) + this->getWorldPosition());
     63
    5864        if (this->hasLocalController())
    5965        {
     
    6975            ControllableEntity::fire(0);
    7076
     77
     78        // camera->setOrientation(Vector3::UNIT_X, Degree(0));
     79
     80
    7181        SUPER(InvaderShip, tick, dt);
    7282    }
     
    7484    void InvaderShip::moveFrontBack(const Vector2& value)
    7585    {
    76         orxout(internal_error) << "move backfront" << value.x << value.y << endl;
     86        // orxout(internal_error) << "move backfront" << value.x << value.y << endl;
    7787        //velocity.y = value.y * speed * 10;
    7888        lastTimeFront = 0;
     
    8292    void InvaderShip::moveRightLeft(const Vector2& value)
    8393    {
    84         orxout(internal_error) << "right left front" << value.x << value.y << endl;
     94        // orxout(internal_error) << "right left front" << value.x << value.y << endl;
    8595        lastTimeLeft = 0;
    8696        desiredVelocity.x = value.x * speed;
  • code/branches/invaders/src/modules/invader/InvaderShip.h

    r9725 r9744  
    3838
    3939#include "worldentities/pawns/SpaceShip.h"
     40#include "graphics/Camera.h"
    4041
    4142namespace orxonox
     
    5960            virtual void rotateRoll(const Vector2& value){};
    6061        private:
     62            Camera* camera;
    6163            bool isFireing;
    6264            float speed, damping;
  • code/branches/invaders/src/modules/weapons/weaponmodes/HsW01.h

    r9667 r9744  
    5959            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
    6060
    61         private:
     61        protected:
    6262            /**
    6363            @brief Set the mesh.
     
    109109                { return this->delay_; }
    110110
    111             void shot();
     111            virtual void shot();
    112112            void muzzleflash();
    113113
Note: See TracChangeset for help on using the changeset viewer.