teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity

character preview WIP

Browse source
This commit is contained in:
scrawl 2012-09-13 00:54:32 +02:00
parent c3966a7c5a
commit 4f3eb3c34a
16 changed files with 139 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/openmw/CMakeLists.txt
View file

@ -16,7 +16,7 @@ source_group(game FILES ${GAME} ${GAME_HEADER})
add_openmw_dir (mwrender
renderingmanager debugging sky player animation npcanimation creatureanimation actors objects
renderinginterface localmap occlusionquery terrain terrainmaterial water shadows
compositors
compositors characterpreview
)
add_openmw_dir (mwinput

2
apps/openmw/mwbase/world.hpp
View file

@ -271,6 +271,8 @@ namespace MWBase
virtual void togglePlayerLooking(bool enable) = 0;
virtual void renderPlayer() = 0;
virtual void updateCharacterPreview(int sizeX, int sizeY) = 0;
};
}

21
apps/openmw/mwgui/inventorywindow.cpp
View file

@ -48,6 +48,7 @@ namespace MWGui
static_cast<MyGUI::Window*>(mMainWidget)->eventWindowChangeCoord += MyGUI::newDelegate(this, &InventoryWindow::onWindowResize);
getWidget(mAvatar, "Avatar");
getWidget(mAvatarImage, "AvatarImage");
getWidget(mEncumbranceBar, "EncumbranceBar");
getWidget(mEncumbranceText, "EncumbranceBarT");
getWidget(mFilterAll, "AllButton");
@ -100,6 +101,13 @@ namespace MWGui
_sender->getSize().width - 12 - (_sender->getSize().height-44) * aspect - 15,
_sender->getSize().height-44 );
drawItems();
MyGUI::IntSize size = mAvatarImage->getSize();
std::cout << "dims " << size.width << " " << size.height << std::endl;
MWBase::Environment::get().getWorld()->updateCharacterPreview (size.width, size.height);
mAvatarImage->setImageCoord (MyGUI::IntCoord(0,0,size.width, size.height));
}
void InventoryWindow::onFilterChanged(MyGUI::Widget* _sender)
@ -171,14 +179,7 @@ namespace MWGui
drawItems();
// update selected weapon icon
MWWorld::InventoryStore& invStore = MWWorld::Class::get(mPtr).getInventoryStore(mPtr);
MWWorld::ContainerStoreIterator weaponSlot = invStore.getSlot(MWWorld::InventoryStore::Slot_CarriedRight);
if (weaponSlot == invStore.end())
mWindowManager.unsetSelectedWeapon();
else
mWindowManager.setSelectedWeapon(*weaponSlot, 100); /// \todo track weapon durability
notifyContentChanged();
}
}
@ -265,6 +266,10 @@ namespace MWGui
mWindowManager.unsetSelectedWeapon();
else
mWindowManager.setSelectedWeapon(*weaponSlot, 100); /// \todo track weapon durability
MyGUI::IntSize size = mAvatarImage->getSize();
mAvatarImage->setImageCoord (MyGUI::IntCoord(0,0,size.width, size.height));
MWBase::Environment::get().getWorld()->updateCharacterPreview (size.width, size.height);
}
void InventoryWindow::pickUpObject (MWWorld::Ptr object)

1
apps/openmw/mwgui/inventorywindow.hpp
View file

@ -24,6 +24,7 @@ namespace MWGui
protected:
MyGUI::Widget* mAvatar;
MyGUI::ImageBox* mAvatarImage;
MyGUI::TextBox* mArmorRating;
MyGUI::ProgressBar* mEncumbranceBar;
MyGUI::TextBox* mEncumbranceText;

52
apps/openmw/mwrender/characterpreview.cpp Normal file
View file

@ -0,0 +1,52 @@
#include "characterpreview.hpp"
#include <OgreSceneManager.h>
#include <OgreHardwarePixelBuffer.h>
#include "renderconst.hpp"
namespace MWRender
{
CharacterPreview::CharacterPreview(Ogre::SceneManager *sceneMgr, Ogre::SceneNode *node)
: mSceneMgr(sceneMgr)
{
mCamera = mSceneMgr->createCamera ("CharacterPreviewCamera");
mCamera->setAspectRatio (0.5);
mNode = node->createChildSceneNode ();
mNode->attachObject (mCamera);
mNode->setPosition(0, 185, 70);
mNode->roll(Ogre::Degree(180));
mNode->pitch(Ogre::Degree(90));
mTexture = Ogre::TextureManager::getSingleton().createManual("CharacterPreview",
Ogre::ResourceGroupManager::DEFAULT_RESOURCE_GROUP_NAME, Ogre::TEX_TYPE_2D, 512, 1024, 0, Ogre::PF_A8R8G8B8, Ogre::TU_RENDERTARGET);
mRenderTarget = mTexture->getBuffer()->getRenderTarget();
mViewport = mRenderTarget->addViewport(mCamera);
mViewport->setOverlaysEnabled(false);
mViewport->setBackgroundColour(Ogre::ColourValue(0, 0, 0, 0));
mViewport->setShadowsEnabled(false);
mViewport->setMaterialScheme("local_map");
mViewport->setVisibilityMask (RV_Player);
mRenderTarget->setActive(true);
mRenderTarget->setAutoUpdated (false);
}
void CharacterPreview::update(int sizeX, int sizeY)
{
bool wasVisible = mNode->getParentSceneNode()->getAttachedObject(0)->getVisible ();
mNode->getParentSceneNode()->setVisible(true, false);
//mViewport->setDimensions (0, 0, float(sizeX) / float(512), float(sizeY) / float(1024));
mRenderTarget->update();
mNode->getParentSceneNode()->setVisible(wasVisible, false);
}
}

29
apps/openmw/mwrender/characterpreview.hpp Normal file
View file

@ -0,0 +1,29 @@
#ifndef MWRENDER_CHARACTERPREVIEW_H
#define MWRENDER_CHARACTERPREVIEW_H
#include <OgreRenderTarget.h>
namespace MWRender
{
class CharacterPreview
{
public:
CharacterPreview(Ogre::SceneManager* sceneMgr, Ogre::SceneNode* node);
void update(int sizeX, int sizeY);
private:
Ogre::TexturePtr mTexture;
Ogre::RenderTarget* mRenderTarget;
Ogre::Viewport* mViewport;
Ogre::Camera* mCamera;
Ogre::SceneManager* mSceneMgr;
Ogre::SceneNode* mNode;
};
}
#endif

9
apps/openmw/mwrender/npcanimation.cpp
View file

@ -45,7 +45,7 @@ NpcAnimation::~NpcAnimation()
}
NpcAnimation::NpcAnimation(const MWWorld::Ptr& ptr, OEngine::Render::OgreRenderer& _rend, MWWorld::InventoryStore& _inv)
NpcAnimation::NpcAnimation(const MWWorld::Ptr& ptr, OEngine::Render::OgreRenderer& _rend, MWWorld::InventoryStore& _inv, bool player)
: Animation(_rend), mStateID(-1), mInv(_inv), timeToChange(0),
robe(mInv.end()), helmet(mInv.end()), shirt(mInv.end()),
cuirass(mInv.end()), greaves(mInv.end()),
@ -53,6 +53,7 @@ NpcAnimation::NpcAnimation(const MWWorld::Ptr& ptr, OEngine::Render::OgreRendere
boots(mInv.end()),
leftglove(mInv.end()), rightglove(mInv.end()), skirtiter(mInv.end()),
pants(mInv.end())
, mIsPlayer(player)
{
MWWorld::LiveCellRef<ESM::NPC> *ref = ptr.get<ESM::NPC>();
@ -94,7 +95,7 @@ NpcAnimation::NpcAnimation(const MWWorld::Ptr& ptr, OEngine::Render::OgreRendere
{
Ogre::Entity *base = mEntityList.mEntities[i];
base->setVisibilityFlags(RV_Actors);
base->setVisibilityFlags(mIsPlayer ? RV_Player : RV_Actors);
bool transparent = false;
for(unsigned int j=0;j < base->getNumSubEntities();++j)
{
@ -357,13 +358,13 @@ NifOgre::EntityList NpcAnimation::insertBoundedPart(const std::string &mesh, con
mInsert, mesh);
std::vector<Ogre::Entity*> &parts = entities.mEntities;
for(size_t i = 0;i < parts.size();i++)
parts[i]->setVisibilityFlags(RV_Actors);
parts[i]->setVisibilityFlags(mIsPlayer ? RV_Player : RV_Actors);
return entities;
}
void NpcAnimation::runAnimation(float timepassed)
{
if(timeToChange > .2)
//if(timeToChange > .2)
{
timeToChange = 0;
updateParts();

4
apps/openmw/mwrender/npcanimation.hpp
View file

@ -18,6 +18,8 @@ private:
int mPartslots[27]; //Each part slot is taken by clothing, armor, or is empty
int mPartPriorities[27];
bool mIsPlayer;
//Bounded Parts
NifOgre::EntityList lclavicle;
NifOgre::EntityList rclavicle;
@ -66,7 +68,7 @@ private:
MWWorld::ContainerStoreIterator skirtiter;
public:
NpcAnimation(const MWWorld::Ptr& ptr, OEngine::Render::OgreRenderer& _rend, MWWorld::InventoryStore& _inv);
NpcAnimation(const MWWorld::Ptr& ptr, OEngine::Render::OgreRenderer& _rend, MWWorld::InventoryStore& _inv, bool player=false);
virtual ~NpcAnimation();
NifOgre::EntityList insertBoundedPart(const std::string &mesh, const std::string &bonename);
virtual void runAnimation(float timepassed);

4
apps/openmw/mwrender/renderconst.hpp
View file

@ -41,7 +41,7 @@ enum VisibilityFlags
// Water
RV_Water = 8,
// Actors (player, npcs, creatures)
// Actors (npcs, creatures)
RV_Actors = 16,
// Misc objects (containers, dynamic objects)
@ -54,6 +54,8 @@ enum VisibilityFlags
RV_OcclusionQuery = 256,
RV_Player = 512,
RV_Map = RV_Terrain + RV_Statics + RV_StaticsSmall + RV_Misc + RV_Water
/// \todo markers (normally hidden)

11
apps/openmw/mwrender/renderingmanager.cpp
View file

@ -34,6 +34,7 @@
#include "water.hpp"
#include "compositors.hpp"
#include "npcanimation.hpp"
#include "characterpreview.hpp"
using namespace MWRender;
using namespace Ogre;
@ -159,6 +160,8 @@ RenderingManager::RenderingManager (OEngine::Render::OgreRenderer& _rend, const
mDebugging = new Debugging(mMwRoot, engine);
mLocalMap = new MWRender::LocalMap(&mRendering, this);
mCharacterPreview = new CharacterPreview(mRendering.getScene (), playerNode);
setMenuTransparency(Settings::Manager::getFloat("menu transparency", "GUI"));
}
@ -175,6 +178,7 @@ RenderingManager::~RenderingManager ()
delete mOcclusionQuery;
delete mCompositors;
delete mWater;
delete mCharacterPreview;
}
MWRender::SkyManager* RenderingManager::getSkyManager()
@ -860,7 +864,7 @@ void RenderingManager::renderPlayer(const MWWorld::Ptr &ptr)
new MWRender::NpcAnimation(
ptr,
mRendering,
MWWorld::Class::get(ptr).getInventoryStore(ptr)
MWWorld::Class::get(ptr).getInventoryStore(ptr), true
);
mPlayer->setAnimation(anim);
}
@ -882,4 +886,9 @@ bool RenderingManager::isPositionExplored (float nX, float nY, int x, int y, boo
return mLocalMap->isPositionExplored(nX, nY, x, y, interior);
}
void RenderingManager::updateCharacterPreview (int sizeX, int sizeY)
{
mCharacterPreview->update(sizeX, sizeY);
}
} // namespace

5
apps/openmw/mwrender/renderingmanager.hpp
View file

@ -43,6 +43,7 @@ namespace MWRender
class LocalMap;
class Water;
class Compositors;
class CharacterPreview;
class RenderingManager: private RenderingInterface, public Ogre::WindowEventListener {
@ -191,6 +192,8 @@ class RenderingManager: private RenderingInterface, public Ogre::WindowEventList
virtual bool isPositionExplored (float nX, float nY, int x, int y, bool interior);
///< see MWRender::LocalMap::isPositionExplored
void updateCharacterPreview(int sizeX, int sizeY);
protected:
virtual void windowResized(Ogre::RenderWindow* rw);
virtual void windowClosed(Ogre::RenderWindow* rw);
@ -213,6 +216,8 @@ class RenderingManager: private RenderingInterface, public Ogre::WindowEventList
TerrainManager* mTerrainManager;
CharacterPreview* mCharacterPreview;
MWRender::Water *mWater;
OEngine::Render::OgreRenderer &mRendering;

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

@ -111,7 +111,7 @@ void Shadows::recreate()
sh::Factory::getInstance ().setSharedParameter ("shadowFar_fadeStart", sh::makeProperty<sh::Vector4>(shadowFar_fadeStart));
// Set visibility mask for the shadow render textures
int visibilityMask = RV_Actors * Settings::Manager::getBool("actor shadows", "Shadows")
int visibilityMask = (RV_Actors + RV_Player) * Settings::Manager::getBool("actor shadows", "Shadows")
+ (RV_Statics + RV_StaticsSmall) * Settings::Manager::getBool("statics shadows", "Shadows")
+ RV_Misc * Settings::Manager::getBool("misc shadows", "Shadows");

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

@ -332,7 +332,7 @@ void Water::applyVisibilityMask()
mVisibilityFlags = RV_Terrain * Settings::Manager::getBool("reflect terrain", "Water")
+ RV_Statics * Settings::Manager::getBool("reflect statics", "Water")
+ RV_StaticsSmall * Settings::Manager::getBool("reflect small statics", "Water")
+ RV_Actors * Settings::Manager::getBool("reflect actors", "Water")
+ (RV_Actors + RV_Player) * Settings::Manager::getBool("reflect actors", "Water")
+ RV_Misc * Settings::Manager::getBool("reflect misc", "Water")
+ RV_Sky;

5
apps/openmw/mwworld/worldimp.cpp
View file

@ -1222,4 +1222,9 @@ namespace MWWorld
{
mRendering->renderPlayer(mPlayer->getPlayer());
}
void World::updateCharacterPreview (int sizeX, int sizeY)
{
mRendering->updateCharacterPreview(sizeX, sizeY);
}
}

2
apps/openmw/mwworld/worldimp.hpp
View file

@ -307,6 +307,8 @@ namespace MWWorld
}
virtual void renderPlayer();
virtual void updateCharacterPreview(int sizeX, int sizeY);
};
}

8
files/mygui/openmw_inventory_window.layout
View file

@ -12,8 +12,12 @@
<!-- Avatar -->
<Widget type="Widget" skin="MW_Box" position="8 38 212 185" name="Avatar" align="Left Top Stretch">
<Widget type="TextBox" skin="ProgressText" position="0 150 212 24" align="HCenter Bottom" name="ArmorRating">
<Property key="Caption" value="Armor Rating"/>
<Widget type="ImageBox" skin="ImageBox" position="0 0 212 185" align="Stretch" name="AvatarImage">
<Property key="ImageTexture" value="CharacterPreview"/>
<Property key="NeedMouse" value="false"/>
<Widget type="TextBox" skin="ProgressText" position="0 150 212 24" align="HCenter Bottom" name="ArmorRating">
<Property key="Caption" value="Armor Rating"/>
</Widget>
</Widget>
</Widget>