[Orxonox-commit 6185] r10843 - in code/branches/campaignHS15: data/levels src/orxonox/controllers src/orxonox/worldentities
gania at orxonox.net
gania at orxonox.net
Mon Nov 23 21:08:28 CET 2015
Author: gania
Date: 2015-11-23 21:08:28 +0100 (Mon, 23 Nov 2015)
New Revision: 10843
Modified:
code/branches/campaignHS15/data/levels/AITest.oxw
code/branches/campaignHS15/src/orxonox/controllers/CommonController.cc
code/branches/campaignHS15/src/orxonox/controllers/CommonController.h
code/branches/campaignHS15/src/orxonox/controllers/DivisionController.cc
code/branches/campaignHS15/src/orxonox/controllers/DivisionController.h
code/branches/campaignHS15/src/orxonox/controllers/LeaderController.cc
code/branches/campaignHS15/src/orxonox/controllers/LeaderController.h
code/branches/campaignHS15/src/orxonox/controllers/SectionController.cc
code/branches/campaignHS15/src/orxonox/controllers/SectionController.h
code/branches/campaignHS15/src/orxonox/controllers/WingmanController.cc
code/branches/campaignHS15/src/orxonox/controllers/WingmanController.h
code/branches/campaignHS15/src/orxonox/worldentities/CMakeLists.txt
Log:
gani check in before a major change
Modified: code/branches/campaignHS15/data/levels/AITest.oxw
===================================================================
--- code/branches/campaignHS15/data/levels/AITest.oxw 2015-11-23 16:45:13 UTC (rev 10842)
+++ code/branches/campaignHS15/data/levels/AITest.oxw 2015-11-23 20:08:28 UTC (rev 10843)
@@ -60,7 +60,7 @@
</DivisionController>
</controller>
</SpaceShip>
- <SpaceShip position="4000 ,1500, -1600 " lookat="0,0,0" team=0>
+ <!-- <SpaceShip position="4000 ,1500, -1600 " lookat="0,0,0" team=0>
<templates>
<Template link=spaceshipassff />
</templates>
@@ -95,7 +95,7 @@
<SectionController team=0>
</SectionController>
</controller>
- </SpaceShip>
+ </SpaceShip> -->
<!-- <SpaceShip position="-4000, 1500, -5000" lookat="0,0,0">
<templates>
Modified: code/branches/campaignHS15/src/orxonox/controllers/CommonController.cc
===================================================================
--- code/branches/campaignHS15/src/orxonox/controllers/CommonController.cc 2015-11-23 16:45:13 UTC (rev 10842)
+++ code/branches/campaignHS15/src/orxonox/controllers/CommonController.cc 2015-11-23 20:08:28 UTC (rev 10843)
@@ -68,7 +68,7 @@
{
//orxout(internal_error) << "I died, my Rank is " << rank_ << endl;
}
-
+
void CommonController::XMLPort( Element& xmlelement, XMLPort::Mode mode )
{
SUPER( CommonController, XMLPort, xmlelement, mode );
@@ -84,7 +84,19 @@
}
void CommonController::tick(float dt)
{
-
+ if (this->bHasTargetPosition_)
+ {
+ this->moveToTargetPosition(dt);
+ }
+ else if (this->bLookAtTarget_)
+ {
+ this->lookAtTarget(dt);
+ }
+ if (bShooting_)
+ {
+ this->doFire();
+ }
+ SUPER(CommonController, tick, dt);
}
std::string CommonController::getProtectXML ()
Modified: code/branches/campaignHS15/src/orxonox/controllers/CommonController.h
===================================================================
--- code/branches/campaignHS15/src/orxonox/controllers/CommonController.h 2015-11-23 16:45:13 UTC (rev 10842)
+++ code/branches/campaignHS15/src/orxonox/controllers/CommonController.h 2015-11-23 20:08:28 UTC (rev 10843)
@@ -67,7 +67,7 @@
}
- class _OrxonoxExport CommonController : public Controller
+ class _OrxonoxExport CommonController : public Controller, public Tickable
{
public:
Modified: code/branches/campaignHS15/src/orxonox/controllers/DivisionController.cc
===================================================================
--- code/branches/campaignHS15/src/orxonox/controllers/DivisionController.cc 2015-11-23 16:45:13 UTC (rev 10842)
+++ code/branches/campaignHS15/src/orxonox/controllers/DivisionController.cc 2015-11-23 20:08:28 UTC (rev 10843)
@@ -63,21 +63,11 @@
void DivisionController::tick(float dt)
{
+
if (!this->isActive())
return;
- if (this->bHasTargetPosition_)
- {
- this->moveToTargetPosition(dt);
- }
- else if (this->bLookAtTarget_)
- {
- this->lookAtTarget(dt);
- }
- if (bShooting_)
- {
- this->doFire();
- }
+
SUPER(DivisionController, tick, dt);
}
Modified: code/branches/campaignHS15/src/orxonox/controllers/DivisionController.h
===================================================================
--- code/branches/campaignHS15/src/orxonox/controllers/DivisionController.h 2015-11-23 16:45:13 UTC (rev 10842)
+++ code/branches/campaignHS15/src/orxonox/controllers/DivisionController.h 2015-11-23 20:08:28 UTC (rev 10843)
@@ -35,8 +35,8 @@
namespace orxonox
{
- class _OrxonoxExport DivisionController : public LeaderController, public Tickable
- {
+ class _OrxonoxExport DivisionController : public LeaderController
+ {
public:
//----[language demanded functions]----
DivisionController(Context* context);
Modified: code/branches/campaignHS15/src/orxonox/controllers/LeaderController.cc
===================================================================
--- code/branches/campaignHS15/src/orxonox/controllers/LeaderController.cc 2015-11-23 16:45:13 UTC (rev 10842)
+++ code/branches/campaignHS15/src/orxonox/controllers/LeaderController.cc 2015-11-23 20:08:28 UTC (rev 10843)
@@ -42,7 +42,11 @@
}
-
+ void LeaderController::tick(float dt)
+ {
+
+ SUPER(LeaderController, tick, dt);
+ }
LeaderController::~LeaderController()
{
}
Modified: code/branches/campaignHS15/src/orxonox/controllers/LeaderController.h
===================================================================
--- code/branches/campaignHS15/src/orxonox/controllers/LeaderController.h 2015-11-23 16:45:13 UTC (rev 10842)
+++ code/branches/campaignHS15/src/orxonox/controllers/LeaderController.h 2015-11-23 20:08:28 UTC (rev 10843)
@@ -44,6 +44,7 @@
LeaderController(Context* context);
virtual ~LeaderController();
//----[language demanded functions]----
+ virtual void tick(float dt);
//----[pseudo virtual methods]----
virtual bool setFollower(LeaderController* myFollower)
Modified: code/branches/campaignHS15/src/orxonox/controllers/SectionController.cc
===================================================================
--- code/branches/campaignHS15/src/orxonox/controllers/SectionController.cc 2015-11-23 16:45:13 UTC (rev 10842)
+++ code/branches/campaignHS15/src/orxonox/controllers/SectionController.cc 2015-11-23 20:08:28 UTC (rev 10843)
@@ -62,20 +62,9 @@
//----in tick, move (or look) and shoot----
void SectionController::tick(float dt)
{
- if (!this->isActive())
+ if (!this->isActive())
return;
- if (this->bHasTargetPosition_)
- {
- this->moveToTargetPosition(dt);
- }
- else if (this->bLookAtTarget_)
- {
- this->lookAtTarget(dt);
- }
- if (bShooting_)
- {
- this->doFire();
- }
+
SUPER(SectionController, tick, dt);
}
Modified: code/branches/campaignHS15/src/orxonox/controllers/SectionController.h
===================================================================
--- code/branches/campaignHS15/src/orxonox/controllers/SectionController.h 2015-11-23 16:45:13 UTC (rev 10842)
+++ code/branches/campaignHS15/src/orxonox/controllers/SectionController.h 2015-11-23 20:08:28 UTC (rev 10843)
@@ -34,7 +34,7 @@
namespace orxonox
{
- class _OrxonoxExport SectionController : public LeaderController, public Tickable
+ class _OrxonoxExport SectionController : public LeaderController
{
public:
//----[language demanded functions]----
Modified: code/branches/campaignHS15/src/orxonox/controllers/WingmanController.cc
===================================================================
--- code/branches/campaignHS15/src/orxonox/controllers/WingmanController.cc 2015-11-23 16:45:13 UTC (rev 10842)
+++ code/branches/campaignHS15/src/orxonox/controllers/WingmanController.cc 2015-11-23 20:08:28 UTC (rev 10843)
@@ -60,19 +60,8 @@
{
if (!this->isActive())
return;
- if (this->bHasTargetPosition_)
- {
- this->moveToTargetPosition(dt);
- }
- else if (this->bLookAtTarget_)
- {
- this->lookAtTarget(dt);
- }
- if (bShooting_)
- {
- this->doFire();
- }
+
SUPER(WingmanController, tick, dt);
}
Modified: code/branches/campaignHS15/src/orxonox/controllers/WingmanController.h
===================================================================
--- code/branches/campaignHS15/src/orxonox/controllers/WingmanController.h 2015-11-23 16:45:13 UTC (rev 10842)
+++ code/branches/campaignHS15/src/orxonox/controllers/WingmanController.h 2015-11-23 20:08:28 UTC (rev 10843)
@@ -35,7 +35,7 @@
namespace orxonox
{
- class _OrxonoxExport WingmanController : public CommonController, public Tickable
+ class _OrxonoxExport WingmanController : public CommonController
{
public:
//----[language demanded functions]----
Modified: code/branches/campaignHS15/src/orxonox/worldentities/CMakeLists.txt
===================================================================
--- code/branches/campaignHS15/src/orxonox/worldentities/CMakeLists.txt 2015-11-23 16:45:13 UTC (rev 10842)
+++ code/branches/campaignHS15/src/orxonox/worldentities/CMakeLists.txt 2015-11-23 20:08:28 UTC (rev 10843)
@@ -11,6 +11,7 @@
CameraPosition.cc
SpawnPoint.cc
TeamSpawnPoint.cc
+ ActionPoint.cc
)
ADD_SUBDIRECTORY(pawns)
More information about the Orxonox-commit
mailing list