[Orxonox-commit 3451] r8137 - in code/branches/dockingsystem: data/levels src/modules src/modules/docking
sven at orxonox.net
sven at orxonox.net
Mon Mar 28 14:57:32 CEST 2011
Author: sven
Date: 2011-03-28 14:57:31 +0200 (Mon, 28 Mar 2011)
New Revision: 8137
Added:
code/branches/dockingsystem/data/levels/docking.oxw
code/branches/dockingsystem/src/modules/docking/
code/branches/dockingsystem/src/modules/docking/CMakeLists.txt
code/branches/dockingsystem/src/modules/docking/Dock.cc
code/branches/dockingsystem/src/modules/docking/Dock.h
code/branches/dockingsystem/src/modules/docking/DockingPrecompiledHeaders.h
code/branches/dockingsystem/src/modules/docking/DockingPrereqs.h
Modified:
code/branches/dockingsystem/src/modules/CMakeLists.txt
Log:
M src/modules/CMakeLists.txt
A src/modules/docking
A src/modules/docking/Dock.cc
A src/modules/docking/DockingPrecompiledHeaders.h
A src/modules/docking/Dock.h
A src/modules/docking/DockingPrereqs.h
A src/modules/docking/CMakeLists.txt
A data/levels/docking.oxw
Added: code/branches/dockingsystem/data/levels/docking.oxw
===================================================================
--- code/branches/dockingsystem/data/levels/docking.oxw (rev 0)
+++ code/branches/dockingsystem/data/levels/docking.oxw 2011-03-28 12:57:31 UTC (rev 8137)
@@ -0,0 +1,149 @@
+<LevelInfo
+ name = "Transporter"
+ description = "Level with moving Transporter."
+ tags = ""
+/>
+
+<?lua
+ include("HUDTemplates3.oxo")
+ include("stats.oxo")
+ include("templates/spaceshipAssff.oxt")
+ include("templates/lodInformation.oxt")
+?>
+
+<Level
+ name = "Transporter"
+ description = "Level with Transporter :)"
+>
+ <templates>
+ <Template link=lodtemplate_default />
+ </templates>
+
+ <Scene
+ ambientlight = "0.5, 0.5, 0.5"
+ skybox = "Orxonox/skypanoramagen1"
+ >
+
+ <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" />
+
+ <?lua for i = 1, 10, 1 do ?>
+ <SpawnPoint position="<?lua print(math.random() * 500 - 250) ?>,<?lua print(math.random() * 500 - 250) ?>,<?lua print(math.random() * 500 - 250) ?>" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff />
+ <?lua end ?>
+
+
+ <!-- stolen from underAttack.oxw -->
+
+ <Destroyer
+ position = "100,150,0"
+ collisionType = dynamic
+ mass = 100000
+ velocity = "0,0,0"
+ angularDamping = 0.9999999
+ health = 10000
+ maxhealth = 10000
+ initialhealth = 10000
+ >
+
+ <attached>
+
+ <Dock>
+ <events>
+ <execute>
+ <EventListener event="dockMe" />
+ </execute>
+ </events>
+ <attached>
+ <PlayerTrigger name="dockMe" /> //A PlayerTrigger triggering the execution of the QuestEffectBeacon.
+ </attached>
+ </Dock>
+
+ <TeamSpawnPoint team=1 position="150,0,7" direction="-1,0,0" roll=90 yaw=0 spawnclass=SpaceShip pawndesign=spaceshipassff />
+ <TeamSpawnPoint team=1 position="0,0,7" lookat="-1,0,0" roll="90" yaw=0 spawnclass=SpaceShip pawndesign=spaceshipassff />
+ <TeamSpawnPoint team=1 position="-50,0,7" lookat="-1,0,0" roll="90" yaw=0 spawnclass=SpaceShip pawndesign=spaceshipassff />
+ <TeamSpawnPoint team=1 position="100,0,7" lookat="-1,0,0" roll="90" yaw=0 spawnclass=SpaceShip pawndesign=spaceshipassff />
+ <TeamSpawnPoint team=1 position="50,0,7" lookat="-1,0,0" roll="90" yaw=0 spawnclass=SpaceShip pawndesign=spaceshipassff />
+ <?lua for i = 1, 100, 1 do ?>
+ <TeamSpawnPoint
+ team=0
+ position="<?lua print((math.random() * 500 + 500) * (math.floor(math.random() + 0.5) * 2 - 1)) ?>,<?lua print((math.random() * 500 + 500) * (math.floor(math.random() + 0.5) * 2 - 1)) ?>,<?lua print((math.random() * 500 + 500) * (math.floor(math.random() + 0.5) * 2 - 1)) ?>"
+ lookat="0,0,0"
+ spawnclass=SpaceShip
+ pawndesign=spaceshipassff
+ />
+ <?lua end ?>
+
+ <Model mesh="Carrier.mesh" scale="5" />
+ <Backlight
+ mainstate=activity
+ active=false
+ scale=0.4
+ name=bltest
+ position=" 7.6, 0, 6"
+ colour="0.2, 0.65, 1.0, 1.0"
+ width=15
+ length=1500
+ lifetime=2
+ elements=50
+ trailmaterial="Trail/backlighttrail"
+ turnontime=1
+ turnofftime=1
+ material="Flares/ThrusterFlare1"
+ />
+ <?lua for i=0,8,1 do ?>
+ <BlinkingBillboard
+ position="<?lua print(200-270/8*i)?> ,15,2"
+ material="Examples/Flare"
+ colour="1.0, 0.5, 0.3"
+ phase="<?lua print(-360/8*i)?>"
+ amplitude=0.1
+ frequency=0.5
+ quadratic=1
+ />
+
+ <BlinkingBillboard
+ position="<?lua print(200-270/8*i)?>,-15,2"
+ material="Examples/Flare"
+ colour="1.0, 0.5, 0.3"
+ phase="<?lua print(-360/8*i)?>"
+ amplitude=0.1
+ frequency=0.5
+ quadratic=1
+ />
+ <?lua end ?>
+
+ <Backlight
+ scale=1
+ position=" 169, 75, -15"
+ colour="1, 0.85, 0.5, 0.5"
+ width=40
+ length=1000
+ lifetime=5
+ elements=15
+ trailmaterial="Trail/backlighttrail"
+ material="Examples/Flare"
+ />
+ <Backlight
+ scale=1
+ position=" 169, -75, -15"
+ colour="1, 0.85, 0.5, 0.5"
+ width=40
+ length=1000
+ lifetime=5
+ elements=15
+ trailmaterial="Trail/backlighttrail"
+ material="Examples/Flare" />
+ </attached>
+ <collisionShapes>
+ <BoxCollisionShape position="70,0,-25" halfExtents="150, 50, 25" />
+ <BoxCollisionShape position="95,75,-16" halfExtents="70, 10, 12" />
+ <BoxCollisionShape position="95,-75,-16" halfExtents="70, 10, 12" />
+ <BoxCollisionShape position="77,47,30" halfExtents="110, 2, 30" />
+ <BoxCollisionShape position="77,-47,30" halfExtents="110, 2, 30" />
+ <BoxCollisionShape position="77,0,50" halfExtents="110, 45, 6" />
+ <BoxCollisionShape position="167,0,70" halfExtents="17, 20, 20" />
+ </collisionShapes>
+ </Destroyer>
+
+
+ </Scene>
+</Level>
Modified: code/branches/dockingsystem/src/modules/CMakeLists.txt
===================================================================
--- code/branches/dockingsystem/src/modules/CMakeLists.txt 2011-03-28 11:24:12 UTC (rev 8136)
+++ code/branches/dockingsystem/src/modules/CMakeLists.txt 2011-03-28 12:57:31 UTC (rev 8137)
@@ -33,3 +33,4 @@
ADD_SUBDIRECTORY(pong)
ADD_SUBDIRECTORY(questsystem)
ADD_SUBDIRECTORY(weapons)
+ADD_SUBDIRECTORY(docking)
Added: code/branches/dockingsystem/src/modules/docking/CMakeLists.txt
===================================================================
--- code/branches/dockingsystem/src/modules/docking/CMakeLists.txt (rev 0)
+++ code/branches/dockingsystem/src/modules/docking/CMakeLists.txt 2011-03-28 12:57:31 UTC (rev 8137)
@@ -0,0 +1,14 @@
+SET_SOURCE_FILES(DOCKING_SRC_FILES
+ Dock.cc
+)
+
+ORXONOX_ADD_LIBRARY(docking
+ MODULE
+ FIND_HEADER_FILES
+ TOLUA_FILES
+ PCH_FILE
+ DockingPrecompiledHeaders.h
+ LINK_LIBRARIES
+ orxonox
+ SOURCE_FILES ${DOCKING_SRC_FILES}
+)
Added: code/branches/dockingsystem/src/modules/docking/Dock.cc
===================================================================
--- code/branches/dockingsystem/src/modules/docking/Dock.cc (rev 0)
+++ code/branches/dockingsystem/src/modules/docking/Dock.cc 2011-03-28 12:57:31 UTC (rev 8137)
@@ -0,0 +1,81 @@
+/*
+ * 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:
+ * Sven Stucki
+ * Co-authors:
+ * ...
+ *
+ */
+
+/**
+ @file Dock.cc
+ @brief Docking system main class
+*/
+
+#include "Dock.h"
+
+#include "core/CoreIncludes.h"
+#include "core/XMLPort.h"
+
+
+namespace orxonox
+{
+
+
+ CreateFactory(Dock);
+
+ Dock::Dock(BaseObject* creator) : StaticEntity(creator)
+ {
+ RegisterObject(Dock);
+ COUT(0) << "Registering dock..." << endl;
+ }
+
+ Dock::~Dock()
+ {
+ }
+
+
+ void Dock::XMLPort(Element& xmlelement, XMLPort::Mode mode)
+ {
+ SUPER(Dock, XMLPort, xmlelement, mode);
+
+ // TODO: Something similar to XMLPortObject(Dock, QuestEffect, "effects", addEffect, getEffect, xmlelement, mode);
+ XMLPortEventSink(Dock, BaseObject, "execute", execute, xmlelement, mode);
+
+ COUT(0) << "Dock created.." << std::endl;
+ }
+
+ void Dock::XMLEventPort(Element& xmlelement, XMLPort::Mode mode)
+ {
+ SUPER(Dock, XMLEventPort, xmlelement, mode);
+
+ XMLPortEventSink(Dock, BaseObject, "execute", execute, xmlelement, mode);
+ }
+
+
+ bool Dock::execute(bool bTriggered, BaseObject* trigger)
+ {
+ COUT(0) << "Dock executed (bTriggered = " << (bTriggered? "true":"false") << ").." << endl;
+ }
+
+
+}
Added: code/branches/dockingsystem/src/modules/docking/Dock.h
===================================================================
--- code/branches/dockingsystem/src/modules/docking/Dock.h (rev 0)
+++ code/branches/dockingsystem/src/modules/docking/Dock.h 2011-03-28 12:57:31 UTC (rev 8137)
@@ -0,0 +1,57 @@
+/*
+ * 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:
+ * Sven Stucki
+ * Co-authors:
+ * ...
+ *
+ */
+
+/**
+ @file Dock.h
+ @brief Definition of Dock class
+ @ingroup Docking
+*/
+
+#ifndef _Dock_H__
+#define _Dock_H__
+
+#include "DockingPrereqs.h"
+
+namespace orxonox {
+
+
+ class _DockingExport Dock : public StaticEntity {
+ public:
+ Dock(BaseObject* creator);
+ virtual ~Dock();
+
+ virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+ virtual void XMLEventPort(Element& xmlelement, XMLPort::Mode mode);
+
+ bool execute(bool bTriggered, BaseObject* trigger);
+ }
+
+
+}
+
+#endif /* _Dock_H__ */
Added: code/branches/dockingsystem/src/modules/docking/DockingPrecompiledHeaders.h
===================================================================
--- code/branches/dockingsystem/src/modules/docking/DockingPrecompiledHeaders.h (rev 0)
+++ code/branches/dockingsystem/src/modules/docking/DockingPrecompiledHeaders.h 2011-03-28 12:57:31 UTC (rev 8137)
@@ -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:
+ * Reto Grieder
+ * Co-authors:
+ * ...
+ *
+ */
+
+/**
+ at file
+ at brief
+*/
+
+#include "OrxonoxConfig.h"
+
+///////////////////////////////////////////
+///// Stable Headers /////
+///////////////////////////////////////////
+
+#include <LinearMath/btTransform.h>
+
+///////////////////////////////////////////
+///// All Rebuild Headers /////
+///////////////////////////////////////////
+
+#include "core/BaseObject.h"
+#include "core/CoreIncludes.h"
+#include "core/XMLPort.h"
+
+
+// Just in case some header included windows.h
+#undef min
+#undef max
Added: code/branches/dockingsystem/src/modules/docking/DockingPrereqs.h
===================================================================
--- code/branches/dockingsystem/src/modules/docking/DockingPrereqs.h (rev 0)
+++ code/branches/dockingsystem/src/modules/docking/DockingPrereqs.h 2011-03-28 12:57:31 UTC (rev 8137)
@@ -0,0 +1,77 @@
+/*
+ * 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:
+ * Damian 'Mozork' Frick
+ * Co-authors:
+ * ...
+ *
+ */
+
+/**
+ at file
+ at brief
+ Shared library macros, enums, constants and forward declarations for the questsystem module
+*/
+
+#ifndef _DockingPrereqs_H__
+#define _DockingPrereqs_H__
+
+#include "OrxonoxConfig.h"
+#include "OrxonoxPrereqs.h"
+
+//-----------------------------------------------------------------------
+// Shared library settings
+//-----------------------------------------------------------------------
+
+#if defined(ORXONOX_PLATFORM_WINDOWS) && !defined(Docking_STATIC_BUILD)
+# ifdef Docking_SHARED_BUILD
+# define _DockingExport __declspec(dllexport)
+# else
+# if defined( __MINGW32__ )
+# define _DockingExport
+# else
+# define _DockingExport __declspec(dllimport)
+# endif
+# endif
+#elif defined ( ORXONOX_GCC_VISIBILITY )
+# define _DockingExport __attribute__ ((visibility("default")))
+#else
+# define _DockingExport
+#endif
+
+//-----------------------------------------------------------------------
+// Forward declarations
+//-----------------------------------------------------------------------
+
+namespace orxonox
+{
+ class Notification;
+ class NotificationDispatcher;
+ class NotificationManager;
+ class NotificationQueue;
+
+ //dispatchers
+ class CommandNotification;
+ class SimpleNotification;
+}
+
+#endif /* _DockingPrereqs_H__ */
More information about the Orxonox-commit
mailing list