Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Dec 18, 2017, 12:40:00 PM (7 years ago)
Author:
patricwi
Message:

rolled back to functional without 2 branches

Location:
code/branches/Presentation_HS17
Files:
4 deleted
8 edited

Legend:

Unmodified
Added
Removed

  • code/branches/Presentation_HS17

  • code/branches/Presentation_HS17/src/orxonox/worldentities/CMakeLists.txt

    r11685 r11690  
    1313  ExplosionPart.cc
    1414  Actionpoint.cc
    15   AutonomousDrone.cc
    16   Arrow.cc
    1715  NameableStaticEntity.cc
    1816)

  • code/branches/Presentation_HS17/src/orxonox/worldentities/ControllableEntity.cc

    r11686 r11690  
    3939
    4040#include "Scene.h"
    41 #include "Level.h"
    4241#include "infos/PlayerInfo.h"
    4342#include "controllers/NewHumanController.h"
    … …  
    6867        this->camera_ = nullptr;
    6968        this->xmlcontroller_ = nullptr;
     69        //this->controller_ = nullptr;
    7070        this->reverseCamera_ = nullptr;
    7171        this->bDestroyWhenPlayerLeft_ = false;

  • code/branches/Presentation_HS17/src/orxonox/worldentities/ControllableEntity.h

    r11686 r11690  
    175175            inline int getTeam() const
    176176                { return this->team_; }
    177 
    178177
    179178        protected:

  • code/branches/Presentation_HS17/src/orxonox/worldentities/MobileEntity.cc

    r11686 r11690  
    3636
    3737#include "Scene.h"
    38 #include "Level.h"
    39 #include "scriptablecontroller/scriptable_controller.h"
    4038
    4139namespace orxonox
    … …  
    7472                this->setAngularVelocity(rotationAxis.normalisedCopy() * rotationRate.valueRadians());
    7573        }
    76 
    77         if(!this->id_.empty() && this->getLevel() != nullptr)
    78             this->getLevel()->getScriptableController()->registerMobileEntity(this->id_, this);
    7974    }
    8075

  • code/branches/Presentation_HS17/src/orxonox/worldentities/WorldEntity.cc

    r11686 r11690  
    4444#include "core/XMLPort.h"
    4545#include "Scene.h"
    46 #include "Level.h"
    4746#include "collisionshapes/WorldEntityCollisionShape.h"
    48 #include "scriptablecontroller/scriptable_controller.h"
    4947
    5048namespace orxonox
    … …  
    8179        this->parentID_ = OBJECTID_UNKNOWN;
    8280        this->bDeleteWithParent_ = true;
    83         this->id_ = -1;
    8481
    8582        this->node_->setPosition(Vector3::ZERO);
    … …  
    163160        XMLPortParamTemplate(WorldEntity, "scale3D",     setScale3D,     getScale3D,     xmlelement, mode, const Vector3&);
    164161        XMLPortParam        (WorldEntity, "scale",       setScale,       getScale,       xmlelement, mode);
    165         XMLPortParamLoadOnly(WorldEntity, "id",          setID,                xmlelement, mode);
    166162        XMLPortParamLoadOnly(WorldEntity, "lookat",      lookAt_xmlport,       xmlelement, mode);
    167163        XMLPortParamLoadOnly(WorldEntity, "direction",   setDirection_xmlport, xmlelement, mode);
    … …  
    185181        // Attached collision shapes
    186182        XMLPortObject(WorldEntity, CollisionShape, "collisionShapes", attachCollisionShape, getAttachedCollisionShape, xmlelement, mode);
    187 
    188         if(!this->id_.empty() && this->getLevel() != nullptr)
    189             this->getLevel()->getScriptableController()->registerWorldEntity(this->id_, this);
    190183    }
    191184

  • code/branches/Presentation_HS17/src/orxonox/worldentities/WorldEntity.h

    r11686 r11690  
    110110            virtual void changedActivity(void) override;
    111111            virtual void changedVisibility(void) override;
    112 
    113             inline std::string getID(void)
    114                 { return this->id_; }
    115 
    116             inline void setID(std::string id)
    117                 { this->id_ = id; }
    118112
    119113            virtual void setPosition(const Vector3& position) = 0;
    … …  
    448442
    449443            btRigidBody*  physicalBody_; //!< Bullet rigid body. Everything physical is applied to this instance.
    450             std::string   id_;           //!< Used by the ScriptableController to identify objects
    451444
    452445        private:

  • code/branches/Presentation_HS17/src/orxonox/worldentities/pawns/Pawn.cc

    r11686 r11690  
    5050#include "sound/WorldSound.h"
    5151#include "core/object/ObjectListIterator.h"
    52 #include "Level.h"
    53 #include "scriptablecontroller/scriptable_controller.h"
    5452
    5553#include "controllers/FormationController.h"
    … …  
    162160
    163161        XMLPortParam ( RadarViewable, "radarname", setRadarName, getRadarName, xmlelement, mode );
    164 
    165         if(!this->id_.empty() && this->getLevel() != nullptr)
    166             this->getLevel()->getScriptableController()->registerPawn(this->id_, this);
    167162    }
    168163
    … …  
    287282        {
    288283            // Health-damage cannot be absorbed by shields.
    289             // Shield-damage only reduces shield health.
     284            // Shield-damage only reduces shield health. 
    290285            // Normal damage can be (partially) absorbed by shields.
    291286
    … …  
    307302                this->setHealth(this->health_ - (damage - shielddamage) - healthdamage);
    308303            }
    309             this->getLevel()->getScriptableController()->pawnHit(this, originator, this->health_, this->shieldHealth_);
    310304
    311305            this->lastHitOriginator_ = originator;
    … …  
    408402            }
    409403        }
    410 
    411         this->getLevel()->getScriptableController()->pawnKilled(this);
    412404    }
    413405    void Pawn::goWithStyle()
    … …  
    633625        {
    634626            // delete all debug models
    635             for(Model* model : debugWeaponSlotModels_)
     627            for(Model* model : debugWeaponSlotModels_) 
    636628            {
    637629                model->destroy();
Note: See TracChangeset for help on using the changeset viewer.