Changeset 8200

Timestamp:

Apr 7, 2011, 12:55:24 PM (13 years ago)

Author:

FelixSchulthess

Message:

blah

Location:

code/branches/portals

Files:

• data/levels/portals.oxw (modified) (1 diff)
• src/modules/CMakeLists.txt (modified) (1 diff)
• src/modules/objects/triggers/MultiTrigger.cc (modified) (3 diffs)
• src/modules/objects/triggers/TriggerBase.h (modified) (1 diff)
• src/modules/portals/CMakeLists.txt (modified) (1 diff)
• src/modules/portals/PortalEndPoint.cc (modified) (3 diffs)
• src/modules/portals/PortalEndPoint.h (modified) (3 diffs)
• src/modules/portals/PortalLink.cc (modified) (3 diffs)
• src/modules/portals/PortalLink.h (modified) (2 diffs)
• src/modules/portals/PortalsPrecompiledHeaders.h (moved) (moved from code/branches/portals/src/modules/portals/PortalPrecompiledHeaders.h)
• src/modules/portals/PortalsPrereqs.h (moved) (moved from code/branches/portals/src/modules/portals/PortalPrereqs.h)

code/branches/portals/data/levels/portals.oxw

@@ -27 +27 @@
 
 
-   <PortalEndPoint position="0,0,0" material="Examples/Flare" id="1"/>
-   <PortalEndPoint position="-100,0,0" material="Examples/Flare" id="2"/>
-   <PortalLink fromID="1" toID="2" />
+        <PortalEndPoint position="0,0,0" id="1">
+                <attached>
+                        <Billboard material="Examples/Flare" />
+                </attached>
+        </PortalEndPoint>
+        <PortalEndPoint position="-100,0,0" id="2">
+                <attached>
+                        <Billboard material="Examples/Flare2" />
+                </attached>
+        </PortalEndPoint>
+        <PortalLink fromID="1" toID="2" />
 
     <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" />

code/branches/portals/src/modules/CMakeLists.txt

@@ -32 +32 @@
 ADD_SUBDIRECTORY(pickup)
 ADD_SUBDIRECTORY(pong)
+ADD_SUBDIRECTORY(portals)
 ADD_SUBDIRECTORY(questsystem)
 ADD_SUBDIRECTORY(weapons)

code/branches/portals/src/modules/objects/triggers/MultiTrigger.cc

@@ -116 +116 @@
         }
 
-        // Check if the object is active (this is NOT MultiTrigger::isActive()!)
+        // Check if the object is active (this is NOT MultiTrigger::isActive()!), it is whether the MultiTrigger actually does anything, ever. 
         if (!this->BaseObject::isActive())
             return;
@@ -205 +205 @@
                             {
                                 // If the MultiTrigger has not exceeded its remaining activations.
-                                if(this->remainingActivations_ > 0)
+                                if(this->hasRemainingActivations())
                                 {
                                     this->active_.insert(state->originator);
@@ -218 +218 @@
                             {
                                 // If the MultiTrigger doesn't stay active or hasn't' exceeded its remaining activations.
-                                if(!this->getStayActive() || this->remainingActivations_ > 0)
+                                if(!this->getStayActive() || this->hasRemainingActivations())
                                     this->active_.erase(state->originator);
                                 else

code/branches/portals/src/modules/objects/triggers/TriggerBase.h

@@ -186 +186 @@
                 { if(activations >= 0 || activations == INF_s) this->remainingActivations_ = activations; }
 
+                        inline bool hasRemainingActivations(void)
+                                { return this->remainingActivations_ == INF_s || this->remainingActivations_  > 0; } 
+
             /**
             @brief Adds the parent of a MultiTrigger.

code/branches/portals/src/modules/portals/CMakeLists.txt

@@ -9 +9 @@
   TOLUA_FILES
   PCH_FILE
-    PickupPrecompiledHeaders.h
+    PortalsPrecompiledHeaders.h
   LINK_LIBRARIES
     orxonox

code/branches/portals/src/modules/portals/PortalEndPoint.cc

@@ -8 +8 @@
     std::map<unsigned int, PortalEndPoint *> PortalEndPoint::idMap_s;
 
-    PortalEndPoint::PortalEndPoint(BaseObject* creator) : StaticEntity(creator), id_(0), material_(""), billboard_(0)
+    PortalEndPoint::PortalEndPoint(BaseObject* creator) : DistanceMultiTrigger(creator), id_(0)
     {
         RegisterObject(PortalEndPoint);
@@ -22 +22 @@
         SUPER(PortalEndPoint, XMLPort, xmlelement, mode);
         XMLPortParam(PortalEndPoint, "id", setID, getID, xmlelement, mode);
-        XMLPortParamExtern(PortalEndPoint, Billboard, this->billboard_, "material", setMaterial, getMaterial, xmlelement, mode);
-        XMLPortParamExtern(PortalEndPoint, Billboard, this->billboard_, "colour", setColour, getColour, xmlelement, mode).defaultValues(ColourValue::White);
         
         if(mode == XMLPort::LoadObject)
@@ -33 +31 @@
     void PortalEndPoint::tick(float dt)
     {
-        SUPER(PortalEndPoint, tick);
+        SUPER(PortalEndPoint, tick, dt);
     }
 

code/branches/portals/src/modules/portals/PortalEndPoint.h

@@ -1 +1 @@
 #ifndef _PortalEndPoint_H__
 #define _PortalEndPoint_H__
+
+#include "portals/PortalsPrereqs.h"
 
 #include <set>
@@ -6 +8 @@
 #include <map>
 
-#include "StaticEntity.h"
+#include "worldentities/StaticEntity.h"
 #include "graphics/Billboard.h"
-#include "modules/objects/triggers/DistanceMultiTrigger.h"
+#include "objects/triggers/DistanceMultiTrigger.h"
 
 namespace orxonox
 {
-    class _OrxonoxExport PortalEndPoint : public DistanceMultiTrigger
+    class _PortalsExport PortalEndPoint : public DistanceMultiTrigger
     {
         public:
@@ -36 +38 @@
             unsigned int id_;
             std::set<WorldEntity *> recentlyJumpedOut_; //!< Entities which recently jumped out of this EndPoint, hence they shouldn't be pulled in again if the endpoint is the beginning of a link
-            Billboard billboard_;
     };
 

code/branches/portals/src/modules/portals/PortalLink.cc

@@ -7 +7 @@
     CreateFactory(PortalLink);
     
-    PortalLink::PortalLink(BaseObject* creator) : BaseObject(creator), fromID_(0), toID_(0), from_(0), to_(0), activationRadius_(20)
+    PortalLink::PortalLink(BaseObject* creator) : EventListener(creator), fromID_(0), toID_(0), from_(0), to_(0), activationRadius_(20)
     {
         RegisterObject(PortalLink);
@@ -32 +32 @@
     void PortalLink::tick(float dt)
     {
-        SUPER(PortalLink, tick)
+        SUPER(PortalLink, tick, dt);
     }
     
     void PortalLink::processEvent(Event& event)
     {
-        SUPER(PortalLink, processEvent);
+        EventListener::processEvent(event);
         if(!event.activate_)
         {
@@ -53 +53 @@
             return;
         }
-        to_->jumpOut(entity);
+        to_->jumpOut(eventEntity);
     }
 

code/branches/portals/src/modules/portals/PortalLink.h

@@ -2 +2 @@
 #define _PortalLink_H__
 
-#include "OrxonoxPrereqs.h"
+#include "portals/PortalsPrereqs.h"
 #include "tools/interfaces/Tickable.h"
 #include "core/BaseObject.h"
@@ -12 +12 @@
 namespace orxonox
 {
-    class _OrxonoxExport PortalLink : public EventListener
+    class _PortalsExport PortalLink : public EventListener
     {
         public: