[Orxonox-commit 5472] r10135 - in code/branches/surfaceraceHS14: data/levels data/levels/templates src/modules/dodgerace2
sriedel at orxonox.net
sriedel at orxonox.net
Wed Nov 26 15:59:38 CET 2014
Author: sriedel
Date: 2014-11-26 15:59:37 +0100 (Wed, 26 Nov 2014)
New Revision: 10135
Added:
code/branches/surfaceraceHS14/data/levels/templates/DodgeRacePattern.oxt
Modified:
code/branches/surfaceraceHS14/data/levels/DodgeRace.oxw
code/branches/surfaceraceHS14/data/levels/templates/spaceshipDodgeRace.oxt
code/branches/surfaceraceHS14/src/modules/dodgerace2/DodgeRace.cc
code/branches/surfaceraceHS14/src/modules/dodgerace2/DodgeRace.h
code/branches/surfaceraceHS14/src/modules/dodgerace2/DodgeRaceShip.cc
Log:
Working version, Blockpattern are strange.
Modified: code/branches/surfaceraceHS14/data/levels/DodgeRace.oxw
===================================================================
--- code/branches/surfaceraceHS14/data/levels/DodgeRace.oxw 2014-11-26 14:58:47 UTC (rev 10134)
+++ code/branches/surfaceraceHS14/data/levels/DodgeRace.oxw 2014-11-26 14:59:37 UTC (rev 10135)
@@ -14,6 +14,7 @@
include("templates/spaceshipPirate.oxt")
include("templates/spaceshipDodgeRace.oxt")
include("templates/enemyInvader.oxt")
+ include("templates/DodgeRacePattern.oxt")
include("overlays/InvaderHUD.oxo")
?>
@@ -37,7 +38,7 @@
/>
<!-- <Light type=directional position="0,0,0" direction="0.253, 0.593, -0.765" diffuse="1.0, 0.9, 0.9, 1.0" specular="1.0, 0.9, 0.9, 1.0"/> -->
- <Light type=directional position="1100, 11000, -7000" lookat="0, 0, 0" diffuse="1.0, 0.9, 0.9, 1.0" specular="1.0, 0.9, 0.9, 1.0" />
+ <Light type=directional position="-100, 10000, -700" lookat="0.2, -1, 0" diffuse="1.0, 0.9, 0.9, 1.0" specular="1.0, 0.9, 0.9, 1.0" />
<SpawnPoint team=0 position="-200,0,0" lookat="0,0,0" spawnclass=DodgeRaceShip pawndesign=spaceshipdodgerace />
<DistanceTrigger name="start" position="-200,0,0" target="Pawn" distance=10 stayActive="true" delay=0 />
@@ -46,7 +47,7 @@
<DodgeRaceCenterPoint name=invadercenter />
- <StaticEntity position="1500,0,50" direction="0,0,0" scale="1" collisionType=static mass=0 friction=0.01 >
+ <StaticEntity position="1500,40,50" direction="0,0,0" scale="1" collisionType=static mass=0 friction=0.01 >
<attached>
<Model position="0,0,0" mesh="blackcube.mesh" scale3D="50,50,50" />
</attached>
@@ -56,9 +57,9 @@
</collisionShapes>
</StaticEntity>
- <StaticEntity position="4500,0,-30" direction="0,0,0" scale="1" collisionType=static mass=1 friction=0.01 >
+ <StaticEntity position="4500,50,-30" direction="0,0,0" scale="1" collisionType=static mass=1 friction=0.01 >
<attached>
- <Model position="0,0,0" mesh="blackcube.mesh" scale3D="50,50,50" />
+ <Model position="0,0,0" mesh="blackcube.mesh" scale3D="50,40,50" />
</attached>
<collisionShapes>
@@ -66,6 +67,17 @@
</collisionShapes>
</StaticEntity>
+
+ <StaticEntity position="0,-10,0" direction="0,0,0" scale="1" collisionType=static mass=1 friction=0.01 >
+ <attached>
+ <Model position="0,0,0" mesh="CubeGround.mesh" scale3D="100000,2,100000" />
+ </attached>
+
+ <collisionShapes>
+ <BoxCollisionShape position="0,0,0" halfExtents="1,1,1" />
+ </collisionShapes>
+
+ </StaticEntity>
Added: code/branches/surfaceraceHS14/data/levels/templates/DodgeRacePattern.oxt
===================================================================
--- code/branches/surfaceraceHS14/data/levels/templates/DodgeRacePattern.oxt (rev 0)
+++ code/branches/surfaceraceHS14/data/levels/templates/DodgeRacePattern.oxt 2014-11-26 14:59:37 UTC (rev 10135)
@@ -0,0 +1,19 @@
+<Template name=DodgeRaceCube01>
+
+ <StaticEntity position="0,0,0" direction="0,0,0" scale="1" collisionType=static mass=1 friction=0.01 >
+ <attached>
+ <Model position="0,0,0" mesh="blackcube.mesh" scale3D="600,50,50" />
+ <Model position="0,0,950" mesh="blackcube.mesh" scale3D="600,50,50" />
+ <Model position="800,0,50" mesh="blackcube.mesh" scale3D="100,50,100" />
+ <Model position="800,0,850" mesh="blackcube.mesh" scale3D="100,50,100" />
+ <Model position="850,0,250" mesh="blackcube.mesh" scale3D="50,40,100" />
+ <Model position="850,0,450" mesh="blackcube.mesh" scale3D="50,40,100" />
+ <Model position="850,0,650" mesh="blackcube.mesh" scale3D="50,40,100" />
+ </attached>
+
+ <collisionShapes>
+ <BoxCollisionShape position="0,0,0" halfExtents="1,1,1" />
+ </collisionShapes>
+ </StaticEntity>
+
+</Template>
Modified: code/branches/surfaceraceHS14/data/levels/templates/spaceshipDodgeRace.oxt
===================================================================
--- code/branches/surfaceraceHS14/data/levels/templates/spaceshipDodgeRace.oxt 2014-11-26 14:58:47 UTC (rev 10134)
+++ code/branches/surfaceraceHS14/data/levels/templates/spaceshipDodgeRace.oxt 2014-11-26 14:59:37 UTC (rev 10135)
@@ -68,7 +68,8 @@
<Template name=spaceshipescortcameras defaults=0>
<DodgeRaceShip>
<camerapositions>
- <CameraPosition position="0,30,150" direction="0, 0, -1" drag=false mouselook=true />
+ <CameraPosition position="0,30,150" direction="0, 0, -1" drag=false mouselook=true />
+ <CameraPosition position="0,100,180" direction="0, -0.2, -1" drag=false mouselook=true />
<CameraPosition position="0,1300,-100" direction="0, -1, 0" drag=false mouselook=true />
</camerapositions>
</DodgeRaceShip>
Modified: code/branches/surfaceraceHS14/src/modules/dodgerace2/DodgeRace.cc
===================================================================
--- code/branches/surfaceraceHS14/src/modules/dodgerace2/DodgeRace.cc 2014-11-26 14:58:47 UTC (rev 10134)
+++ code/branches/surfaceraceHS14/src/modules/dodgerace2/DodgeRace.cc 2014-11-26 14:59:37 UTC (rev 10135)
@@ -57,7 +57,8 @@
bShowLevel = false;
multiplier = 1;
b_combo = false;
-
+ counter = 0;
+ lastPosition = 0;
// spawn enemy every 3.5 seconds
//enemySpawnTimer.setTimer(3.5f, true, createExecutor(createFunctor(&DodgeRace::spawnEnemy, this)));
comboTimer.setTimer(3.0f, true, createExecutor(createFunctor(&DodgeRace::comboControll, this)));
@@ -82,6 +83,30 @@
showLevelTimer.setTimer(1.0f, false, createExecutor(createFunctor(&DodgeRace::toggleShowLevel, this)));
}
+ void DodgeRace::tick(float dt)
+ {
+ if (getPlayer() != NULL)
+ {
+ //WeakPtr<DodgeRaceShip> ship = getPlayer();
+
+ currentPosition = getPlayer()->getWorldPosition().x;
+ counter = counter + (currentPosition - lastPosition);
+ lastPosition = currentPosition;
+
+ if(counter >= 5000)
+ {
+ counter = 0;
+
+ WeakPtr<StaticEntity> stentity = new StaticEntity(this->center_->getContext()); //this->center_->getContext()
+ stentity->addTemplate("DodgeRaceCube01");
+
+ stentity->setPosition(getPlayer()->getWorldPosition() + Vector3(5000, 0, 0));
+ //stentity->setScale3D(50,50,50);
+ }
+ }
+ SUPER(DodgeRace, tick, dt);
+ }
+
WeakPtr<DodgeRaceShip> DodgeRace::getPlayer()
{
if (player == NULL)
Modified: code/branches/surfaceraceHS14/src/modules/dodgerace2/DodgeRace.h
===================================================================
--- code/branches/surfaceraceHS14/src/modules/dodgerace2/DodgeRace.h 2014-11-26 14:58:47 UTC (rev 10134)
+++ code/branches/surfaceraceHS14/src/modules/dodgerace2/DodgeRace.h 2014-11-26 14:59:37 UTC (rev 10135)
@@ -73,6 +73,8 @@
virtual void start();
virtual void end();
+ virtual void tick(float dt);
+
void levelUp();
int getLives(){return this->lives;}
@@ -92,6 +94,9 @@
bool bShowLevel;
int lives;
int multiplier;
+ int counter;
+ int currentPosition;
+ int lastPosition;
private:
WeakPtr<DodgeRaceShip> getPlayer();
Modified: code/branches/surfaceraceHS14/src/modules/dodgerace2/DodgeRaceShip.cc
===================================================================
--- code/branches/surfaceraceHS14/src/modules/dodgerace2/DodgeRaceShip.cc 2014-11-26 14:58:47 UTC (rev 10134)
+++ code/branches/surfaceraceHS14/src/modules/dodgerace2/DodgeRaceShip.cc 2014-11-26 14:59:37 UTC (rev 10135)
@@ -41,7 +41,7 @@
{
RegisterObject(DodgeRaceShip);
- speed = 500;
+ speed = 800;
isFireing = false;
damping = 10;
@@ -81,8 +81,12 @@
return;
}
}
+ /*
if (pos.z + dist_x > 42*2.5 || pos.z + dist_x < -42*3)
- velocity.x = 0;
+ {
+ velocity.x = 0;
+ }
+ */
pos += Vector3(1000 + velocity.y, 0, velocity.x) * dt;
}
@@ -98,7 +102,7 @@
WeakPtr<Camera> camera = this->getCamera();
if (camera != NULL)
{
- camera->setPosition(Vector3(-pos.z, -posforeward, 0));
+ // camera->setPosition(Vector3(-pos.z, -posforeward, 0));
camera->setOrientation(Vector3::UNIT_Z, Degree(0));
}
@@ -144,18 +148,21 @@
}
void DodgeRaceShip::boost(bool bBoost)
{
- isFireing = bBoost;
+ //isFireing = bBoost;
}
inline bool DodgeRaceShip::collidesAgainst(WorldEntity* otherObject, btManifoldPoint& contactPoint)
{
+ /*
if (otherObject != NULL && lastEntity != otherObject)
{
lastEntity = otherObject;
removeHealth(20);
- //this->death();
}
+ */
+
+ this->death();
return false;
}
More information about the Orxonox-commit
mailing list