Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Dec 11, 2017, 5:39:48 PM (7 years ago)
Author:
fanconic
Message:

Changes in the Cameraorientation aswell as new objects inside the level

Location:
code/branches/CampaignMap_HS17/src/orxonox
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • code/branches/CampaignMap_HS17/src/orxonox/gametypes/StoryMode.cc

    r11507 r11663  
    3131#include "items/Engine.h"
    3232#include "controllers/ArtificialController.h"
     33#include "controllers/NewHumanController.h"
    3334
    3435#include "core/CoreIncludes.h"
     
    4849    {
    4950        RegisterObject(StoryMode);
     51        orxout() << "kill yourself1";
    5052
    5153        this->gtinfo_ = new GametypeInfo(context);
     
    6567    void StoryMode::exit()
    6668    {
    67         orxout() << "s funktioniert"<< endl;
    6869        for (StoryMode* mission : ObjectList<StoryMode>())
    6970        { //TODO: make sure that only the desired mission is ended !! This is a dirty HACK, that would end ALL missions!
     
    7273        //Gametype::end();
    7374    }
     75
    7476/*
    7577    void Mission::setTeams()
  • code/branches/CampaignMap_HS17/src/orxonox/gametypes/StoryMode.h

    r11359 r11663  
    4141            virtual ~StoryMode() {}
    4242            static void exit();
     43//            virtual void playerEntered(PlayerInfo* player);
    4344
    4445           
  • code/branches/CampaignMap_HS17/src/orxonox/worldentities/pawns/StoryModePawn.cc

    r11634 r11663  
    5353    void StoryModePawn::moveFrontBack(const Vector2& value)
    5454        {
     55            //this->getCamera()->setOrientation(Vector3::UNIT_X, Degree(-30));
    5556            Vector3 newPos = this->getCamera()->getPosition();
    56             newPos.y += value.x;
     57            newPos.z -= 5*value.x;
    5758            this->getCamera()->setPosition(newPos);
    5859        }
     
    6162        {   
    6263            Vector3 newPos = this->getCamera()->getPosition();
    63             newPos.x += value.x;
     64            newPos.x += 5*value.x;
    6465            this->getCamera()->setPosition(newPos);
    6566        }
  • code/branches/CampaignMap_HS17/src/orxonox/worldentities/pawns/StoryModePawn.h

    r11634 r11663  
    2121 *
    2222 *   Author:
    23  *      Cyrill Burgener
     23 *      Claudio Fanconi & Nikola Bolt
    2424 *
    2525 */
Note: See TracChangeset for help on using the changeset viewer.