Changeset 576

Timestamp:

Dec 17, 2007, 3:39:17 PM (17 years ago)

Author:

landauf

Message:

added Mesh and Model (doesn't work yet, but i don't want to have merge conflicts all the time )

Location:

code/branches/FICN

Files:

• bin/levels/sample.oxw (modified) (2 diffs)
• src/orxonox/CMakeLists.txt (modified) (2 diffs)
• src/orxonox/objects/CMakeLists.txt (modified) (1 diff)
• src/orxonox/objects/Mesh.cc (added)
• src/orxonox/objects/Mesh.h (added)
• src/orxonox/objects/Model.cc (modified) (1 diff)
• src/orxonox/objects/Model.h (modified) (1 diff)
• src/orxonox/objects/WorldEntity.cc (modified) (1 diff)
• src/orxonox/objects/WorldEntity.h (modified) (3 diffs)
• src/orxonox/orxonox.cc (modified) (2 diffs)

code/branches/FICN/bin/levels/sample.oxw

@@ -1 +1 @@
 <?xml version="1.0"?>
 <orxonoxworld name="Orxonox sample level" image="textures/menu/moonstation_512x512.jpg">
-        <description>
-                This is an orxonox sample level.
-        </description>
+  <description>
+    This is an orxonox sample level.
+  </description>
 
-        <loading>
-                <background color="000000" image="textures/load_screens/ambush.png" />
-                <bar top="200" left="50" width="300" height="20" image="textures/load_screens/ambush-loadbar.png" />
-        </loading>
+  <loading>
+    <background color="000000" image="textures/load_screens/ambush.png" />
+    <bar top="200" left="50" width="300" height="20" image="textures/load_screens/ambush-loadbar.png" />
+  </loading>
 
-        <audio>
+  <audio>
+  </audio>
 
-        </audio>
+  <!-- Keep a minimum distance of >100 to the object, otherwise the camara thinks it's in the object -->
+  <!-- the value has to negative, as we want the camara behind the object -->
+  <world>
+    <SceneNode name="OgreHeadNode" pos="0,0,0" />
+    <Camera name="Camera" pos="0,0,-150" lookat="0,0,0" node="OgreHeadNode" />
+    <Ambient colourvalue="1,1,1" />
+    <Skybox src="Orxonox/BlueStarSkyBox" />
 
-    <!-- Keep a minimum distance of >100 to the object, otherwise the camara thinks it's in the object -->
-    <!-- the value has to negative, as we want the camara behind the object -->
-        <world>
-
-                <SceneNode name="OgreHeadNode" pos="0,0,0" />
-
-                <Camera name="Camera" pos="0,0,-150" lookat="0,0,0" node="OgreHeadNode" />
-
-                <Ambient colourvalue="1,1,1" />
-
-                <Skybox src="Orxonox/BlueStarSkyBox" />
-
-                <BaseEntity name="ASSF" src="assf2.mesh" node="OgreHeadNode" />
-
+    <BaseEntity name="ASSF" src="assf2.mesh" node="OgreHeadNode" />
 
     <SceneNode name="node1" pos="0,200,0" />
@@ -46 +40 @@
     <SceneNode name="node6" pos="0,0,-200" />
     <Entity name="asteroid6" src="ast6.mesh" node="node6" />
-        </world>
+  </world>
 
 <!-- Unused at the moment -->
-                <SpaceshipSteeringObject node="OgreHeadNode" forward="500" rotateupdown="200" rotaterightleft="200" looprightleft="200" />
+  <SpaceshipSteeringObject node="OgreHeadNode" forward="500" rotateupdown="200" rotaterightleft="200" looprightleft="200" />
 
-
-
-        <scripts>
-                <script file="intro.lua" />
-        </scripts>
+  <scripts>
+    <script file="intro.lua" />
+  </scripts>
 </orxonoxworld>

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

@@ -35 +35 @@
     objects/SpaceshipSteeringObject.cc
     objects/Model.cc
+    objects/Mesh.cc
+    objects/BaseEntity.cc
   )
 ELSE(WIN32)
@@ -41 +43 @@
 
 IF(WIN32)
-  ADD_LIBRARY(orxonox ${ORXONOX_SRC_FILES})
+#  ADD_LIBRARY(orxonox ${ORXONOX_SRC_FILES})
 ELSE(WIN32)
   ADD_LIBRARY(orxonox SHARED ${ORXONOX_SRC_FILES})

code/branches/FICN/src/orxonox/objects/CMakeLists.txt

@@ -15 +15 @@
   SpaceshipSteeringObject.cc
   Model.cc
+  Mesh.cc
 )
 

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

@@ +1 @@
+#include <string>
+
+#include "Model.h"
+#include "../core/CoreIncludes.h"
+#include "../orxonox.h"
+#include "../../tinyxml/tinyxml.h"
+#include "../../misc/Tokenizer.h"
+#include "../../misc/String2Number.h"
+
+namespace orxonox
+{
+    CreateFactory(Model);
+
+    Model::Model()
+    {
+        RegisterObject(Model);
+    }
+
+    Model::~Model()
+    {
+    }
+
+    void Model::loadParams(TiXmlElement* xmlElem)
+    {
+        std::cout << "1\n";
+        if (xmlElem->Attribute("position"))
+        {
+        std::cout << "2\n";
+                std::vector<std::string> pos = tokenize(xmlElem->Attribute("position"),",");
+                float x, y, z;
+                String2Number<float>(x, pos[0]);
+                String2Number<float>(y, pos[1]);
+                String2Number<float>(z, pos[2]);
+                this->setPosition(x, y, z);
+        }
+
+        std::cout << "3\n";
+        if (xmlElem->Attribute("direction"))
+        {
+        std::cout << "4\n";
+                std::vector<std::string> pos = tokenize(xmlElem->Attribute("direction"),",");
+                float x, y, z;
+                String2Number<float>(x, pos[0]);
+                String2Number<float>(y, pos[1]);
+                String2Number<float>(z, pos[2]);
+                this->setDirection(x, y, z);
+        }
+
+        std::cout << "5\n";
+        if (xmlElem->Attribute("mesh"))
+        {
+        std::cout << "6_1\n";
+                std::string src = xmlElem->Attribute("mesh");
+        std::cout << "6_2\n";
+        std::cout << this->mesh_.getEntity() << std::endl;
+                this->mesh_ = Mesh(src);
+        std::cout << "6_3\n";
+        std::cout << this->mesh_.getEntity() << std::endl;
+                    this->attachObject(this->mesh_.getEntity());
+        std::cout << "6_4\n";
+        }
+
+        std::cout << "7\n";
+        if (xmlElem->Attribute("scale"))
+        {
+        std::cout << "8\n";
+                    std::string scaleStr = xmlElem->Attribute("scale");
+                    float scale;
+                    String2Number<float>(scale, scaleStr);
+                    this->setScale(scale);
+        }
+        std::cout << "9\n";
+
+        COUT(4) << "Loader: Created model" << std::endl;
+    }
+}

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

@@ +1 @@
+#ifndef _Model_H__
+#define _Model_H__
+
+#include "WorldEntity.h"
+#include "Mesh.h"
+#include "../../tinyxml/tinyxml.h"
+
+namespace orxonox
+{
+    class Model : public WorldEntity
+    {
+        public:
+            Model();
+            ~Model();
+            virtual void loadParams(TiXmlElement* xmlElem);
+
+        private:
+            Mesh mesh_;
+    };
+}
+
+#endif

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

@@ -43 +43 @@
         RegisterObject(WorldEntity);
 
+        std::cout << "10_1\n";
         if (Orxonox::getSingleton()->getSceneManager())
         {
+        std::cout << "10_2\n";
             std::ostringstream name;
             name << (WorldEntity::worldEntityCounter_s++);
             this->setName("WorldEntity" + name.str());
             node_ = Orxonox::getSingleton()->getSceneManager()->getRootSceneNode()->createChildSceneNode(this->getName());
+            std::cout << "blubbbi: " << this->getName() << " .. " << this->node_ << std::endl;
         }
+        std::cout << "10_3\n";
 
         this->bStatic_ = true;

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

@@ -7 +7 @@
 #include "OgreSceneManager.h"
 #include "OgreSceneNode.h"
+#include "Mesh.h"
 #include "network/Synchronisable.h"
 
@@ -45 +46 @@
           { this->node_->roll(angle, relativeTo); }
 
+      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 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); }
+      inline void setDirection(const Vector3 &vec, Ogre::Node::TransformSpace relativeTo=Ogre::Node::TS_LOCAL, const Vector3 &localDirectionVector=Vector3::NEGATIVE_UNIT_Z)
+        { this->node_->setDirection(vec, relativeTo, localDirectionVector); }
+      inline void setOrientation(const Ogre::Quaternion quat)
+        { this->node_->setOrientation(quat); }
+      inline void lookAt(const Vector3 &targetPoint, Ogre::Node::TransformSpace relativeTo, const Vector3 &localDirectionVector=Vector3::NEGATIVE_UNIT_Z)
+        { this->node_->lookAt(targetPoint, relativeTo, localDirectionVector); }
 
-      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 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); }
-      inline void setDirection(const Vector3 &vec, Ogre::Node::TransformSpace relativeTo=Ogre::Node::TS_LOCAL, const Vector3 &localDirectionVector=Vector3::NEGATIVE_UNIT_Z)
-          { this->node_->setDirection(vec, relativeTo, localDirectionVector); }
-      inline void setOrientation(const Ogre::Quaternion quat)
-          { this->node_->setOrientation(quat); }
-      inline void lookAt(const Vector3 &targetPoint, Ogre::Node::TransformSpace relativeTo, const Vector3 &localDirectionVector=Vector3::NEGATIVE_UNIT_Z)
-          { this->node_->lookAt(targetPoint, relativeTo, localDirectionVector); }
+      inline void setScale(const Vector3 &scale)
+        { this->node_->setScale(scale); }
+      inline void setScale(Real x, Real y, Real z)
+        { this->node_->setScale(x, y, z); }
+      inline void setScale(Real scale)
+        { this->node_->setScale(scale, scale, scale); }
+      inline const Vector3& getScale(void) const
+        { return this->node_->getScale(); }
+      inline void scale(const Vector3 &scale)
+        { this->node_->scale(scale); }
+      inline void scale(Real x, Real y, Real z)
+        { this->node_->scale(x, y, z); }
+      inline void scale(Real scale)
+        { this->node_->scale(scale, scale, scale); }
 
       inline void attachObject(Ogre::MovableObject *obj)
-          { this->node_->attachObject(obj); }
+        { std::cout << "gux_1" << this->node_ << "\n"; this->node_->attachObject(obj); std::cout << "gux_2\n"; }
+      inline void attachObject(Mesh &mesh)
+        { std::cout << "gux_3" << this->node_ << "\n"; this->node_->attachObject((Ogre::MovableObject*)(mesh.getEntity())); std::cout << "gux_4\n"; }
       inline void detachObject(Ogre::MovableObject *obj)
-          { this->node_->detachObject(obj); }
+        { this->node_->detachObject(obj); }
       inline void detachAllObjects()
-          { this->node_->detachAllObjects(); }
+        { this->node_->detachAllObjects(); }
 
       inline void setVelocity(const Vector3& velocity)
@@ -100 +117 @@
       inline const Ogre::Quaternion& getOrientation()
           { return this->node_->getOrientation(); }
-      
+
     protected:
       void registerAllVariables();
-      
+
     private:
       Ogre::SceneNode* node_;

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

@@ -70 +70 @@
 #include "../network/NetworkFrameListener.h"
 
+#ifdef WIN32
+#include <windows.h>
+#define usleep(x) Sleep((x)/1000)
+#else
+#include <unistd.h>
+#endif
 
 namespace orxonox
@@ -339 +345 @@
     startRenderLoop();
   }
-  
+
   void Orxonox::standalone(){
-    
-    
-    
+
+
+
   }