[Orxonox-commit 1002] r5723 - in code/branches/libraries2/src: modules modules/weapons orxonox/objects/weaponsystem
landauf at orxonox.net
landauf at orxonox.net
Mon Aug 31 17:50:17 CEST 2009
Author: landauf
Date: 2009-08-31 17:50:17 +0200 (Mon, 31 Aug 2009)
New Revision: 5723
Added:
code/branches/libraries2/src/modules/weapons/
code/branches/libraries2/src/modules/weapons/CMakeLists.txt
code/branches/libraries2/src/modules/weapons/MuzzleFlash.cc
code/branches/libraries2/src/modules/weapons/MuzzleFlash.h
code/branches/libraries2/src/modules/weapons/munitions/
code/branches/libraries2/src/modules/weapons/projectiles/
code/branches/libraries2/src/modules/weapons/weaponmodes/
Removed:
code/branches/libraries2/src/orxonox/objects/weaponsystem/MuzzleFlash.cc
code/branches/libraries2/src/orxonox/objects/weaponsystem/MuzzleFlash.h
code/branches/libraries2/src/orxonox/objects/weaponsystem/munitions/
code/branches/libraries2/src/orxonox/objects/weaponsystem/projectiles/
code/branches/libraries2/src/orxonox/objects/weaponsystem/weaponmodes/
Log:
added weapons directory in modules, moved weapon classes (weaponmodes, projectiles, munitions, MuzzleFlash) there
Copied: code/branches/libraries2/src/modules/weapons/CMakeLists.txt (from rev 5722, code/branches/libraries2/src/orxonox/objects/weaponsystem/CMakeLists.txt)
===================================================================
--- code/branches/libraries2/src/modules/weapons/CMakeLists.txt (rev 0)
+++ code/branches/libraries2/src/modules/weapons/CMakeLists.txt 2009-08-31 15:50:17 UTC (rev 5723)
@@ -0,0 +1,27 @@
+ADD_SOURCE_FILES(ORXONOX_SRC_FILES
+ Munition.cc
+ Weapon.cc
+ WeaponMode.cc
+ WeaponPack.cc
+ WeaponSet.cc
+ WeaponSlot.cc
+ WeaponSystem.cc
+ DefaultWeaponmodeLink.cc
+)
+
+SET_SOURCE_FILES(WEAPONSYSTEM_SRC_FILES
+ MuzzleFlash.cc
+)
+
+ADD_SUBDIRECTORY(munitions)
+ADD_SUBDIRECTORY(projectiles)
+ADD_SUBDIRECTORY(weaponmodes)
+
+ORXONOX_ADD_LIBRARY(weaponsystem
+ MODULE
+ DEFINE_SYMBOL
+ "WEAPONSYSTEM_SHARED_BUILD"
+ LINK_LIBRARIES
+ orxonox
+ SOURCE_FILES ${WEAPONSYSTEM_SRC_FILES}
+)
Copied: code/branches/libraries2/src/modules/weapons/MuzzleFlash.cc (from rev 5722, code/branches/libraries2/src/orxonox/objects/weaponsystem/MuzzleFlash.cc)
===================================================================
--- code/branches/libraries2/src/modules/weapons/MuzzleFlash.cc (rev 0)
+++ code/branches/libraries2/src/modules/weapons/MuzzleFlash.cc 2009-08-31 15:50:17 UTC (rev 5723)
@@ -0,0 +1,53 @@
+/*
+ * ORXONOX - the hottest 3D action shooter ever to exist
+ * > www.orxonox.net <
+ *
+ *
+ * License notice:
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * Author:
+ * Hagen Seifert
+ * Co-authors:
+ * Ich
+ * Dini Mueter
+ *
+ */
+
+#include "MuzzleFlash.h"
+
+#include "core/CoreIncludes.h"
+#include "core/Executor.h"
+
+namespace orxonox
+{
+ CreateFactory(MuzzleFlash);
+
+ MuzzleFlash::MuzzleFlash(BaseObject* creator) : Billboard(creator)
+ {
+ RegisterObject(MuzzleFlash);
+ this->setScale(0.1f);
+
+ this->delayTimer_.setTimer(0.1f, false, this, createExecutor(createFunctor(&MuzzleFlash::destroy)));
+
+ }
+
+ void MuzzleFlash::destroy()
+ {
+ delete this;
+ }
+
+}
Copied: code/branches/libraries2/src/modules/weapons/MuzzleFlash.h (from rev 5722, code/branches/libraries2/src/orxonox/objects/weaponsystem/MuzzleFlash.h)
===================================================================
--- code/branches/libraries2/src/modules/weapons/MuzzleFlash.h (rev 0)
+++ code/branches/libraries2/src/modules/weapons/MuzzleFlash.h 2009-08-31 15:50:17 UTC (rev 5723)
@@ -0,0 +1,54 @@
+/*
+ * ORXONOX - the hottest 3D action shooter ever to exist
+ * > www.orxonox.net <
+ *
+ *
+ * License notice:
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * Author:
+ * Hagen Seifert
+ * Co-authors:
+ * ...
+ *
+ */
+
+#ifndef _MuzzleFlash_H__
+#define _MuzzleFlash_H__
+
+#include "objects/weaponsystem/WeaponsystemPrereqs.h"
+
+#include "tools/Timer.h"
+#include "objects/worldentities/Billboard.h"
+
+namespace orxonox
+{
+ class _WeaponsystemExport MuzzleFlash : public Billboard
+ {
+ public:
+ MuzzleFlash(BaseObject* creator);
+ virtual ~MuzzleFlash() {}
+
+
+
+ private:
+ void destroy();
+ Timer<MuzzleFlash> delayTimer_;
+
+ };
+}
+
+#endif /* _MuzzleFlash_H__ */
Deleted: code/branches/libraries2/src/orxonox/objects/weaponsystem/MuzzleFlash.cc
===================================================================
--- code/branches/libraries2/src/orxonox/objects/weaponsystem/MuzzleFlash.cc 2009-08-31 15:37:33 UTC (rev 5722)
+++ code/branches/libraries2/src/orxonox/objects/weaponsystem/MuzzleFlash.cc 2009-08-31 15:50:17 UTC (rev 5723)
@@ -1,53 +0,0 @@
-/*
- * ORXONOX - the hottest 3D action shooter ever to exist
- * > www.orxonox.net <
- *
- *
- * License notice:
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * Author:
- * Hagen Seifert
- * Co-authors:
- * Ich
- * Dini Mueter
- *
- */
-
-#include "MuzzleFlash.h"
-
-#include "core/CoreIncludes.h"
-#include "core/Executor.h"
-
-namespace orxonox
-{
- CreateFactory(MuzzleFlash);
-
- MuzzleFlash::MuzzleFlash(BaseObject* creator) : Billboard(creator)
- {
- RegisterObject(MuzzleFlash);
- this->setScale(0.1f);
-
- this->delayTimer_.setTimer(0.1f, false, this, createExecutor(createFunctor(&MuzzleFlash::destroy)));
-
- }
-
- void MuzzleFlash::destroy()
- {
- delete this;
- }
-
-}
Deleted: code/branches/libraries2/src/orxonox/objects/weaponsystem/MuzzleFlash.h
===================================================================
--- code/branches/libraries2/src/orxonox/objects/weaponsystem/MuzzleFlash.h 2009-08-31 15:37:33 UTC (rev 5722)
+++ code/branches/libraries2/src/orxonox/objects/weaponsystem/MuzzleFlash.h 2009-08-31 15:50:17 UTC (rev 5723)
@@ -1,54 +0,0 @@
-/*
- * ORXONOX - the hottest 3D action shooter ever to exist
- * > www.orxonox.net <
- *
- *
- * License notice:
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * Author:
- * Hagen Seifert
- * Co-authors:
- * ...
- *
- */
-
-#ifndef _MuzzleFlash_H__
-#define _MuzzleFlash_H__
-
-#include "objects/weaponsystem/WeaponsystemPrereqs.h"
-
-#include "tools/Timer.h"
-#include "objects/worldentities/Billboard.h"
-
-namespace orxonox
-{
- class _WeaponsystemExport MuzzleFlash : public Billboard
- {
- public:
- MuzzleFlash(BaseObject* creator);
- virtual ~MuzzleFlash() {}
-
-
-
- private:
- void destroy();
- Timer<MuzzleFlash> delayTimer_;
-
- };
-}
-
-#endif /* _MuzzleFlash_H__ */
More information about the Orxonox-commit
mailing list