[Orxonox-commit 6528] r11170 - in code/branches/sagerjFS16: data/levels/includes src/modules/weapons/weaponmodes src/orxonox/controllers src/orxonox/weaponsystem src/orxonox/worldentities src/orxonox/worldentities/pawns
sagerj at orxonox.net
sagerj at orxonox.net
Thu Apr 21 15:33:49 CEST 2016
Author: sagerj
Date: 2016-04-21 15:33:48 +0200 (Thu, 21 Apr 2016)
New Revision: 11170
Modified:
code/branches/sagerjFS16/data/levels/includes/weaponSettingsEscort.oxi
code/branches/sagerjFS16/src/modules/weapons/weaponmodes/Discharger.cc
code/branches/sagerjFS16/src/modules/weapons/weaponmodes/Discharger.h
code/branches/sagerjFS16/src/orxonox/controllers/HumanController.cc
code/branches/sagerjFS16/src/orxonox/controllers/NewHumanController.cc
code/branches/sagerjFS16/src/orxonox/weaponsystem/Weapon.cc
code/branches/sagerjFS16/src/orxonox/weaponsystem/WeaponMode.cc
code/branches/sagerjFS16/src/orxonox/weaponsystem/WeaponMode.h
code/branches/sagerjFS16/src/orxonox/weaponsystem/WeaponPack.cc
code/branches/sagerjFS16/src/orxonox/weaponsystem/WeaponSet.cc
code/branches/sagerjFS16/src/orxonox/weaponsystem/WeaponSystem.cc
code/branches/sagerjFS16/src/orxonox/worldentities/ControllableEntity.cc
code/branches/sagerjFS16/src/orxonox/worldentities/pawns/Pawn.cc
Log:
running backup
Modified: code/branches/sagerjFS16/data/levels/includes/weaponSettingsEscort.oxi
===================================================================
--- code/branches/sagerjFS16/data/levels/includes/weaponSettingsEscort.oxi 2016-04-17 18:40:05 UTC (rev 11169)
+++ code/branches/sagerjFS16/data/levels/includes/weaponSettingsEscort.oxi 2016-04-21 13:33:48 UTC (rev 11170)
@@ -1,24 +1,44 @@
<weaponslots>
- <WeaponSlot position="-9.2,2,-13" />
+ <WeaponSlot
+ position="-9.2,2,-13"
+ />
+ </weaponslots>
- </weaponslots>
<weaponsets>
- <WeaponSet firemode=0 />
-
+ <WeaponSet
+ firemode=0
+ />
</weaponsets>
+
<weaponpacks>
<WeaponPack>
<links>
- <DefaultWeaponmodeLink firemode=0 weaponmode=0 />
-
+ <DefaultWeaponmodeLink
+ firemode=0
+ weaponmode=0
+ />
</links>
<Weapon>
- <Discharger mode=0 munitionpershot=1 delay=0 damage=9.3 material="Flares/point_lensflare" muzzleoffset=" 1.6, 1.3, -2.0" projectileMesh="LaserBeam2.mesh" />
+ <Discharger
+ mode=0
+ munitionpershot=1
+ delay=0
+ damage=9.3
+ material="Flares/point_lensflare"
+ muzzleoffset=" 1.6, 1.3, -2.0"
+ projectileMesh="LaserBeam2.mesh"
+ />
</Weapon>
</WeaponPack>
</weaponpacks>
<munition>
- <LaserMunition initialmagazines=8 maxmagazines=8 munitionpermagazine=10 replenishamount=1 replenishinterval=7.5/>
+ <LaserMunition
+ initialmagazines=8
+ maxmagazines=8
+ munitionpermagazine=10
+ replenishamount=1
+ replenishinterval=7.5
+ />
</munition>
Modified: code/branches/sagerjFS16/src/modules/weapons/weaponmodes/Discharger.cc
===================================================================
--- code/branches/sagerjFS16/src/modules/weapons/weaponmodes/Discharger.cc 2016-04-17 18:40:05 UTC (rev 11169)
+++ code/branches/sagerjFS16/src/modules/weapons/weaponmodes/Discharger.cc 2016-04-21 13:33:48 UTC (rev 11170)
@@ -50,24 +50,38 @@
{
RegisterObject(Discharger);
+ this->reloadTime_ = 0.23f;
+ this->damage_ = 90.01f;
+ this->speed_ = 90.01f;
+ this->charges_ = 0;
+
this->setMunitionName("LaserMunition");
+ this->setFireSound("sounds/Weapon_LaserFire.ogg");
+ this->setReloadSound("sounds/Reload_LaserFire.ogg", 0.8);
hudImageString_ = "Orxonox/WSHUD_WM_LaserFire";
}
void Discharger::fire()
{
- orxout() << "fire dis " << endl;
+ charges_ += 1;
+ orxout() << "c = " << charges_ << endl;
}
- bool Discharger::fire(float* reloadTime)
+ void Discharger::release()
{
- orxout() << "fire Discharger " << endl;
- return false;
+ orxout() << "release c = " << charges_ << endl;
+ BillboardProjectile* projectile = new BillboardProjectile(this->getContext());
+
+ this->computeMuzzleParameters(this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn()->getAimPosition());
+ projectile->setOrientation(this->getMuzzleOrientation());
+ projectile->setPosition(this->getMuzzlePosition());
+ projectile->setVelocity(this->getMuzzleDirection() * this->speed_ * charges_);
+
+ projectile->setShooter(this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn());
+ projectile->setDamage(this->getDamage() * charges_);
+ projectile->setShieldDamage(this->getShieldDamage() * charges_);
+ projectile->setHealthDamage(this->getHealthDamage() * charges_);
+ this->charges_ = 0;
}
- bool Discharger::release(float* reloadTime)
- {
- orxout() << "release Discharger " << endl;
- return false;
- }
-}
+}
\ No newline at end of file
Modified: code/branches/sagerjFS16/src/modules/weapons/weaponmodes/Discharger.h
===================================================================
--- code/branches/sagerjFS16/src/modules/weapons/weaponmodes/Discharger.h 2016-04-17 18:40:05 UTC (rev 11169)
+++ code/branches/sagerjFS16/src/modules/weapons/weaponmodes/Discharger.h 2016-04-21 13:33:48 UTC (rev 11170)
@@ -54,10 +54,11 @@
virtual ~Discharger() {}
virtual void fire() override;
- virtual bool fire(float* reloadTime) override;
- virtual bool release(float* reloadTime) override;
+ virtual void release() override;
private:
+ float speed_; // The speed of the fired projectile.
+ unsigned int charges_; // An indicator of how much you charged up.
};
}
Modified: code/branches/sagerjFS16/src/orxonox/controllers/HumanController.cc
===================================================================
--- code/branches/sagerjFS16/src/orxonox/controllers/HumanController.cc 2016-04-17 18:40:05 UTC (rev 11169)
+++ code/branches/sagerjFS16/src/orxonox/controllers/HumanController.cc 2016-04-21 13:33:48 UTC (rev 11170)
@@ -158,14 +158,12 @@
void HumanController::fire(unsigned int firemode)
{
- orxout() << "fire hc " << firemode << endl;
if (HumanController::localController_s)
HumanController::localController_s->doFire(firemode);
}
void HumanController::doFire(unsigned int firemode)
{
- orxout() << "do fire hc " << firemode << endl;
if (HumanController::localController_s && HumanController::localController_s->controllableEntity_)
{
HumanController::localController_s->controllableEntity_->fire(firemode);
@@ -179,14 +177,12 @@
void HumanController::release(unsigned int firemode)
{
- orxout() << "release hc " << firemode << endl;
if (HumanController::localController_s)
HumanController::localController_s->doRelease(firemode);
}
void HumanController::doRelease(unsigned int firemode)
{
- orxout() << "do release hc " << firemode << endl;
if (HumanController::localController_s && HumanController::localController_s->controllableEntity_)
{
HumanController::localController_s->controllableEntity_->release(firemode);
Modified: code/branches/sagerjFS16/src/orxonox/controllers/NewHumanController.cc
===================================================================
--- code/branches/sagerjFS16/src/orxonox/controllers/NewHumanController.cc 2016-04-17 18:40:05 UTC (rev 11169)
+++ code/branches/sagerjFS16/src/orxonox/controllers/NewHumanController.cc 2016-04-21 13:33:48 UTC (rev 11170)
@@ -284,21 +284,18 @@
if (firemode == 1 && this->controlMode_ == 1)
{
- orxout() << "do fire nhc if " << firemode << endl;
//unlocked steering, steer on right mouse click
HumanController::yaw(Vector2(this->currentYaw_, 0));
HumanController::pitch(Vector2(this->currentPitch_, 0));
}
else
{
- orxout() << "do fire nhc else " << firemode << endl;
HumanController::doFire(firemode); //call for formationflight
}
}
void NewHumanController::doRelease(unsigned int firemode)
{
- orxout() << "do release nhc" << firemode << endl;
if (!this->controllableEntity_)
return;
Modified: code/branches/sagerjFS16/src/orxonox/weaponsystem/Weapon.cc
===================================================================
--- code/branches/sagerjFS16/src/orxonox/weaponsystem/Weapon.cc 2016-04-17 18:40:05 UTC (rev 11169)
+++ code/branches/sagerjFS16/src/orxonox/weaponsystem/Weapon.cc 2016-04-21 13:33:48 UTC (rev 11170)
@@ -113,7 +113,8 @@
//
// Note: The reloading of each WeaponMode is internally handled by each A, B and C.
// The reloading of the weapon is only performed to avoid firing with different modes at the same time.
- orxout() << "fire weapon " << mode << endl;
+
+
if (this->bReloading_ && this->reloadingWeaponmode_ != mode)
return;
@@ -136,7 +137,6 @@
void Weapon::release(unsigned int mode)
{
- orxout() << "release weapon " << mode << endl;
if (this->bReloading_ && this->reloadingWeaponmode_ != mode)
return;
Modified: code/branches/sagerjFS16/src/orxonox/weaponsystem/WeaponMode.cc
===================================================================
--- code/branches/sagerjFS16/src/orxonox/weaponsystem/WeaponMode.cc 2016-04-17 18:40:05 UTC (rev 11169)
+++ code/branches/sagerjFS16/src/orxonox/weaponsystem/WeaponMode.cc 2016-04-21 13:33:48 UTC (rev 11170)
@@ -120,7 +120,6 @@
bool WeaponMode::fire(float* reloadTime)
{
(*reloadTime) = this->reloadTime_;
- orxout() << "fire wm " << reloadTime << endl;
// Fireing is only possible if this weapon mode is not reloading and there is enough munition
if (!this->bReloading_ && this->munition_ && this->munition_->takeMunition(this->munitionPerShot_, this))
{
@@ -170,7 +169,7 @@
bool WeaponMode::release(float* reloadTime)
{
- orxout() << "release wm " << reloadTime << endl;
+ this->release();
return false;
}
Modified: code/branches/sagerjFS16/src/orxonox/weaponsystem/WeaponMode.h
===================================================================
--- code/branches/sagerjFS16/src/orxonox/weaponsystem/WeaponMode.h 2016-04-17 18:40:05 UTC (rev 11169)
+++ code/branches/sagerjFS16/src/orxonox/weaponsystem/WeaponMode.h 2016-04-21 13:33:48 UTC (rev 11170)
@@ -164,6 +164,7 @@
void playReloadSound();
virtual void fire() = 0;
+ virtual void release() {};
unsigned int initialMunition_;
unsigned int initialMagazines_;
Modified: code/branches/sagerjFS16/src/orxonox/weaponsystem/WeaponPack.cc
===================================================================
--- code/branches/sagerjFS16/src/orxonox/weaponsystem/WeaponPack.cc 2016-04-17 18:40:05 UTC (rev 11169)
+++ code/branches/sagerjFS16/src/orxonox/weaponsystem/WeaponPack.cc 2016-04-21 13:33:48 UTC (rev 11170)
@@ -75,14 +75,12 @@
*/
void WeaponPack::fire(unsigned int weaponmode)
{
- orxout() << "fire wp " << weaponmode << endl;
for (Weapon* weapon : this->weapons_)
weapon->fire(weaponmode);
}
void WeaponPack::release(unsigned int weaponmode)
{
- orxout() << "release wp " << weaponmode << endl;
for (Weapon* weapon : this->weapons_)
weapon->release(weaponmode);
}
Modified: code/branches/sagerjFS16/src/orxonox/weaponsystem/WeaponSet.cc
===================================================================
--- code/branches/sagerjFS16/src/orxonox/weaponsystem/WeaponSet.cc 2016-04-17 18:40:05 UTC (rev 11169)
+++ code/branches/sagerjFS16/src/orxonox/weaponsystem/WeaponSet.cc 2016-04-21 13:33:48 UTC (rev 11170)
@@ -62,7 +62,6 @@
void WeaponSet::fire()
{
// Fire all WeaponPacks with their defined weaponmode
- orxout() << "fire wset " << endl;
for (const auto& mapEntry : this->weaponpacks_)
if (mapEntry.second != WeaponSystem::WEAPON_MODE_UNASSIGNED)
mapEntry.first->fire(mapEntry.second);
@@ -71,7 +70,6 @@
void WeaponSet::release()
{
// Fire all WeaponPacks with their defined weaponmode
- orxout() << "release wset " << endl;
for (const auto& mapEntry : this->weaponpacks_)
if (mapEntry.second != WeaponSystem::WEAPON_MODE_UNASSIGNED)
mapEntry.first->release(mapEntry.second);
Modified: code/branches/sagerjFS16/src/orxonox/weaponsystem/WeaponSystem.cc
===================================================================
--- code/branches/sagerjFS16/src/orxonox/weaponsystem/WeaponSystem.cc 2016-04-17 18:40:05 UTC (rev 11169)
+++ code/branches/sagerjFS16/src/orxonox/weaponsystem/WeaponSystem.cc 2016-04-21 13:33:48 UTC (rev 11170)
@@ -288,7 +288,6 @@
*/
void WeaponSystem::fire(unsigned int firemode)
{
- orxout() << "fire wsys " << firemode << endl;
std::map<unsigned int, WeaponSet *>::iterator it = this->weaponSets_.find(firemode);
if (it != this->weaponSets_.end() && it->second)
it->second->fire();
@@ -296,7 +295,6 @@
void WeaponSystem::release(unsigned int firemode)
{
- orxout() << "release wsys " << firemode << endl;
std::map<unsigned int, WeaponSet *>::iterator it = this->weaponSets_.find(firemode);
if (it != this->weaponSets_.end() && it->second)
it->second->release();
Modified: code/branches/sagerjFS16/src/orxonox/worldentities/ControllableEntity.cc
===================================================================
--- code/branches/sagerjFS16/src/orxonox/worldentities/ControllableEntity.cc 2016-04-17 18:40:05 UTC (rev 11169)
+++ code/branches/sagerjFS16/src/orxonox/worldentities/ControllableEntity.cc 2016-04-21 13:33:48 UTC (rev 11170)
@@ -302,12 +302,10 @@
{
if(GameMode::isMaster())
{
- orxout() << "fire ce if " << firemode << endl;
this->fired(firemode);
}
else
{
- orxout() << "fire ce else " << firemode << endl;
callMemberNetworkFunction(&ControllableEntity::fire, this->getObjectID(), 0, firemode);
}
}
@@ -316,12 +314,10 @@
{
if(GameMode::isMaster())
{
- orxout() << "release ce if " << firemode << endl;
this->released(firemode);
}
else
{
- orxout() << "release ce else " << firemode << endl;
callMemberNetworkFunction(&ControllableEntity::fire, this->getObjectID(), 0, firemode);
}
}
Modified: code/branches/sagerjFS16/src/orxonox/worldentities/pawns/Pawn.cc
===================================================================
--- code/branches/sagerjFS16/src/orxonox/worldentities/pawns/Pawn.cc 2016-04-17 18:40:05 UTC (rev 11169)
+++ code/branches/sagerjFS16/src/orxonox/worldentities/pawns/Pawn.cc 2016-04-21 13:33:48 UTC (rev 11170)
@@ -429,14 +429,12 @@
void Pawn::fired(unsigned int firemode)
{
- orxout() << "fired pawn " << firemode << endl;
if (this->weaponSystem_)
this->weaponSystem_->fire(firemode);
}
void Pawn::released(unsigned int firemode)
{
- orxout() << "released pawn " << firemode << endl;
if (this->weaponSystem_)
this->weaponSystem_->release(firemode);
}
More information about the Orxonox-commit
mailing list