Changeset 869 for code/branches/core/src/orxonox

Timestamp:

Mar 9, 2008, 4:04:23 AM (17 years ago)

Author:

landauf

Message:

cool shit's happening here… it works! wow. I wonder why, but hey, don't ask, just commit. this update might also be helpful for the network guys.

• fixed a bug in XMLPort
• fixed a bug in the MultiTypes
• implemented some XMLPort functions in Model, SpaceShip, Skybox and Ambient (and of course the WorldEntity), but this is just a workaround as all those classes are more or less just temporary solutions

Location:

code/branches/core/src/orxonox

Files:

• CMakeLists.txt (modified) (1 diff)
• Orxonox.cc (modified) (2 diffs)
• core/XMLPort.cc (modified) (2 diffs)
• core/XMLPort.h (modified) (4 diffs)
• objects/Ambient.cc (modified) (3 diffs)
• objects/Ambient.h (modified) (1 diff)
• objects/Model.cc (modified) (2 diffs)
• objects/Model.h (modified) (1 diff)
• objects/Skybox.cc (modified) (2 diffs)
• objects/Skybox.h (modified) (1 diff)
• objects/SpaceShip.cc (modified) (5 diffs)
• objects/SpaceShip.h (modified) (1 diff)
• objects/WorldEntity.cc (modified) (2 diffs)
• objects/WorldEntity.h (modified) (5 diffs)

code/branches/core/src/orxonox/CMakeLists.txt

@@ -6 +6 @@
 #  SpaceshipSteering.cc
 #  hud/HUD.cc
-#  particle/ParticleInterface.cc
-#  tools/BillboardSet.cc
+  particle/ParticleInterface.cc
+  tools/BillboardSet.cc
 #  tools/Light.cc
   tools/Mesh.cc
   tools/Timer.cc
-#  objects/Ambient.cc
+  objects/Ambient.cc
 #  objects/Camera.cc
-#  objects/Explosion.cc
+  objects/Explosion.cc
 #  objects/Fighter.cc
   objects/Model.cc
 #  objects/NPC.cc
-#  objects/Projectile.cc
-#  objects/Skybox.cc
-#  objects/SpaceShip.cc
+  objects/Projectile.cc
+  objects/Skybox.cc
+  objects/SpaceShip.cc
 #  objects/SpaceshipSteeringObject.cc
   objects/test1.cc

code/branches/core/src/orxonox/Orxonox.cc

@@ -209 +209 @@
   {
     //TODO: start modules
-//    ogre_->startRender();
+    ogre_->startRender();
     //TODO: run engine
     Factory::createClassHierarchy();
-//    createScene();
-//    setupScene();
-//    setupInputSystem();
+    createScene();
+    setupScene();
+    setupInputSystem();
     if(mode_!=CLIENT){ // remove this in future ---- presentation hack
     }
@@ -1146 +1146 @@
         std::cout << "2\n";
 
-//    startRenderLoop();
+    startRenderLoop();
   }
 

code/branches/core/src/orxonox/core/XMLPort.cc

@@ -28 +28 @@
 #include "XMLPort.h"
 #include "Language.h"
+#include "Loader.h"
 
 namespace orxonox
@@ -82 +83 @@
         return GetLocalisation(this->description_);
     }
+
+    bool XMLPortObjectContainer::identifierIsIncludedInLoaderMask(const Identifier* identifier)
+    {
+        return Loader::currentMask_s.isIncluded(identifier);
+    }
 }

code/branches/core/src/orxonox/core/XMLPort.h

@@ -37 +37 @@
 #include "CoreIncludes.h"
 #include "BaseObject.h"
-#include "Loader.h"
 
 #include "CorePrereqs.h"
@@ -142 +141 @@
                                 {
                                     COUT(5) << tokens.size() << " parameter (using MultiTypeMath)." << std::endl;
-                                    MultiTypeMath param1, param2, param3, param4, param5;
+                                    MultiTypeMath param1 = MT_null, param2 = MT_null, param3 = MT_null, param4 = MT_null, param5 = MT_null;
                                     if (tokens.size() >= 1) param1 = tokens[0];
-                                    if (tokens.size() >= 2) param1 = tokens[1];
-                                    if (tokens.size() >= 3) param1 = tokens[2];
-                                    if (tokens.size() >= 4) param1 = tokens[3];
-                                    if (tokens.size() >= 5) param1 = tokens[4];
+                                    if (tokens.size() >= 2) param2 = tokens[1];
+                                    if (tokens.size() >= 3) param3 = tokens[2];
+                                    if (tokens.size() >= 4) param4 = tokens[3];
+                                    if (tokens.size() >= 5) param5 = tokens[4];
                                     COUT(5) << object->getLoaderIndentation() << "  " << attribute << std::endl;
-                                    COUT(5) << object->getLoaderIndentation() << "  " << tokens[0] << " -> " << param1 << ", " << tokens[1] << " -> " << param2 << ", " << tokens[2] << " -> " << param3 << ", " << tokens[3] << " -> " << param4 << ", " << tokens[4] << " -> " << param5 << std::endl;
+                                    COUT(5) << object->getLoaderIndentation() << "  " << param1 << ", " << param2 << ", " << param3 << ", " << param4 << ", " << param5 << std::endl;
 
                                     (*this->loadfunction_)(object, param1, param2, param3, param4, param5);
@@ -197 +196 @@
             XMLPortObjectContainer& description(const std::string description);
             const std::string& getDescription();
+            static bool identifierIsIncludedInLoaderMask(const Identifier* identifier);
 
         protected:
@@ -236 +236 @@
                                     if (identifier->isA(Class(O)))
                                     {
-                                        if (Loader::currentMask_s.isIncluded(identifier))
+                                        if (this->identifierIsIncludedInLoaderMask(identifier))
                                         {
                                             COUT(4) << object->getLoaderIndentation() << "fabricating " << child->Value() << "..." << std::endl;

code/branches/core/src/orxonox/objects/Ambient.cc

@@ -40 +40 @@
 #include "../core/CoreIncludes.h"
 #include "../Orxonox.h"
+#include "core/XMLPort.h"
 
 #include "Ambient.h"
@@ -58 +59 @@
     void Ambient::loadParams(TiXmlElement* xmlElem)
     {
-        Ogre::SceneManager* mgr = orxonox::Orxonox::getSingleton()->getSceneManager();
-
         if (xmlElem->Attribute("colourvalue"))
         {
@@ -69 +68 @@
                 String2Number<float>(b, colourvalues[2]);
 
-                mgr->setAmbientLight(ColourValue(r,g,b));
+                this->setAmbientLight(ColourValue(r, g, b));
 
                 COUT(4) << "Loader: Set ambient light: "<<r<<" " << g << " " << b  << std::endl << std::endl;
         }
    }
+
+   void Ambient::setAmbientLight(const ColourValue& colour)
+   {
+        Orxonox::getSingleton()->getSceneManager()->setAmbientLight(colour);
+   }
+
+    /**
+        @brief XML loading and saving.
+        @param xmlelement The XML-element
+        @param loading Loading (true) or saving (false)
+        @return The XML-element
+    */
+    Element& Ambient::XMLPort(Element& xmlelement, bool loading)
+    {
+        BaseObject::XMLPort(xmlelement, loading);
+
+        XMLPortParamLoadOnly(Ambient, "colourvalue", setAmbientLight, xmlelement, loading);
+
+        return xmlelement;
+    }
 }

code/branches/core/src/orxonox/objects/Ambient.h

@@ -14 +14 @@
             virtual ~Ambient();
 
-
             void loadParams(TiXmlElement* xmlElem);
+            virtual Element& XMLPort(Element& xmlelement, bool loading);
+            void setAmbientLight(const ColourValue& colour);
 
         private:

code/branches/core/src/orxonox/objects/Model.cc

@@ -33 +33 @@
 #include "../core/CoreIncludes.h"
 #include "../Orxonox.h"
+#include "core/XMLPort.h"
 
 #include "Model.h"
@@ -60 +61 @@
     }
 
+    /**
+        @brief XML loading and saving.
+        @param xmlelement The XML-element
+        @param loading Loading (true) or saving (false)
+        @return The XML-element
+    */
+    Element& Model::XMLPort(Element& xmlelement, bool loading)
+    {
+        WorldEntity::XMLPort(xmlelement, loading);
+
+        XMLPortParamLoadOnly(Model, "mesh", setMesh, xmlelement, loading);
+
+        create();
+
+        return xmlelement;
+    }
+
+    void Model::setMesh(const std::string& meshname)
+    {
+        this->meshSrc_ = meshname;
+    }
+
     bool Model::create(){
       if(meshSrc_.compare("")!=0){

code/branches/core/src/orxonox/objects/Model.h

@@ -18 +18 @@
             virtual ~Model();
             virtual void loadParams(TiXmlElement* xmlElem);
+            virtual Element& XMLPort(Element& xmlelement, bool loading);
+            void setMesh(const std::string& meshname);
             bool create();
 

code/branches/core/src/orxonox/objects/Skybox.cc

@@ -38 +38 @@
 #include "../core/CoreIncludes.h"
 #include "../core/Debug.h"
+#include "core/XMLPort.h"
 
 #include "Skybox.h"
@@ -56 +57 @@
     void Skybox::loadParams(TiXmlElement* xmlElem)
     {
-        Ogre::SceneManager* mgr = orxonox::Orxonox::getSingleton()->getSceneManager();
-
         if (xmlElem->Attribute("src"))
         {
                 std::string skyboxSrc = xmlElem->Attribute("src");
-                mgr->setSkyBox(true, skyboxSrc);
+                this->setSkybox(skyboxSrc);
 
                 COUT(4) << "Loader: Set skybox: "<< skyboxSrc << std::endl << std::endl;
         }
    }
+
+   void Skybox::setSkybox(const std::string& skyboxname)
+   {
+        Orxonox::getSingleton()->getSceneManager()->setSkyBox(true, skyboxname);
+   }
+
+    /**
+        @brief XML loading and saving.
+        @param xmlelement The XML-element
+        @param loading Loading (true) or saving (false)
+        @return The XML-element
+    */
+    Element& Skybox::XMLPort(Element& xmlelement, bool loading)
+    {
+        BaseObject::XMLPort(xmlelement, loading);
+
+        XMLPortParamLoadOnly(Skybox, "src", setSkybox, xmlelement, loading);
+
+        return xmlelement;
+    }
 }

code/branches/core/src/orxonox/objects/Skybox.h

@@ -16 +16 @@
             virtual ~Skybox();
 
-
             void loadParams(TiXmlElement* xmlElem);
+            virtual Element& XMLPort(Element& xmlelement, bool loading);
+            void setSkybox(const std::string& skyboxname);
 
         private:

code/branches/core/src/orxonox/objects/SpaceShip.cc

@@ -44 +44 @@
 #include "../particle/ParticleInterface.h"
 #include "Projectile.h"
+#include "core/XMLPort.h"
 
 #include "SpaceShip.h"
@@ -123 +124 @@
         this->brakeLoop(loop);
 */
+        this->init();
+
         COUT(3) << "Info: SpaceShip was loaded" << std::endl;
     }
@@ -132 +135 @@
     }
 
-    void SpaceShip::setConfigValues()
-    {
-        SetConfigValue(bInvertYAxis_, false).description("Set this to true for joystick-like mouse behaviour (mouse up = ship down).");
-        SetConfigValue(reloadTime_, 0.125).description("The reload time of the weapon in seconds");
-        SetConfigValue(testvector_, Vector3()).description("asdfblah");
-    }
-
-    void SpaceShip::loadParams(TiXmlElement* xmlElem)
-    {
-        Model::loadParams(xmlElem);
-
-
+    void SpaceShip::init()
+    {
         // START CREATING THRUSTER
         this->tt_ = new ParticleInterface(Orxonox::getSingleton()->getSceneManager(),"twinthruster" + this->getName(),"Orxonox/engineglow");
@@ -197 +190 @@
 
         // END of testing crosshair
-
+    }
+
+    void SpaceShip::setConfigValues()
+    {
+        SetConfigValue(bInvertYAxis_, false).description("Set this to true for joystick-like mouse behaviour (mouse up = ship down).");
+        SetConfigValue(reloadTime_, 0.125).description("The reload time of the weapon in seconds");
+        SetConfigValue(testvector_, Vector3()).description("asdfblah");
+    }
+
+    void SpaceShip::loadParams(TiXmlElement* xmlElem)
+    {
+        Model::loadParams(xmlElem);
 /*
         if (xmlElem->Attribute("forward") && xmlElem->Attribute("rotateupdown") && xmlElem->Attribute("rotaterightleft") && xmlElem->Attribute("looprightleft"))
@@ -242 +246 @@
         if (xmlElem->Attribute("camera"))
         {
-            Ogre::Camera *cam = Orxonox::getSingleton()->getSceneManager()->createCamera("ShipCam");
-            this->camNode_ = this->getNode()->createChildSceneNode("CamNode");
-/*
-//            node->setInheritOrientation(false);
-            cam->setPosition(Vector3(0,50,-150));
-            cam->lookAt(Vector3(0,20,0));
-            cam->roll(Degree(0));
-*/
-
-            cam->setPosition(Vector3(-200,0,35));
-//            cam->setPosition(Vector3(0,-350,0));
-            cam->lookAt(Vector3(0,0,35));
-            cam->roll(Degree(-90));
-
-            this->camNode_->attachObject(cam);
-            Orxonox::getSingleton()->getOgrePointer()->getRoot()->getAutoCreatedWindow()->addViewport(cam);
+            this->setCamera();
         }
+    }
+
+    void SpaceShip::setCamera(const std::string& camera)
+    {
+        Ogre::Camera *cam = Orxonox::getSingleton()->getSceneManager()->createCamera("ShipCam");
+        this->camNode_ = this->getNode()->createChildSceneNode("CamNode");
+/*
+//        node->setInheritOrientation(false);
+        cam->setPosition(Vector3(0,50,-150));
+        cam->lookAt(Vector3(0,20,0));
+        cam->roll(Degree(0));
+*/
+
+        cam->setPosition(Vector3(-200,0,35));
+//        cam->setPosition(Vector3(0,-350,0));
+        cam->lookAt(Vector3(0,0,35));
+        cam->roll(Degree(-90));
+
+        this->camNode_->attachObject(cam);
+        Orxonox::getSingleton()->getOgrePointer()->getRoot()->getAutoCreatedWindow()->addViewport(cam);
+    }
+
+    void SpaceShip::setMaxSpeed(float value)
+    { this->maxSpeed_ = value; }
+    void SpaceShip::setMaxSideAndBackSpeed(float value)
+    { this->maxSideAndBackSpeed_ = value; }
+    void SpaceShip::setMaxRotation(float value)
+    { this->maxRotation_ = value; this->maxRotationRadian_ = Radian(value); }
+    void SpaceShip::setTransAcc(float value)
+    { this->translationAcceleration_ = value; }
+    void SpaceShip::setRotAcc(float value)
+    { this->rotationAcceleration_ = value; this->rotationAccelerationRadian_ = Radian(value); }
+    void SpaceShip::setTransDamp(float value)
+    { this->translationDamping_ = value; }
+    void SpaceShip::setRotDamp(float value)
+    { this->rotationDamping_ = value; this->rotationDampingRadian_ = Radian(value); }
+
+    /**
+        @brief XML loading and saving.
+        @param xmlelement The XML-element
+        @param loading Loading (true) or saving (false)
+        @return The XML-element
+    */
+    Element& SpaceShip::XMLPort(Element& xmlelement, bool loading)
+    {
+        Model::XMLPort(xmlelement, loading);
+
+        XMLPortParamLoadOnly(SpaceShip, "camera", setCamera, xmlelement, loading);
+        XMLPortParamLoadOnly(SpaceShip, "maxSpeed", setMaxSpeed, xmlelement, loading);
+        XMLPortParamLoadOnly(SpaceShip, "maxSideAndBackSpeed", setMaxSideAndBackSpeed, xmlelement, loading);
+        XMLPortParamLoadOnly(SpaceShip, "maxRotation", setMaxRotation, xmlelement, loading);
+        XMLPortParamLoadOnly(SpaceShip, "transAcc", setTransAcc, xmlelement, loading);
+        XMLPortParamLoadOnly(SpaceShip, "rotAcc", setRotAcc, xmlelement, loading);
+        XMLPortParamLoadOnly(SpaceShip, "transDamp", setTransDamp, xmlelement, loading);
+        XMLPortParamLoadOnly(SpaceShip, "rotDamp", setRotDamp, xmlelement, loading);
+
+        return xmlelement;
     }
 

code/branches/core/src/orxonox/objects/SpaceShip.h

@@ -21 +21 @@
             SpaceShip();
             ~SpaceShip();
+            void init();
             void setConfigValues();
             virtual void loadParams(TiXmlElement* xmlElem);
+            virtual Element& XMLPort(Element& xmlelement, bool loading);
             virtual void tick(float dt);
+
+            void setCamera(const std::string& camera = "");
+            void setMaxSpeed(float value);
+            void setMaxSideAndBackSpeed(float value);
+            void setMaxRotation(float value);
+            void setTransAcc(float value);
+            void setRotAcc(float value);
+            void setTransDamp(float value);
+            void setRotDamp(float value);
 
             bool mouseMoved(const OIS::MouseEvent &e);

code/branches/core/src/orxonox/objects/WorldEntity.cc

@@ -158 +158 @@
     }
 
+    void WorldEntity::setYawPitchRoll(const Degree& yaw, const Degree& pitch, const Degree& roll)
+    {
+        this->yaw(yaw);
+        this->pitch(pitch);
+        this->roll(roll);
+    }
 
     /**
@@ -169 +175 @@
         BaseObject::XMLPort(xmlelement, loading);
 
-        XMLPortParam(WorldEntity, "position", setPosition, getPosition, xmlelement, loading);
-//        XMLPortParam(WorldEntity, "direction", setDirection, getDirection, xmlelement, loading);
-        XMLPortParamLoadOnly(WorldEntity, "yaw", setYaw, xmlelement, loading);
-        XMLPortParamLoadOnly(WorldEntity, "pitch", setPitch, xmlelement, loading);
-        XMLPortParamLoadOnly(WorldEntity, "roll", setRoll, xmlelement, loading);
+        XMLPortParam(WorldEntity, "position", setPositionLoader2, getPosition, xmlelement, loading);
+        XMLPortParamLoadOnly(WorldEntity, "direction", setDirectionLoader, xmlelement, loading);
+        XMLPortParamLoadOnly(WorldEntity, "yawpitchroll", setYawPitchRoll, xmlelement, loading);
         XMLPortParam(WorldEntity, "scale", setTotalScale, getScale, xmlelement, loading);
-        XMLPortParam(WorldEntity, "rotationAxis", setRotationAxis, getRotationAxis, xmlelement, loading);
+        XMLPortParam(WorldEntity, "rotationAxis", setRotationAxisLoader, getRotationAxis, xmlelement, loading);
         XMLPortParam(WorldEntity, "rotationRate", setRotationRate, getRotationRate, xmlelement, loading);
 

code/branches/core/src/orxonox/objects/WorldEntity.h

@@ -39 +39 @@
             inline void setPosition(const Vector3& pos)
                 { this->node_->setPosition(pos); }
-//            inline void setPosition(Real x, Real y, Real z)
-//                { this->node_->setPosition(x, y, z); }
+            inline void setPositionLoader1(const Vector3& pos)
+                { this->node_->setPosition(pos); }
+            inline void setPositionLoader2(Real x, Real y, Real z)
+                { this->node_->setPosition(x, y, z); }
+            inline void setPosition(Real x, Real y, Real z)
+                { this->node_->setPosition(x, y, z); }
             inline const Vector3& getPosition() const
                 { return this->node_->getPosition(); }
@@ -59 +63 @@
             inline void roll(const Radian &angle, Ogre::Node::TransformSpace relativeTo=Ogre::Node::TS_LOCAL)
                 { this->node_->roll(angle, relativeTo); }
+            void setYawPitchRoll(const Degree& yaw, const Degree& pitch, const Degree& roll);
 
             inline void setYaw(const Degree &angle)
@@ -73 +78 @@
             inline void rotate(const Vector3 &axis, const Radian &angle, Ogre::Node::TransformSpace relativeTo=Ogre::Node::TS_LOCAL)
               { this->node_->rotate(axis, angle, relativeTo); }
+            inline void setDirectionLoader(Real x, Real y, Real z)
+              { this->setDirection(x, y, z); }
             inline void setDirection(Real x, Real y, Real z, Ogre::Node::TransformSpace relativeTo=Ogre::Node::TS_LOCAL, const Vector3 &localDirectionVector=Vector3::NEGATIVE_UNIT_Z)
               { this->node_->setDirection(x, y, z, relativeTo, localDirectionVector); }
@@ -120 +127 @@
                 { return this->acceleration_; }
 
+            inline void setRotationAxisLoader(const Vector3& axis)
+                { this->rotationAxis_ = axis; }
             inline void setRotationAxis(const Vector3& axis)
                 { this->rotationAxis_ = axis; }
-//            inline void setRotationAxis(Real x, Real y, Real z)
-//                { this->rotationAxis_.x = x; this->rotationAxis_.y = y; this->rotationAxis_.z = z; }
+            inline void setRotationAxis(Real x, Real y, Real z)
+                { this->rotationAxis_.x = x; this->rotationAxis_.y = y; this->rotationAxis_.z = z; }
             inline const Vector3& getRotationAxis() const
                 { return this->rotationAxis_; }
@@ -130 +139 @@
 //                { this->rotationRate_ = angle; }
             inline void setRotationRate(const Degree& angle)
-                { this->rotationRate_ = angle; }
+                { this->rotationRate_ = angle; this->setStatic(angle == Degree(0)); }
             inline const Radian& getRotationRate() const
                 { return this->rotationRate_; }