Changeset 1486 for code/branches/network/src/orxonox

Timestamp:

May 30, 2008, 3:02:03 PM (17 years ago)

Author:

rgrieder

Message:

• fixed the InputBufferListener bug in a proper way It looks a little bit ugly, but at least it's got a new feature: You don't need to derive from InputBufferListener (removed it)
• commented the shader hack in Model.cc

Location:

code/branches/network/src/orxonox

Files:

• GraphicsEngine.cc (modified) (2 diffs)
• objects/Model.cc (modified) (2 diffs)

code/branches/network/src/orxonox/GraphicsEngine.cc

@@ -149 +149 @@
 #endif
 
-/*    // create a logManager
+// TODO: LogManager doesn't work on specific systems. The why is unknown yet.
+#if ORXONOX_PLATFORM == ORXONOX_PLATFORM_WIN32
+    // create a logManager
     // note: If there's already a logManager, Ogre will complain by a failed assertation.
     // but that shouldn't happen, since this is the first time to create a logManager..
@@ -164 +166 @@
 
     myLog->setLogDetail(Ogre::LL_BOREME);
-    myLog->addListener(this);*/
+    myLog->addListener(this);
+#endif
 
     // Root will detect that we've already created a Log

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

@@ -85 +85 @@
 
         //HACK!!
-        if ((this->meshSrc_ == "assff.mesh") || (this->meshSrc_ == "ast1.mesh") || (this->meshSrc_ == "ast2.mesh") || (this->meshSrc_ == "ast3.mesh") || (this->meshSrc_ == "ast4.mesh") ||(this->meshSrc_ == "ast5.mesh") || (this->meshSrc_ == "ast6.mesh"))
+        /*if ((this->meshSrc_ == "assff.mesh") || (this->meshSrc_ == "ast1.mesh") || (this->meshSrc_ == "ast2.mesh") || (this->meshSrc_ == "ast3.mesh") || (this->meshSrc_ == "ast4.mesh") ||(this->meshSrc_ == "ast5.mesh") || (this->meshSrc_ == "ast6.mesh"))
         {
           Ogre::MeshPtr pMesh = this->mesh_.getEntity()->getMesh();
@@ -104 +104 @@
 
 
-        }
+        }*/
         COUT(4) << "Loader (Model.cc): Created model" << std::endl;
       }