Merge branch 'static' of git@github.com:zinnschlag/openmw.git into optimisation

Conflicts:
	apps/openmw/mwrender/exterior.cpp

apps/openmw/mwclass/static.cpp

@@ -19,7 +19,7 @@ namespace MWClass
         const std::string &model = ref->base->model;
         if (!model.empty())
         {
-            MWRender::Rendering rendering (cellRender, ref->ref);
+            MWRender::Rendering rendering (cellRender, ref->ref, true);
             cellRender.insertMesh ("meshes\\" + model);
             cellRender.insertObjectPhysics();
             ref->mData.setHandle (rendering.end (ref->mData.isEnabled()));

apps/openmw/mwrender/cellimp.hpp

@@ -35,7 +35,7 @@ namespace MWRender
     virtual ~CellRenderImp() {}
 
     /// start inserting a new reference.
-    virtual void insertBegin (ESM::CellRef &ref) = 0;
+    virtual void insertBegin (ESM::CellRef &ref, bool static_ = false) = 0;
 
     virtual void rotateMesh(Ogre::Vector3 axis, Ogre::Radian angle,  std::string sceneNodeName[], int elements) = 0;
     /// insert a mesh related to the most recent insertBegin call.
@@ -71,10 +71,10 @@ namespace MWRender
 
         public:
 
-            Rendering (CellRenderImp& cellRender, ESM::CellRef &ref)
+            Rendering (CellRenderImp& cellRender, ESM::CellRef &ref, bool static_ = false)
             : mCellRender (cellRender), mEnd (false)
             {
-                mCellRender.insertBegin (ref);
+                mCellRender.insertBegin (ref, static_);
             }
 
             ~Rendering()

apps/openmw/mwrender/exterior.cpp

@@ -45,8 +45,8 @@ ExteriorCellRender::ExteriorCellRender(ESMS::CellStore<MWWorld::RefData> &_cell,
 }
 
 
-// start inserting a new reference.
-void ExteriorCellRender::insertBegin (ESM::CellRef &ref)
+
+void ExteriorCellRender::insertBegin (ESM::CellRef &ref, bool static_)
 {
   assert (!mInsert);
 

apps/openmw/mwrender/exterior.hpp

@@ -66,7 +66,7 @@ namespace MWRender
     Ogre::ColourValue mAmbientColor;
 
     /// start inserting a new reference.
-    virtual void insertBegin (ESM::CellRef &ref);
+    virtual void insertBegin (ESM::CellRef &ref, bool static_ = false);
 
     /// insert a mesh related to the most recent insertBegin call.
     virtual void insertMesh(const std::string &mesh, Ogre::Vector3 vec,  Ogre::Vector3 axis, Ogre::Radian angle, std::string sceneNodeName, std::string sceneParent[], int elements);

apps/openmw/mwrender/interior.cpp

@@ -35,7 +35,7 @@ bool InteriorCellRender::lightOutQuadInLin = false;
 
 // start inserting a new reference.
 
-void InteriorCellRender::insertBegin (ESM::CellRef &ref)
+void InteriorCellRender::insertBegin (ESM::CellRef &ref, bool static_)
 {
   assert (!insert);
 

apps/openmw/mwrender/interior.hpp

@@ -63,7 +63,7 @@ namespace MWRender
     Ogre::ColourValue ambientColor;
 
     /// start inserting a new reference.
-    virtual void insertBegin (ESM::CellRef &ref);
+    virtual void insertBegin (ESM::CellRef &ref, bool static_ = false);
      virtual void rotateMesh(Ogre::Vector3 axis, Ogre::Radian angle,  std::string sceneNodeName[], int elements);
      virtual void scaleMesh(Ogre::Vector3 axis,  std::string sceneNodeName[], int elements);
     /// insert a mesh related to the most recent insertBegin call.