[Orxonox-commit 6699] r11328 - in code/branches/SpaceRace_HS16: data/levels src/modules/gametypes src/orxonox/infos
meilel at orxonox.net
meilel at orxonox.net
Mon Dec 12 14:17:47 CET 2016
Author: meilel
Date: 2016-12-12 14:17:47 +0100 (Mon, 12 Dec 2016)
New Revision: 11328
Modified:
code/branches/SpaceRace_HS16/data/levels/newnewnewspacerace.oxw
code/branches/SpaceRace_HS16/src/modules/gametypes/SpaceRaceController.cc
code/branches/SpaceRace_HS16/src/orxonox/infos/Bot.cc
Log:
start and finish line
Modified: code/branches/SpaceRace_HS16/data/levels/newnewnewspacerace.oxw
===================================================================
--- code/branches/SpaceRace_HS16/data/levels/newnewnewspacerace.oxw 2016-12-12 13:11:48 UTC (rev 11327)
+++ code/branches/SpaceRace_HS16/data/levels/newnewnewspacerace.oxw 2016-12-12 13:17:47 UTC (rev 11328)
@@ -103,7 +103,7 @@
<ForceField position="0,0,0" direction="0,-1,0" diameter=700 velocity=2000 length=2000/>
<!-- ------------------Planet----------------- -->
- <Planet position="25000,5000,5000" scale=1500 pitch=-90 mesh="iceplanet.mesh" atmosphere="atmosphere1" rotationaxis="8,1,0" rotationrate="1" atmospheresize=224.0f imagesize=1024.0f />
+ <Planet position="25000,5000,5000" scale=3000 pitch=-90 mesh="iceplanet.mesh" atmosphere="atmosphere1" rotationaxis="8,1,0" rotationrate="1" atmospheresize=224.0f imagesize=1024.0f />
<StaticEntity position="0,0,0" collisionType=static>
<collisionShapes>
<SphereCollisionShape radius="1" />
@@ -188,6 +188,7 @@
?>
<?lua end ?>
+
<!-- ------------------Boards----------------- -->
<StaticEntity position="1000,160,0" direction="-1,0,0" yaw=90 pitch=0 roll=-30 collisionType="static">
<attached>
@@ -198,7 +199,7 @@
</collisionShapes>
</StaticEntity>
- <StaticEntity position="3000,330,100" direction="-1,0,0" yaw=90 pitch=0 roll=-30 collisionType="static">
+ <StaticEntity position="5000,230,500" direction="-1,0,0" yaw=90 pitch=0 roll=-30 collisionType="static">
<attached>
<Model scale="20" mesh="Board2.mesh" />
</attached>
@@ -207,7 +208,7 @@
</collisionShapes>
</StaticEntity>
-<StaticEntity position="5000,230,500" direction="-1,0,0" yaw=90 pitch=0 roll=-30 collisionType="static">
+<StaticEntity position="10000,-70,200" direction="-1,0,0" yaw=90 pitch=0 roll=-30 collisionType="static">
<attached>
<Model scale="20" mesh="Board2.mesh" />
</attached>
@@ -216,7 +217,6 @@
</collisionShapes>
</StaticEntity>
-
<!-- ---------------------Checkpoints---------------------- -->
<SpaceRaceManager>
@@ -225,7 +225,7 @@
<RaceCheckPoint name="checkpoint1" yaw=90 pitch=90 position="1000,30,0" roll="0" direction="0,1,0" collisionType="static" scale="1" distance="60" checkpointindex="0" islast="false" nextcheckpoints="1,-1,-1">
<attached>
- <Model position="0,0,0" scale="70" mesh="Checkpoint_InnerRing.mesh"/>
+ <Model position="0,0,0" scale="70" mesh="Checkpoint_Green.mesh"/>
</attached>
<collisionShapes>
<BoxCollisionShape position="0,0,70" halfExtents="70, 10, 10" />
@@ -469,13 +469,13 @@
<RaceCheckPoint name="checkpoint20" yaw=90 pitch=90 position="53000,0,0" direction="0,1,0" roll="0" collisionType="static" scale="1" distance="60" checkpointindex="19" islast="true">
<attached>
- <Model position="0,0,0" scale="70" mesh="Checkpoint_InnerRing.mesh"/>
+ <Model position="0,0,0" scale="70" mesh="Checkpoint_Finish.mesh"/>
</attached>
<collisionShapes>
- <BoxCollisionShape position="0,0,70" halfExtents="70, 10, 10" />
- <BoxCollisionShape position="0,0,-70" halfExtents="70, 10, 10" />
- <BoxCollisionShape position="70,0,0" halfExtents="10, 10, 70" />
- <BoxCollisionShape position="-70,0,0" halfExtents="10, 10, 70" />
+ <BoxCollisionShape position="0,0,90" halfExtents="90, 13, 13" />
+ <BoxCollisionShape position="0,0,-90" halfExtents="90, 13, 13" />
+ <BoxCollisionShape position="90,0,0" halfExtents="13, 13, 90" />
+ <BoxCollisionShape position="-90,0,0" halfExtents="13, 13, 90" />
</collisionShapes>
</RaceCheckPoint>
Modified: code/branches/SpaceRace_HS16/src/modules/gametypes/SpaceRaceController.cc
===================================================================
--- code/branches/SpaceRace_HS16/src/modules/gametypes/SpaceRaceController.cc 2016-12-12 13:11:48 UTC (rev 11327)
+++ code/branches/SpaceRace_HS16/src/modules/gametypes/SpaceRaceController.cc 2016-12-12 13:17:47 UTC (rev 11328)
@@ -168,6 +168,7 @@
minDistance = distance;
minNextRaceCheckPoint = nextRaceCheckPoint;
}
+
}
return minNextRaceCheckPoint;
@@ -306,6 +307,7 @@
lastPositionSpaceship = this->getControllableEntity()->getPosition();
//orxout()<< "CP "<< currentRaceCheckpoint_->getCheckpointIndex()<<" chanched to: "<< nextRaceCheckpoint_->getCheckpointIndex()<<endl;
}
+
else if ((lastPositionSpaceship-this->getControllableEntity()->getPosition()).length()/dt > ADJUSTDISTANCE)
{
nextRaceCheckpoint_ = adjustNextPoint();
Modified: code/branches/SpaceRace_HS16/src/orxonox/infos/Bot.cc
===================================================================
--- code/branches/SpaceRace_HS16/src/orxonox/infos/Bot.cc 2016-12-12 13:11:48 UTC (rev 11327)
+++ code/branches/SpaceRace_HS16/src/orxonox/infos/Bot.cc 2016-12-12 13:17:47 UTC (rev 11328)
@@ -69,30 +69,24 @@
{
"Berkay Berabi",
"Louis Meile"
- "Dr. Julius No",
+ "Dr. Julius No 3",
"Rosa Klebb",
- "Auric Goldfinger",
- "Emilio Largo",
- "Ernst Stavro Blofeld",
+ "Muten Roshi",
+ "Abradolf Lincler",
"Dr. Kananga",
"Francisco Scaramanga",
"Karl Stromberg",
"Sir Hugo Drax",
- "Aris Kristatos",
"Kamal Khan",
"General Orlov",
- "Max Zorin",
- "Brad Whitaker",
"General Georgi Koskov",
- "Franz Sanchez",
+ "Karl the Llama",
"Alec Trevelyan",
- "Elliot Carver",
- "Elektra King",
- "Viktor Zokas",
- "Gustav Graves",
+ "Thomas the Tankengine",
+ "Rick",
+ "Morty",
+ "Charlie the Unicorn",
"Kung Fury",
- "Mr. White",
- "Dominic Greene"
};
static std::vector<std::string> defaultnames(names, names + sizeof(names) / sizeof(std::string));
More information about the Orxonox-commit
mailing list