From 4546ca3863e0a152aa6cc15ea0ff48da94cc54eb Mon Sep 17 00:00:00 2001
From: gugus <gus_512@hotmail.com>
Date: Mon, 23 May 2011 19:39:10 +0200
Subject: [PATCH] static Objects goes inside the static geometry

---
 apps/openmw/mwrender/exterior.cpp | 21 ++++++++++++++-------
 apps/openmw/mwrender/exterior.hpp |  1 +
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/apps/openmw/mwrender/exterior.cpp b/apps/openmw/mwrender/exterior.cpp
index c90123334a..3171e14555 100644
--- a/apps/openmw/mwrender/exterior.cpp
+++ b/apps/openmw/mwrender/exterior.cpp
@@ -50,6 +50,8 @@ void ExteriorCellRender::insertBegin (ESM::CellRef &ref, bool static_)
 {
   assert (!mInsert);
 
+  isStatic = static_;
+
   // Create and place scene node for this object
   mInsert = mBase->createChildSceneNode();
 
@@ -72,7 +74,7 @@ void ExteriorCellRender::insertBegin (ESM::CellRef &ref, bool static_)
   // Rotates first around z, then y, then x
   mInsert->setOrientation(xr*yr*zr);
 
-    mInsertMesh.clear();
+  mInsertMesh.clear();
 }
 
 
@@ -216,13 +218,18 @@ void ExteriorCellRender::insertMesh(const std::string &mesh)
 
   NIFLoader::load(mesh);
   Entity *ent = mScene.getMgr()->createEntity(mesh);
-  mInsert->attachObject(ent);
 
-  /*sg->addEntity(ent,mInsert->_getDerivedPosition(),mInsert->_getDerivedOrientation(),mInsert->_getDerivedScale());
-  sg->setRegionDimensions(Ogre::Vector3(100000,10000,100000));*/
-
-    if (mInsertMesh.empty())
-        mInsertMesh = mesh;
+  if(!isStatic)
+  {
+      mInsert->attachObject(ent);
+  }
+  else
+  {
+      sg->addEntity(ent,mInsert->_getDerivedPosition(),mInsert->_getDerivedOrientation(),mInsert->_getDerivedScale());
+      sg->setRegionDimensions(Ogre::Vector3(100000,10000,100000));
+  }
+  if (mInsertMesh.empty())
+      mInsertMesh = mesh;
 }
 
 void ExteriorCellRender::insertObjectPhysics()
diff --git a/apps/openmw/mwrender/exterior.hpp b/apps/openmw/mwrender/exterior.hpp
index 6ffcf7d92c..f8cef45fab 100644
--- a/apps/openmw/mwrender/exterior.hpp
+++ b/apps/openmw/mwrender/exterior.hpp
@@ -59,6 +59,7 @@ namespace MWRender
 
     //the static geometry
     Ogre::StaticGeometry *sg;
+    bool isStatic;
 
     // 0 normal, 1 more bright, 2 max
     int mAmbientMode;