[Orxonox-commit 4501] r9172 - in code/branches/newlevel2012: data/levels data/overlays src/modules/towerdefense
mentzerf at orxonox.net
mentzerf at orxonox.net
Fri May 11 14:53:43 CEST 2012
Author: mentzerf
Date: 2012-05-11 14:53:41 +0200 (Fri, 11 May 2012)
New Revision: 9172
Added:
code/branches/newlevel2012/data/overlays/towerdefenseHUD.oxo
code/branches/newlevel2012/src/modules/towerdefense/TowerDefensePlayerStats.cc
code/branches/newlevel2012/src/modules/towerdefense/TowerDefensePlayerStats.h
Modified:
code/branches/newlevel2012/data/levels/towerDefense.oxw
code/branches/newlevel2012/src/modules/towerdefense/CMakeLists.txt
code/branches/newlevel2012/src/modules/towerdefense/TowerDefense.cc
code/branches/newlevel2012/src/modules/towerdefense/TowerDefense.h
code/branches/newlevel2012/src/modules/towerdefense/TowerDefensePrereqs.h
Log:
* Tried to add HUD. Failed miserably. Does not compile any more =(
Modified: code/branches/newlevel2012/data/levels/towerDefense.oxw
===================================================================
--- code/branches/newlevel2012/data/levels/towerDefense.oxw 2012-05-11 12:51:22 UTC (rev 9171)
+++ code/branches/newlevel2012/data/levels/towerDefense.oxw 2012-05-11 12:53:41 UTC (rev 9172)
@@ -12,6 +12,7 @@
<?lua
include("stats.oxo")
include("HUDTemplates3.oxo")
+ include("towedefenseHUD.oxo")
include("templates/lodInformation.oxt")
?>
Added: code/branches/newlevel2012/data/overlays/towerdefenseHUD.oxo
===================================================================
--- code/branches/newlevel2012/data/overlays/towerdefenseHUD.oxo (rev 0)
+++ code/branches/newlevel2012/data/overlays/towerdefenseHUD.oxo 2012-05-11 12:53:41 UTC (rev 9172)
@@ -0,0 +1,14 @@
+<Template name="TowerDefenseHUD">
+ <OverlayGroup name="TowerDefenseHUD" scale = "1, 1">
+ <TowerDefensePlayerStats
+ position = "0.05, 0.05"
+ pickpoint = "0.0, 0.0"
+ font = "ShareTechMono"
+ textsize = 0.06
+ colour = "1.0, 1.0, 1.0, 1.0"
+ align = "left"
+
+ caption = "Hello World"
+ />
+ </OverlayGroup>
+</Template>
Modified: code/branches/newlevel2012/src/modules/towerdefense/CMakeLists.txt
===================================================================
--- code/branches/newlevel2012/src/modules/towerdefense/CMakeLists.txt 2012-05-11 12:51:22 UTC (rev 9171)
+++ code/branches/newlevel2012/src/modules/towerdefense/CMakeLists.txt 2012-05-11 12:53:41 UTC (rev 9172)
@@ -2,6 +2,7 @@
TowerDefense.cc
Tower.cc
TowerDefenseCenterpoint.cc
+ TowerDefensePlayerStats.cc
)
ORXONOX_ADD_LIBRARY(TowerDefense
Modified: code/branches/newlevel2012/src/modules/towerdefense/TowerDefense.cc
===================================================================
--- code/branches/newlevel2012/src/modules/towerdefense/TowerDefense.cc 2012-05-11 12:51:22 UTC (rev 9171)
+++ code/branches/newlevel2012/src/modules/towerdefense/TowerDefense.cc 2012-05-11 12:53:41 UTC (rev 9172)
@@ -178,9 +178,7 @@
int tileScale = (int) this->center_->getTileScale();
orxout() << "tile scale = " << tileScale << endl;
-
-
-
+
if (x > 15 || y > 15 || x < 0 || y < 0)
{
//Hard coded: TODO: let this depend on the centerpoint's height, width and fieldsize (fieldsize doesn't exist yet)
Modified: code/branches/newlevel2012/src/modules/towerdefense/TowerDefense.h
===================================================================
--- code/branches/newlevel2012/src/modules/towerdefense/TowerDefense.h 2012-05-11 12:51:22 UTC (rev 9171)
+++ code/branches/newlevel2012/src/modules/towerdefense/TowerDefense.h 2012-05-11 12:53:41 UTC (rev 9172)
@@ -78,6 +78,7 @@
// WeakPtr<TowerDefenseCenterpoint> center_;
TowerDefenseCenterpoint *center_;
+ TowerDefensePlayerStats *stats_;
bool hasTower(int x, int y);
Added: code/branches/newlevel2012/src/modules/towerdefense/TowerDefensePlayerStats.cc
===================================================================
--- code/branches/newlevel2012/src/modules/towerdefense/TowerDefensePlayerStats.cc (rev 0)
+++ code/branches/newlevel2012/src/modules/towerdefense/TowerDefensePlayerStats.cc 2012-05-11 12:53:41 UTC (rev 9172)
@@ -0,0 +1,75 @@
+/*
+ * ORXONOX - the hottest 3D action shooter ever to exist
+ * > www.orxonox.net <
+ *
+ *
+ * License notice:
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * Author:
+ *
+ * Co-authors:
+ * ...
+ */
+
+#include "TowerDefensePlayerStats.h"
+
+#include "core/CoreIncludes.h"
+#include "core/XMLPort.h"
+#include "util/Convert.h"
+
+
+namespace orxonox
+{
+ CreateFactory(TowerDefensePlayerStats);
+
+ const int kDefaultCredit = 200;
+
+ TowerDefensePlayerStats::TowerDefensePlayerStats(BaseObject* creator) : OverlayText(creator)
+ {
+ RegisterObject(TowerDefensePlayerStats);
+
+ this->credit_ = 200;
+ this->waveNumber_ = 0;
+ }
+
+ TowerDefensePlayerStats::~TowerDefensePlayerStats()
+ {
+
+ }
+
+ void TowerDefensePlayerStats::tick(float dt)
+ {
+ SUPER(TowerDefensePlayerStats, tick, dt);
+ }
+
+ void TowerDefensePlayerStats::XMLPort(Element& xmlelement, XMLPort::Mode mode)
+ {
+ SUPER(TowerDefensePlayerStats, XMLPort, xmlelement, mode);
+ }
+
+ void TowerDefensePlayerStats::changedOwner()
+ {
+ SUPER(TowerDefensePlayerStats, changedOwner);
+ /*
+ if (this->getOwner() != NULL && this->getOwner()->getGametype())
+ this->owner_ = orxonox_cast<Pong*>(this->getOwner()->getGametype().get());
+ else
+ this->owner_ = 0;
+ */
+ }
+
+}
Added: code/branches/newlevel2012/src/modules/towerdefense/TowerDefensePlayerStats.h
===================================================================
--- code/branches/newlevel2012/src/modules/towerdefense/TowerDefensePlayerStats.h (rev 0)
+++ code/branches/newlevel2012/src/modules/towerdefense/TowerDefensePlayerStats.h 2012-05-11 12:53:41 UTC (rev 9172)
@@ -0,0 +1,78 @@
+/*
+ * ORXONOX - the hottest 3D action shooter ever to exist
+ * > www.orxonox.net <
+ *
+ *
+ * License notice:
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * Author:
+ *
+ * Co-authors:
+ * ...
+ *
+ */
+
+ /**
+ @brief
+
+ @ingroup TowerDefense
+ */
+
+
+#ifndef _TowerDefensePlayerStats_H__
+#define _TowerDefensePlayerStats_H__
+
+#include "towerdefense/TowerDefensePrereqs.h"
+
+#include "tools/interfaces/Tickable.h"
+#include "overlays/OverlayText.h"
+
+
+namespace orxonox
+{
+ class _TowerDefenseExport TowerDefensePlayerStats : public OverlayText, public Tickable
+ {
+ public:
+ TowerDefensePlayerStats(BaseObject* creator);
+ virtual ~TowerDefensePlayerStats();
+
+ virtual void tick(float dt);
+ virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+ virtual void changedOwner();
+
+ inline int getCredit()
+ { return credit_; }
+
+ inline void setCredit(int credit)
+ { credit_ = credit; }
+
+ inline int getWaveNumber()
+ { return waveNumber_; }
+
+ inline void didLoadNextWave()
+ { waveNumber_++; }
+
+
+
+ private:
+ int credit_;
+ int waveNumber_;
+ //int baseHealth_;
+ };
+}
+
+#endif /* _TowerDefensePlayerStats_H__ */
Modified: code/branches/newlevel2012/src/modules/towerdefense/TowerDefensePrereqs.h
===================================================================
--- code/branches/newlevel2012/src/modules/towerdefense/TowerDefensePrereqs.h 2012-05-11 12:51:22 UTC (rev 9171)
+++ code/branches/newlevel2012/src/modules/towerdefense/TowerDefensePrereqs.h 2012-05-11 12:53:41 UTC (rev 9172)
@@ -67,6 +67,7 @@
class TowerDefense;
class Tower;
class TowerDefenseCenterpoint;
+ class TowerDefensePlayerStats;
}
#endif /* _TowerDefensePrereqs_H__ */
More information about the Orxonox-commit
mailing list