[Orxonox-commit 4504] r9175 - in code/branches/newlevel2012: data/levels data/levels/includes data/levels/templates src/modules/towerdefense src/orxonox/worldentities
weigeltm at orxonox.net
weigeltm at orxonox.net
Fri May 11 16:03:29 CEST 2012
Author: weigeltm
Date: 2012-05-11 16:03:28 +0200 (Fri, 11 May 2012)
New Revision: 9175
Modified:
code/branches/newlevel2012/data/levels/includes/towerWeaponSettings.oxi
code/branches/newlevel2012/data/levels/templates/tower.oxt
code/branches/newlevel2012/data/levels/towerDefense.oxw
code/branches/newlevel2012/src/modules/towerdefense/Tower.cc
code/branches/newlevel2012/src/modules/towerdefense/Tower.h
code/branches/newlevel2012/src/modules/towerdefense/TowerDefense.cc
code/branches/newlevel2012/src/modules/towerdefense/TowerDefenseCenterpoint.cc
code/branches/newlevel2012/src/modules/towerdefense/TowerDefenseCenterpoint.h
code/branches/newlevel2012/src/orxonox/worldentities/WorldEntity.cc
Log:
removed attach-command, got rid of error messages, attached weapons to towers
Modified: code/branches/newlevel2012/data/levels/includes/towerWeaponSettings.oxi
===================================================================
--- code/branches/newlevel2012/data/levels/includes/towerWeaponSettings.oxi 2012-05-11 14:03:17 UTC (rev 9174)
+++ code/branches/newlevel2012/data/levels/includes/towerWeaponSettings.oxi 2012-05-11 14:03:28 UTC (rev 9175)
@@ -19,9 +19,9 @@
</links>
<Weapon>
<attached>
- <Model mesh="LightningGun.mesh" pitch="100" roll="90" yaw="90" position="0,-1.3,0" />
- <Model mesh="LightningGun-s.mesh" pitch="78" roll="90" yaw="90" position="0.2,-1.3,0" />
- <Model mesh="hs-w01_reduced.mesh" roll="90" pitch="-76" yaw="-90" position="-1.5,1,0.3" scale=0.6 />
+ <Model mesh="LightningGun.mesh" pitch="100" roll="90" yaw="90" position="0,-1.3,0" scale=1/>
+ <Model mesh="LightningGun-s.mesh" pitch="78" roll="90" yaw="90" position="0.2,-1.3,0" scale=1 />
+ <Model mesh="hs-w01_reduced.mesh" roll="45" pitch="-76" yaw="-45" position="-1.5,1,0.3" scale=100 />
</attached>
<HsW01 mode=0 munitionpershot=0 delay=0.125 damage=3.14159 material="Flares/point_lensflare" muzzleoffset=" 0.1, 1.6,-2" />
<HsW01 mode=0 munitionpershot=0 delay=0 damage=3.14159 material="Flares/point_lensflare" muzzleoffset="-1.6, 1.3,-2" />
Modified: code/branches/newlevel2012/data/levels/templates/tower.oxt
===================================================================
--- code/branches/newlevel2012/data/levels/templates/tower.oxt 2012-05-11 14:03:17 UTC (rev 9174)
+++ code/branches/newlevel2012/data/levels/templates/tower.oxt 2012-05-11 14:03:28 UTC (rev 9175)
@@ -1,28 +1,15 @@
<Template name=tower>
- <SpaceShip
+ <Tower
- spawnparticlesource = "Orxonox/fairytwirl"
- spawnparticleduration = 3
+
explosionchunks = 6
- health = 100
- maxhealth = 200
- initialhealth = 100
-
- shieldhealth = 30
- initialshieldhealth = 30
- maxshieldhealth = 50
- shieldabsorption = 0.8
reloadrate = 1
reloadwaittime = 1
- lift = 1;
- stallSpeed = 220;
-
collisionType = "dynamic"
- mass = 100
- linearDamping = 0.7
- angularDamping = 0.9999999
+ team = 13
+
>
<controller>
@@ -32,9 +19,9 @@
</controller>
- <!--attached>
- <Model position="0,0,0" scale=25 mesh="Tower_ME.mesh" />
- </attached-->
+ <attached>
+ <Model position="0,0,0" scale=50 mesh="Tower_ME.mesh" />
+ </attached>
<!--collisionShapes>
@@ -43,6 +30,6 @@
<?lua
include("../includes/towerWeaponSettings.oxi")
?>
- </SpaceShip>
+ </Tower>
</Template>
Modified: code/branches/newlevel2012/data/levels/towerDefense.oxw
===================================================================
--- code/branches/newlevel2012/data/levels/towerDefense.oxw 2012-05-11 14:03:17 UTC (rev 9174)
+++ code/branches/newlevel2012/data/levels/towerDefense.oxw 2012-05-11 14:03:28 UTC (rev 9175)
@@ -50,6 +50,10 @@
</Tower>
</Template-->
+
+
+
+
<Level gametype = "TowerDefense">
<templates>
<Template link=lodtemplate_default />
@@ -79,27 +83,19 @@
<WaypointController accuracy=40>
<waypoints>
<!-- 1,3 10,3 10,11, 13,11 -->
- <Model mesh="cube.mesh" scale=1 position="-700,-500, 100" />
- <Model mesh="cube.mesh" scale=1 position=" 200,-500, 100" />
- <Model mesh="cube.mesh" scale=1 position=" 200, 300, 100" />
- <Model mesh="cube.mesh" scale=1 position=" 500, 300, 100" />
+ <Model mesh="cube.mesh" scale=20 position="-700,-500, 100" />
+ <Model mesh="cube.mesh" scale=20 position=" 200,-500, 100" />
+ <Model mesh="cube.mesh" scale=20 position=" 200, 300, 100" />
+ <Model mesh="cube.mesh" scale=20 position=" 500, 300, 100" />
</waypoints>
</WaypointController>
</controller>
</SpaceShip>
- <!-- PlayField -->
- <TowerDefenseCenterpoint
- name=towerdefensecenter
- width=16
- height=16
- tileScale=100
- towerTemplate=tower
- position="0,0,0"
- direction="0,0,0"
- collistionType=static
- mass=100000>
-
+
+ <!--invisible entity to attach towers to, since playfield is static and towers are dynamic-->
+ <StaticEntity position=0,0,0>
+
<attached>
<Model position="-50,-50,0" mesh="Playfield_ME.mesh" scale=80 />
<!--Model position="0,0,0" mesh="crate.mesh" scale3D="3,3,3" /--> <!-- Only temporary needed to help align the collisionshape -->
@@ -117,6 +113,23 @@
find the proper shape. -->
<BoxCollisionShape position="0,0,0" halfExtents="400,400,100" />
</collisionShapes>
+ </StaticEntity>
+
+
+
+
+ <!-- PlayField -->
+ <TowerDefenseCenterpoint
+ name=towerdefensecenter
+ width=16
+ height=16
+ tileScale=100
+ towerTemplate=tower
+ position="0,0,0"
+ direction="0,0,0"
+ collisionType=dynamic
+ mass=100000>
+
</TowerDefenseCenterpoint>
</Scene>
Modified: code/branches/newlevel2012/src/modules/towerdefense/Tower.cc
===================================================================
--- code/branches/newlevel2012/src/modules/towerdefense/Tower.cc 2012-05-11 14:03:17 UTC (rev 9174)
+++ code/branches/newlevel2012/src/modules/towerdefense/Tower.cc 2012-05-11 14:03:28 UTC (rev 9175)
@@ -21,9 +21,14 @@
@brief
Constructor. Registers and initializes the object.
*/
- Tower::Tower(BaseObject* creator) : ControllableEntity(creator)
+ Tower::Tower(BaseObject* creator) : SpaceShip(creator)
{
RegisterObject(Tower);
+
+ this->setCollisionType(WorldEntity::Dynamic);
+
+
+
/*
this->size_ = 10.0f;
this->delay_ = false;
Modified: code/branches/newlevel2012/src/modules/towerdefense/Tower.h
===================================================================
--- code/branches/newlevel2012/src/modules/towerdefense/Tower.h 2012-05-11 14:03:17 UTC (rev 9174)
+++ code/branches/newlevel2012/src/modules/towerdefense/Tower.h 2012-05-11 14:03:28 UTC (rev 9175)
@@ -18,11 +18,11 @@
#define Orxonox_Tower_h
#include "towerdefense/TowerDefensePrereqs.h"
-#include "worldentities/ControllableEntity.h"
+#include "worldentities/pawns/SpaceShip.h"
namespace orxonox
{
- class _OrxonoxExport Tower : public ControllableEntity
+ class _OrxonoxExport Tower : public SpaceShip
{
public:
Tower(BaseObject* creator);
Modified: code/branches/newlevel2012/src/modules/towerdefense/TowerDefense.cc
===================================================================
--- code/branches/newlevel2012/src/modules/towerdefense/TowerDefense.cc 2012-05-11 14:03:17 UTC (rev 9174)
+++ code/branches/newlevel2012/src/modules/towerdefense/TowerDefense.cc 2012-05-11 14:03:28 UTC (rev 9175)
@@ -117,8 +117,9 @@
void TowerDefense::setCenterpoint(TowerDefenseCenterpoint *centerpoint)
{
+ orxout() << "Centerpoint now setting..." << endl;
+ this->center_ = centerpoint;
orxout() << "Centerpoint now set..." << endl;
- this->center_ = centerpoint;
}
void TowerDefense::start()
@@ -190,12 +191,11 @@
Tower* newTower = new Tower(this->center_);
newTower->addTemplate(this->center_->getTowerTemplate());
-
- this->center_->attach(newTower);
-
+
+ //this->center_->attach(newTower);
+
newTower->setPosition((x-8) * tileScale, (y-8) * tileScale, 100);
newTower->setGame(this);
-
//TODO: Save the Tower in a Vector. I would suggest std::vector< std::vector<Tower*> > towers_ as a protected member variable;
// TODO: create Tower mesh
Modified: code/branches/newlevel2012/src/modules/towerdefense/TowerDefenseCenterpoint.cc
===================================================================
--- code/branches/newlevel2012/src/modules/towerdefense/TowerDefenseCenterpoint.cc 2012-05-11 14:03:17 UTC (rev 9174)
+++ code/branches/newlevel2012/src/modules/towerdefense/TowerDefenseCenterpoint.cc 2012-05-11 14:03:28 UTC (rev 9175)
@@ -46,7 +46,7 @@
@brief
Constructor. Registers and initializes the object and checks whether the gametype is actually TowerDefense.
*/
- TowerDefenseCenterpoint::TowerDefenseCenterpoint(BaseObject* creator) : StaticEntity(creator)
+ TowerDefenseCenterpoint::TowerDefenseCenterpoint(BaseObject* creator) : MobileEntity(creator)
{
RegisterObject(TowerDefenseCenterpoint);
@@ -54,7 +54,10 @@
this->height_ = 15;
this->towerTemplate_ = "";
+ //this->setCollisionType(Static);
+
this->checkGametype();
+
}
/**
Modified: code/branches/newlevel2012/src/modules/towerdefense/TowerDefenseCenterpoint.h
===================================================================
--- code/branches/newlevel2012/src/modules/towerdefense/TowerDefenseCenterpoint.h 2012-05-11 14:03:17 UTC (rev 9174)
+++ code/branches/newlevel2012/src/modules/towerdefense/TowerDefenseCenterpoint.h 2012-05-11 14:03:28 UTC (rev 9175)
@@ -41,11 +41,11 @@
#include <string>
#include <util/Math.h>
-#include "worldentities/StaticEntity.h"
+#include "worldentities/MobileEntity.h"
namespace orxonox
{
- class _TowerDefenseExport TowerDefenseCenterpoint : public StaticEntity
+ class _TowerDefenseExport TowerDefenseCenterpoint : public MobileEntity
{
public:
TowerDefenseCenterpoint(BaseObject* creator);
Modified: code/branches/newlevel2012/src/orxonox/worldentities/WorldEntity.cc
===================================================================
--- code/branches/newlevel2012/src/orxonox/worldentities/WorldEntity.cc 2012-05-11 14:03:17 UTC (rev 9174)
+++ code/branches/newlevel2012/src/orxonox/worldentities/WorldEntity.cc 2012-05-11 14:03:28 UTC (rev 9175)
@@ -378,7 +378,6 @@
if (!object->notifyBeingAttached(this))
return;
-
this->attachNode(object->node_);
this->children_.insert(object);
More information about the Orxonox-commit
mailing list