[Orxonox-commit 1858] r6575 - in code/branches/ppspickups1: data/levels data/levels/includes data/levels/templates src/modules/pickup/items
ebeier at orxonox.net
ebeier at orxonox.net
Sat Mar 20 19:45:01 CET 2010
Author: ebeier
Date: 2010-03-20 19:45:01 +0100 (Sat, 20 Mar 2010)
New Revision: 6575
Modified:
code/branches/ppspickups1/data/levels/includes/pickups_speed.oxi
code/branches/ppspickups1/data/levels/pickup_ppstest1.oxw
code/branches/ppspickups1/data/levels/templates/pickup_representation_templates_speed.oxt
code/branches/ppspickups1/src/modules/pickup/items/SpeedPickup.cc
Log:
SpeedPickup Class is now "working" (able to spawn/be picked up), but speed-manipulation of pawn still missing.
Modified: code/branches/ppspickups1/data/levels/includes/pickups_speed.oxi
===================================================================
--- code/branches/ppspickups1/data/levels/includes/pickups_speed.oxi 2010-03-20 17:36:00 UTC (rev 6574)
+++ code/branches/ppspickups1/data/levels/includes/pickups_speed.oxi 2010-03-20 18:45:01 UTC (rev 6575)
@@ -1,18 +1,9 @@
-<PickupRepresentation
- name="SpeedBoost"
- description="Speeds up the Ship for a certain time."
- spawnerTemplate="speedboostpickuprepresentation"
->
- <pickup>
- <SpeedPickup template="speedboostpickup" />
- </pickup>
-</PickupRepresentation>
-<PickupRepresentation
- name="SpeedBoost"
- description="Speeds up the Ship for a certain time."
- spawnerTemplate="speedboostpickuprepresentation"
->
- <pickup>
- <SpeedPickup template="speedboostpickup" />
- </pickup>
-</PickupRepresentation>
+<PickupRepresentation
+ name = "Small Speed Boost"
+ description = "Adds a small amout of speed (?) to the ship."
+ spawnerTemplate = "smallspeedpickupRepresentation"
+>
+ <pickup>
+ <SpeedPickup template=smallspeedpickup />
+ </pickup>
+</PickupRepresentation>
Modified: code/branches/ppspickups1/data/levels/pickup_ppstest1.oxw
===================================================================
--- code/branches/ppspickups1/data/levels/pickup_ppstest1.oxw 2010-03-20 17:36:00 UTC (rev 6574)
+++ code/branches/ppspickups1/data/levels/pickup_ppstest1.oxw 2010-03-20 18:45:01 UTC (rev 6575)
@@ -1,64 +1,35 @@
-<?lua
- include("stats.oxo")
- include("hudtemplates3.oxo")
-
- include("templates/spaceship_assff.oxt")
- include("templates/spaceship_pirate.oxt")
- -- include("templates/pickup_representation_templates_speed.oxt")
-?>
-
-<Level
- name = "SpeedPickupTest"
- description = "Test for the new Speed Pickup"
->
- <Scene
- ambientlight = "0.8, 0.8, 0.8"
- skybox = "Orxonox/Starbox"
- >
-
-<?lua
- include("includes/pickups_speed.oxi")
-?>
-<!--
- <PickupSpawner position="-100,0,-100" triggerDistance="10" respawnTime="30" maxSpawnedItems="10">
- <pickup>
- <SpeedPickup template="speedboostpickup" />
- </pickup>
- </PickupSpawner>
--->
- <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" />
- <SpawnPoint position="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff />
- </Scene>
-</Level>
-<?lua
- include("stats.oxo")
- include("hudtemplates3.oxo")
-
- include("templates/spaceship_assff.oxt")
- include("templates/spaceship_pirate.oxt")
- -- include("templates/pickup_representation_templates_speed.oxt")
-?>
-
-<Level
- name = "SpeedPickupTest"
- description = "Test for the new Speed Pickup"
->
- <Scene
- ambientlight = "0.8, 0.8, 0.8"
- skybox = "Orxonox/Starbox"
- >
-
-<?lua
- include("includes/pickups_speed.oxi")
-?>
-<!--
- <PickupSpawner position="-100,0,-100" triggerDistance="10" respawnTime="30" maxSpawnedItems="10">
- <pickup>
- <SpeedPickup template="speedboostpickup" />
- </pickup>
- </PickupSpawner>
--->
- <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" />
- <SpawnPoint position="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff />
- </Scene>
-</Level>
+<?lua
+ include("stats.oxo")
+ include("hudtemplates3.oxo")
+?>
+
+<?lua
+ include("templates/spaceship_assff.oxt")
+ include("templates/spaceship_pirate.oxt")
+ include("templates/pickup_representation_templates_speed.oxt")
+?>
+
+<Level
+ name = "Sample"
+ description = "Just a few tests"
+>
+ <Scene
+ ambientlight = "0.8, 0.8, 0.8"
+ skybox = "Orxonox/Starbox"
+ >
+
+<?lua
+ include("includes/pickups_speed.oxi")
+?>
+
+ <PickupSpawner position="-25,0,-100" triggerDistance="10" respawnTime="10" maxSpawnedItems="99">
+ <pickup>
+ <SpeedPickup template=smallspeedpickup />
+ </pickup>
+ </PickupSpawner>
+
+
+ <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" />
+ <SpawnPoint position="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff />
+ </Scene>
+</Level>
Modified: code/branches/ppspickups1/data/levels/templates/pickup_representation_templates_speed.oxt
===================================================================
--- code/branches/ppspickups1/data/levels/templates/pickup_representation_templates_speed.oxt 2010-03-20 17:36:00 UTC (rev 6574)
+++ code/branches/ppspickups1/data/levels/templates/pickup_representation_templates_speed.oxt 2010-03-20 18:45:01 UTC (rev 6575)
@@ -1,50 +1,25 @@
-<Template name=speedboostpickupRepresentation>
- <PickupRepresentation>
- <spawner-representation>
- <StaticEntity>
- <attached>
- <Billboard position="0,0,0" colour="1,0,0" material="Sphere2" scale=0.1>
- <attached>
- <Billboard position="0,0,0" colour="0,1,0" material="Cross" scale=1 />
- </attached>
- </Billboard>
- </attached>
- </StaticEntity>
- </spawner-representation>
- </PickupRepresentation>
-</Template>
-
-<Template name="speedboostpickup">
- <SpeedPickup
- speedAddition = "0"
- speedMultiplier = "2"
- duration = "10"
- activationType = "immediate"
- durationType = "once"
- />
-</Template>
-<Template name=speedboostpickupRepresentation>
- <PickupRepresentation>
- <spawner-representation>
- <StaticEntity>
- <attached>
- <Billboard position="0,0,0" colour="1,0,0" material="Sphere2" scale=0.1>
- <attached>
- <Billboard position="0,0,0" colour="0,1,0" material="Cross" scale=1 />
- </attached>
- </Billboard>
- </attached>
- </StaticEntity>
- </spawner-representation>
- </PickupRepresentation>
-</Template>
-
-<Template name="speedboostpickup">
- <SpeedPickup
- speedAddition = "0"
- speedMultiplier = "2"
- duration = "10"
- activationType = "immediate"
- durationType = "once"
- />
-</Template>
+<Template name=smallspeedpickupRepresentation>
+ <PickupRepresentation>
+ <spawner-representation>
+ <StaticEntity>
+ <attached>
+ <Billboard position="0,0,0" colour="1.0,0.0,0.0" material="Sphere2" scale=0.1>
+ <attached>
+ <Billboard position="0,0,0" colour="1.0,1.0,0.0" material="Cross" scale=0.7 />
+ </attached>
+ </Billboard>
+ </attached>
+ </StaticEntity>
+ </spawner-representation>
+ </PickupRepresentation>
+</Template>
+
+<Template name=smallspeedpickup>
+ <SpeedPickup
+ duration = 10
+ speedAdd = 1
+ SpeedMultiply = 1
+ activationType = "immediate"
+ durationType = "once"
+ />
+</Template>
Modified: code/branches/ppspickups1/src/modules/pickup/items/SpeedPickup.cc
===================================================================
--- code/branches/ppspickups1/src/modules/pickup/items/SpeedPickup.cc 2010-03-20 17:36:00 UTC (rev 6574)
+++ code/branches/ppspickups1/src/modules/pickup/items/SpeedPickup.cc 2010-03-20 18:45:01 UTC (rev 6575)
@@ -73,9 +73,9 @@
*/
void SpeedPickup::initialize(void)
{
- this->duration_ = 0;
- this->speedAdd_ = 0;
- this->speedMultiply_ = 0;
+ this->duration_ = 0.0;
+ this->speedAdd_ = 0.0;
+ this->speedMultiply_ = 1.0;
this->addTarget(ClassIdentifier<Pawn>::getIdentifier());
}
@@ -268,14 +268,14 @@
*/
void SpeedPickup::setSpeedMultiply(float speedMultiply)
{
- if(speedMultiply > 0.0f)
+ if(speedMultiply != 0.0f)
{
this->speedMultiply_ = speedMultiply;
}
else
{
COUT(1) << "Invalid speedMultiply in SpeedPickup." << std::endl;
- this->speedMultiply_ = 0.0;
+ this->speedMultiply_ = 1.0;
}
}
}
More information about the Orxonox-commit
mailing list