Changeset 661 for code/branches/FICN/src

Timestamp:

Dec 20, 2007, 6:55:17 PM (18 years ago)

Author:

nicolasc

Message:

added a test crosshair — same hack as blinky

Location:

code/branches/FICN/src

Files:

• loader/LevelLoader.cc (modified) (1 diff)
• orxonox/objects/SpaceShip.cc (modified) (1 diff)
• orxonox/objects/SpaceShip.h (modified) (1 diff)

code/branches/FICN/src/loader/LevelLoader.cc

@@ -49 +49 @@
 LevelLoader::LevelLoader(string file, string path)
 {
-        valid_ = false;
-
-        // Load XML level file
-        path.append("/");
-        path.append(file);
-
-        // Open xml file
-        doc.LoadFile(path);
-
-        // Check if file was loaded
-        if (doc.LoadFile())
-        {
-                TiXmlHandle hDoc(&doc);
-                TiXmlHandle hRoot(0);
-                TiXmlElement* pElem;
-
-                // Check for root element
-                pElem = hDoc.FirstChildElement("orxonoxworld").Element();
-                if (pElem)
-                {
-                        // Set root element
-                        hRoot = TiXmlHandle(pElem);
-                        rootElement = hRoot.Element();
-
-                        // Set level description
-                        pElem = hRoot.FirstChild("description").Element();
-                        if (pElem)
-                        {
-                                description_ = pElem->GetText();
-                        }
-
-                        // Set level name
-                        name_ = rootElement->Attribute("name");
-                        image_ = rootElement->Attribute("image");
-
-                        valid_ = true;
-                }
-                else
-                {
-                        orxonox::Error("Level file has no valid root node");
-                }
-        }
-        else
-        {
-                orxonox::Error("Could not load level file ");
-        }
+  valid_ = false;
+
+  // Load XML level file
+  path.append("/");
+  path.append(file);
+
+  // Open xml file
+  doc.LoadFile(path);
+
+  // Check if file was loaded
+  if (doc.LoadFile())
+  {
+    TiXmlHandle hDoc(&doc);
+    TiXmlHandle hRoot(0);
+    TiXmlElement* pElem;
+
+    // Check for root element
+    pElem = hDoc.FirstChildElement("orxonoxworld").Element();
+    if (pElem)
+    {
+      // Set root element
+      hRoot = TiXmlHandle(pElem);
+      rootElement = hRoot.Element();
+
+      // Set level description
+      pElem = hRoot.FirstChild("description").Element();
+      if (pElem)
+      {
+        description_ = pElem->GetText();
+      }
+
+      // Set level name
+      name_ = rootElement->Attribute("name");
+      image_ = rootElement->Attribute("image");
+
+      valid_ = true;
+    }
+    else
+    {
+      orxonox::Error("Level file has no valid root node");
+    }
+  }
+  else
+  {
+    orxonox::Error("Could not load level file ");
+  }
 }
 
-        void LevelLoader::loadLevel()
-        {
-                if (valid_)
-                {
-                        TiXmlElement* loadElem;
-                        TiXmlElement* audioElem;
-                        TiXmlElement* worldElem;
-                        TiXmlElement* tElem;
-                        TiXmlNode* tNode;
-
-                        Ogre::OverlayManager& omgr = Ogre::OverlayManager::getSingleton();
-                        Ogre::Overlay* mLoadOverlay; // FIXME: mey be uninitialized
-
-                        // Set loading screen
-                        loadElem = rootElement->FirstChildElement("loading");
-                        if (loadElem)
-                        {
-                                // Set background
-                                tElem = loadElem->FirstChildElement("background");
-                                if (tElem)
-                                {
-                                        loadingBackgroundColor_ = tElem->Attribute("color");
-                                        loadingBackgroundImage_ = tElem->Attribute("image");
-                                }
-                                // Set bar
-                                tElem = loadElem->FirstChildElement("bar");
-                                if (tElem)
-                                {
-                                        loadingBarImage_ = tElem->Attribute("image");;
-                                        loadingBarTop_ = tElem->Attribute("top");
-                                        loadingBarLeft_ = tElem->Attribute("left");
-                                        loadingBarWidth_ = tElem->Attribute("width");
-                                        loadingBarHeight_ = tElem->Attribute("height");
-                                }
-
-
-                    mLoadOverlay = (Ogre::Overlay*)omgr.getByName("Orxonox/LoadingScreenSample");
-                    mLoadOverlay->show();
-
-                                COUT(0) << "\n\n\nThis is Orxonox\nthe hottest 3D action shooter ever to exist\n\n\n";
-                                COUT(0) << "Level: " << name() << "\nDescription:" << description() << "\nImage:"<<image()<<"\n\n\n";
-                                COUT(4) << "Backgroundcolor: " << loadingBackgroundColor_ << "\nBackgroundimage:" << loadingBackgroundImage_ << "\n\n\n";
-
-                        }
-
-                        // Load audio
-                        audio::AudioManager* auMan = orxonox::Orxonox::getSingleton()->getAudioManagerPointer();
-                        audioElem = rootElement->FirstChildElement("audio");
-
-                        if (audioElem)
-                        {
-                                audioElem = audioElem->FirstChildElement("ambient");
-                                if (audioElem)
-                                {
-                                        tNode = 0;
+  void LevelLoader::loadLevel()
+  {
+    if (valid_)
+    {
+      TiXmlElement* loadElem;
+      TiXmlElement* audioElem;
+      TiXmlElement* worldElem;
+      TiXmlElement* tElem;
+      TiXmlNode* tNode;
+
+      Ogre::OverlayManager& omgr = Ogre::OverlayManager::getSingleton();
+      Ogre::Overlay* mLoadOverlay; // FIXME: mey be uninitialized
+
+      // Set loading screen
+      loadElem = rootElement->FirstChildElement("loading");
+      if (loadElem)
+      {
+        // Set background
+        tElem = loadElem->FirstChildElement("background");
+        if (tElem)
+        {
+          loadingBackgroundColor_ = tElem->Attribute("color");
+          loadingBackgroundImage_ = tElem->Attribute("image");
+        }
+        // Set bar
+        tElem = loadElem->FirstChildElement("bar");
+        if (tElem)
+        {
+          loadingBarImage_ = tElem->Attribute("image");;
+          loadingBarTop_ = tElem->Attribute("top");
+          loadingBarLeft_ = tElem->Attribute("left");
+          loadingBarWidth_ = tElem->Attribute("width");
+          loadingBarHeight_ = tElem->Attribute("height");
+        }
+
+
+        mLoadOverlay = (Ogre::Overlay*)omgr.getByName("Orxonox/LoadingScreenSample");
+        mLoadOverlay->show();
+
+        COUT(0) << "\n\n\nThis is Orxonox\nthe hottest 3D action shooter ever to exist\n\n\n";
+        COUT(0) << "Level: " << name() << "\nDescription:" << description() << "\nImage:"<<image()<<"\n\n\n";
+        COUT(4) << "Backgroundcolor: " << loadingBackgroundColor_ << "\nBackgroundimage:" << loadingBackgroundImage_ << "\n\n\n";
+
+      }
+
+      // Load audio
+      audio::AudioManager* auMan = orxonox::Orxonox::getSingleton()->getAudioManagerPointer();
+      audioElem = rootElement->FirstChildElement("audio");
+
+      if (audioElem)
+      {
+        audioElem = audioElem->FirstChildElement("ambient");
+        if (audioElem)
+        {
+          tNode = 0;
           //FIXME something is wrong, probably missing ==
-                                        while( tNode = audioElem->IterateChildren( tNode ) )
-                                        {
+          while( tNode = audioElem->IterateChildren( tNode ) )
+          {
             if (tNode->Type() == TiXmlNode::ELEMENT)
             {
 
-                                                  tElem = tNode->ToElement();
-                                                  std::string elemVal = tElem->Value();
-                                                  if (elemVal == "ogg")
-                                                  {
-                                COUT(0) << "Adding sound "<< tElem->Attribute("src") << "\n\n\n";
-
-                                          auMan->ambientAdd(tElem->Attribute("src"));
-                                                  }
+              tElem = tNode->ToElement();
+              std::string elemVal = tElem->Value();
+              if (elemVal == "ogg")
+              {
+        COUT(0) << "Adding sound "<< tElem->Attribute("src") << "\n\n\n";
+
+                auMan->ambientAdd(tElem->Attribute("src"));
+              }
             }
-                                        }
-                                        auMan->ambientStart();
-                                }
-                        }
-
-                        // Load world
-                        worldElem = rootElement->FirstChildElement("world");
-                        if (worldElem)
-                        {
-                                tNode = 0;
-                                while (tNode = worldElem->IterateChildren(tNode))
-                                {
+          }
+          auMan->ambientStart();
+        }
+      }
+
+      // Load world
+      worldElem = rootElement->FirstChildElement("world");
+      if (worldElem)
+      {
+        tNode = 0;
+        while (tNode = worldElem->IterateChildren(tNode))
+        {
           if (tNode->Type() == TiXmlNode::ELEMENT)
           {
-                                          tElem = tNode->ToElement();
-                                          orxonox::Identifier* id = ID(tElem->Value());
-                                          if (id)
-                                          {
+            tElem = tNode->ToElement();
+            orxonox::Identifier* id = ID(tElem->Value());
+            if (id)
+            {
                           orxonox::BaseObject* obj = id->fabricate();
                           obj->loadParams(tElem);
-                                          }
-                                          else
-                                          {
-                                              COUT(2) << "Warning: '"<< tElem->Value() <<"' is not a valid classname.\n";
-                                          }
+            }
+            else
+            {
+                COUT(2) << "Warning: '"<< tElem->Value() <<"' is not a valid classname.\n";
+            }
           }
-                                }
-                        }
-
-                        if (loadElem)
-                        {
-                                 mLoadOverlay->hide();
-                        }
-
-
-                        COUT(0) << "Loading finished!\n\n\n\n\n";
-                }
-        }
-
-        LevelLoader::~LevelLoader()
-        {
-
-        }
+        }
+      }
+
+      if (loadElem)
+      {
+         mLoadOverlay->hide();
+      }
+
+
+      COUT(0) << "Loading finished!\n\n\n\n\n";
+    }
+  }
+
+  LevelLoader::~LevelLoader()
+  {
+
+  }
 
 

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

@@ -165 +165 @@
         // END CREATING BLINKING LIGHTS
 
+        // START of testing crosshair
+        this->crosshairNear_.setBillboardSet("Orxonox/Crosshair", ColourValue(1.0, 1.0, 0.0), 1);
+        this->crosshairFar_.setBillboardSet("Orxonox/Crosshair", ColourValue(1.0, 1.0, 0.0), 1);
+
+        this->chNearNode_ = this->getNode()->createChildSceneNode(this->getName() + "near", Vector3(50.0, 0.0, 0.0));
+        this->chNearNode_->setInheritScale(false);
+        this->chFarNode_ = this->getNode()->createChildSceneNode(this->getName() + "far", Vector3(200.0, 0.0, 0.0));
+        this->chFarNode_->setInheritScale(false);
+
+        this->chNearNode_->attachObject(this->crosshairNear_.getBillboardSet());
+        this->chNearNode_->setScale(0.2, 0.2, 0.2);
+
+        this->chFarNode_->attachObject(this->crosshairFar_.getBillboardSet());
+        this->chFarNode_->setScale(0.4, 0.4, 0.4);
+
+        // END of testing crosshair
 
 /*

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

@@ -56 +56 @@
             Ogre::SceneNode* greenNode_;
             float blinkTime_;
+
+            BillboardSet crosshairNear_;
+            BillboardSet crosshairFar_;
+            Ogre::SceneNode* chNearNode_;
+            Ogre::SceneNode* chFarNode_;
 
             float timeToReload_;