mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-04-01 04:36:44 +00:00
Code Issues Releases Wiki Activity

Minor cleanup

Browse source
This commit is contained in:
scrawl 2015-05-22 01:54:06 +02:00
parent cac7c1e535
commit 627fee07bc
6 changed files with 9 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/openmw/mwrender/characterpreview.hpp
View file

@ -1,8 +1,6 @@
#ifndef MWRENDER_CHARACTERPREVIEW_H #ifndef MWRENDER_CHARACTERPREVIEW_H
#define MWRENDER_CHARACTERPREVIEW_H #define MWRENDER_CHARACTERPREVIEW_H
#include <OgreVector3.h>
#include <osg/ref_ptr> #include <osg/ref_ptr>
#include <components/esm/loadnpc.hpp> #include <components/esm/loadnpc.hpp>

16
apps/openmw/mwrender/creatureanimation.cpp
View file

@ -145,16 +145,6 @@ void CreatureWeaponAnimation::updatePart(PartHolderPtr& scene, int slot)
*/ */
} }
/*
void CreatureWeaponAnimation::configureAddedObject(NifOgre::ObjectScenePtr object, MWWorld::Ptr ptr, int slot)
{
//Ogre::Vector3 glowColor = getEnchantmentColor(ptr);
//setRenderProperties(object, RV_Actors, RQG_Main, RQG_Alpha, 0,
// !ptr.getClass().getEnchantment(ptr).empty(), &glowColor);
}
*/
void CreatureWeaponAnimation::attachArrow() void CreatureWeaponAnimation::attachArrow()
{ {
//WeaponAnimation::attachArrow(mPtr); //WeaponAnimation::attachArrow(mPtr);
@ -167,14 +157,14 @@ void CreatureWeaponAnimation::releaseArrow()
osg::Vec3f CreatureWeaponAnimation::runAnimation(float duration) osg::Vec3f CreatureWeaponAnimation::runAnimation(float duration)
{ {
/* osg::Vec3f ret = Animation::runAnimation(duration);
Ogre::Vector3 ret = Animation::runAnimation(duration);
/*
if (mSkelBase) if (mSkelBase)
pitchSkeleton(mPtr.getRefData().getPosition().rot[0], mSkelBase->getSkeleton()); pitchSkeleton(mPtr.getRefData().getPosition().rot[0], mSkelBase->getSkeleton());
*/ */
return osg::Vec3f(); return ret;
} }
} }

3
apps/openmw/mwrender/objects.hpp
View file

@ -63,9 +63,6 @@ public:
Animation* getAnimation(const MWWorld::Ptr &ptr); Animation* getAnimation(const MWWorld::Ptr &ptr);
//Ogre::AxisAlignedBox getDimensions(MWWorld::CellStore*);
///< get a bounding box that encloses all objects in the specified cell
bool removeObject (const MWWorld::Ptr& ptr); bool removeObject (const MWWorld::Ptr& ptr);
///< \return found? ///< \return found?

2
apps/openmw/mwrender/sky.cpp
View file

@ -799,7 +799,7 @@ void SkyManager::sunDisable()
mSun->setVisible(false); mSun->setVisible(false);
} }
void SkyManager::setStormDirection(const Ogre::Vector3 &direction) void SkyManager::setStormDirection(const osg::Vec3f &direction)
{ {
mStormDirection = direction; mStormDirection = direction;
} }

8
apps/openmw/mwrender/sky.hpp
View file

@ -59,7 +59,7 @@ namespace MWRender
void setRainSpeed(float speed); void setRainSpeed(float speed);
void setStormDirection(const Ogre::Vector3& direction); void setStormDirection(const osg::Vec3f& direction);
void setSunDirection(const osg::Vec3f& direction); void setSunDirection(const osg::Vec3f& direction);
@ -123,11 +123,11 @@ namespace MWRender
float mRainTimer; float mRainTimer;
Ogre::Vector3 mStormDirection; osg::Vec3f mStormDirection;
// remember some settings so we don't have to apply them again if they didnt change // remember some settings so we don't have to apply them again if they didnt change
Ogre::String mClouds; std::string mClouds;
Ogre::String mNextClouds; std::string mNextClouds;
float mCloudBlendFactor; float mCloudBlendFactor;
float mCloudOpacity; float mCloudOpacity;
float mCloudSpeed; float mCloudSpeed;

2
apps/openmw/mwworld/weather.cpp
View file

@ -420,7 +420,7 @@ void WeatherManager::update(float duration, bool paused)
mStormDirection = (playerPos - redMountainPos); mStormDirection = (playerPos - redMountainPos);
mStormDirection.z() = 0; mStormDirection.z() = 0;
//mRendering->getSkyManager()->setStormDirection(mStormDirection); mRendering->getSkyManager()->setStormDirection(mStormDirection);
} }
mRendering->configureFog(mResult.mFogDepth, mResult.mFogColor); mRendering->configureFog(mResult.mFogDepth, mResult.mFogColor);