renamed high level NIF files...

apps/openmw/engine.cpp

@@ -12,8 +12,8 @@
 #include <components/nif/niffile.hpp>
 #include <components/nifoverrides/nifoverrides.hpp>
 
-#include <components/nifbullet/bullet_nif_loader.hpp>
-#include <components/nifogre/ogre_nif_loader.hpp>
+#include <components/nifbullet/bulletnifloader.hpp>
+#include <components/nifogre/ogrenifloader.hpp>
 
 #include "mwinput/inputmanagerimp.hpp"
 

apps/openmw/mwrender/animation.hpp

@@ -1,7 +1,7 @@
 #ifndef _GAME_RENDER_ANIMATION_H
 #define _GAME_RENDER_ANIMATION_H
 
-#include <components/nifogre/ogre_nif_loader.hpp>
+#include <components/nifogre/ogrenifloader.hpp>
 
 #include "../mwworld/ptr.hpp"
 

apps/openmw/mwrender/objects.cpp

@@ -7,7 +7,7 @@
 #include <OgreSubEntity.h>
 #include <OgreStaticGeometry.h>
 
-#include <components/nifogre/ogre_nif_loader.hpp>
+#include <components/nifogre/ogrenifloader.hpp>
 #include <components/settings/settings.hpp>
 
 #include "../mwworld/ptr.hpp"

apps/openmw/mwrender/sky.cpp

@@ -14,7 +14,7 @@
 
 #include <boost/lexical_cast.hpp>
 
-#include <components/nifogre/ogre_nif_loader.hpp>
+#include <components/nifogre/ogrenifloader.hpp>
 
 #include <extern/shiny/Platforms/Ogre/OgreMaterial.hpp>
 

apps/openmw/mwworld/physicssystem.cpp

@@ -13,7 +13,7 @@
 #include <openengine/bullet/physic.hpp>
 #include <openengine/ogre/renderer.hpp>
 
-#include <components/nifbullet/bullet_nif_loader.hpp>
+#include <components/nifbullet/bulletnifloader.hpp>
 
 //#include "../mwbase/world.hpp" // FIXME
 #include "../mwbase/environment.hpp"

components/CMakeLists.txt

@@ -19,11 +19,11 @@ add_component_dir (nif
     )
 
 add_component_dir (nifogre
-    ogre_nif_loader
+    ogrenifloader
     )
 
 add_component_dir (nifbullet
-    bullet_nif_loader
+    bulletnifloader
     )
 
 add_component_dir (to_utf8

components/nifbullet/bulletnifloader.cpp

@@ -21,7 +21,7 @@ http://www.gnu.org/licenses/ .
 
 */
 
-#include "bullet_nif_loader.hpp"
+#include "bulletnifloader.hpp"
 #include <Ogre.h>
 #include <cstdio>
 

components/nifbullet/bulletnifloader.hpp

@@ -21,8 +21,8 @@
 
  */
 
-#ifndef _BULLET_NIF_LOADER_H_
-#define _BULLET_NIF_LOADER_H_
+#ifndef OPENMW_COMPONENTS_NIFBULLET_BULLETNIFLOADER_HPP
+#define OPENMW_COMPONENTS_NIFBULLET_BULLETNIFLOADER_HPP
 
 #include <OgreMesh.h>
 #include <cassert>

components/nifogre/ogrenifloader.cpp

@@ -21,7 +21,7 @@
 
  */
 
-#include "ogre_nif_loader.hpp"
+#include "ogrenifloader.hpp"
 
 #include <algorithm>
 

components/nifogre/ogrenifloader.hpp

@@ -21,8 +21,8 @@
 
  */
 
-#ifndef _OGRE_NIF_LOADER_H_
-#define _OGRE_NIF_LOADER_H_
+#ifndef OPENMW_COMPONENTS_NIFOGRE_OGRENIFLOADER_HPP
+#define OPENMW_COMPONENTS_NIFOGRE_OGRENIFLOADER_HPP
 
 #include <OgreResource.h>
 #include <OgreMesh.h>

components/nifoverrides/nifoverrides.hpp

@@ -1,5 +1,5 @@
-#ifndef COMPONENTS_NIFOVERRIDES_H
-#define COMPONENTS_NIFOVERRIDES_H
+#ifndef OPENMW_COMPONENTS_NIFOVERRIDES_NIFOVERRIDES_HPP
+#define OPENMW_COMPONENTS_NIFOVERRIDES_NIFOVERRIDES_HPP
 
 #include <OgreConfigFile.h>
 

libs/openengine/bullet/CMotionState.cpp

@@ -3,7 +3,7 @@
 
 #include <btBulletDynamicsCommon.h>
 #include <btBulletCollisionCommon.h>
-#include <components/nifbullet/bullet_nif_loader.hpp>
+#include <components/nifbullet/bulletnifloader.hpp>
 
 namespace OEngine {
 namespace Physic

libs/openengine/bullet/physic.cpp

@@ -2,7 +2,7 @@
 #include <btBulletDynamicsCommon.h>
 #include <btBulletCollisionCommon.h>
 #include <BulletCollision/CollisionShapes/btHeightfieldTerrainShape.h>
-#include <components/nifbullet/bullet_nif_loader.hpp>
+#include <components/nifbullet/bulletnifloader.hpp>
 #include "CMotionState.h"
 #include "OgreRoot.h"
 #include "btKinematicCharacterController.h"