mirror
/
openmw-tes3mp
mirror of https://github.com/TES3MP/openmw-tes3mp.git
1
0
Fork 1
Code Issues Releases Wiki Activity

renamed high level NIF files...

Browse Source
actorid
Nathan Jeffords 12 years ago
parent d3c1f5e7b2
commit 109dff2d29
13 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File

4
apps/openmw/engine.cpp
Unescape Escape View File

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

2
apps/openmw/mwrender/animation.hpp
Unescape Escape View File

@ -1,7 +1,7 @@
#ifndef _GAME_RENDER_ANIMATION_H #ifndef _GAME_RENDER_ANIMATION_H
#define _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" #include "../mwworld/ptr.hpp"

2
apps/openmw/mwrender/objects.cpp
Unescape Escape View File

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

2
apps/openmw/mwrender/sky.cpp
Unescape Escape View File

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

2
apps/openmw/mwworld/physicssystem.cpp
Unescape Escape View File

@ -13,7 +13,7 @@
#include <openengine/bullet/physic.hpp> #include <openengine/bullet/physic.hpp>
#include <openengine/ogre/renderer.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/world.hpp" // FIXME
#include "../mwbase/environment.hpp" #include "../mwbase/environment.hpp"

4
components/CMakeLists.txt
Unescape Escape View File

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

2
components/nifbullet/bullet_nif_loader.cpp → components/nifbullet/bulletnifloader.cpp
Unescape Escape View File

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

4
components/nifbullet/bullet_nif_loader.hpp → components/nifbullet/bulletnifloader.hpp
Unescape Escape View File

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

2
components/nifogre/ogre_nif_loader.cpp → components/nifogre/ogrenifloader.cpp
Unescape Escape View File

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

4
components/nifogre/ogre_nif_loader.hpp → components/nifogre/ogrenifloader.hpp
Unescape Escape View File

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

4
components/nifoverrides/nifoverrides.hpp
Unescape Escape View File

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

2
libs/openengine/bullet/CMotionState.cpp
Unescape Escape View File

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

2
libs/openengine/bullet/physic.cpp
Unescape Escape View File

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

Write Preview
Loading…
Cancel
Save