mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-02-19 03:39:58 +00:00
Code Issues Projects Releases Wiki Activity

character preview working

Browse Source
This commit is contained in:
scrawl 2012-09-13 14:56:50 +02:00
parent d90af9c524
commit 5155339cb6
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
apps/openmw/mwgui/inventorywindow.cpp
View File

@ -102,12 +102,10 @@ namespace MWGui
_sender->getSize().height-44 ); _sender->getSize().height-44 );
drawItems(); drawItems();
MyGUI::IntSize size = mAvatarImage->getSize(); MyGUI::IntSize size = mAvatar->getSize();
std::cout << "dims " << size.width << " " << size.height << std::endl;
MWBase::Environment::get().getWorld()->updateCharacterPreview (size.width, size.height); MWBase::Environment::get().getWorld()->updateCharacterPreview (size.width, size.height);
mAvatarImage->setSize(MyGUI::IntSize(std::max(mAvatar->getSize().width, 512), std::max(mAvatar->getSize().height, 1024)));
mAvatarImage->setImageCoord (MyGUI::IntCoord(0,0,size.width, size.height));
} }
void InventoryWindow::onFilterChanged(MyGUI::Widget* _sender) void InventoryWindow::onFilterChanged(MyGUI::Widget* _sender)
@ -267,9 +265,11 @@ namespace MWGui
else else
mWindowManager.setSelectedWeapon(*weaponSlot, 100); /// \todo track weapon durability mWindowManager.setSelectedWeapon(*weaponSlot, 100); /// \todo track weapon durability
MyGUI::IntSize size = mAvatarImage->getSize(); MyGUI::IntSize size = mAvatar->getSize();
mAvatarImage->setImageCoord (MyGUI::IntCoord(0,0,size.width, size.height));
MWBase::Environment::get().getWorld()->updateCharacterPreview (size.width, size.height); MWBase::Environment::get().getWorld()->updateCharacterPreview (size.width, size.height);
mAvatarImage->setSize(MyGUI::IntSize(512, 1024));
} }
void InventoryWindow::pickUpObject (MWWorld::Ptr object) void InventoryWindow::pickUpObject (MWWorld::Ptr object)

2
apps/openmw/mwrender/characterpreview.cpp
View File

@ -42,7 +42,7 @@ namespace MWRender
{ {
bool wasVisible = mNode->getParentSceneNode()->getAttachedObject(0)->getVisible (); bool wasVisible = mNode->getParentSceneNode()->getAttachedObject(0)->getVisible ();
mNode->getParentSceneNode()->setVisible(true, false); mNode->getParentSceneNode()->setVisible(true, false);
//mViewport->setDimensions (0, 0, float(sizeX) / float(512), float(sizeY) / float(1024)); mViewport->setDimensions (0, 0, std::min(1.f, float(sizeX) / float(512)), std::min(1.f, float(sizeY) / float(1024)));
mRenderTarget->update(); mRenderTarget->update();

2
files/mygui/openmw_inventory_window.layout
View File

@ -15,11 +15,11 @@
<Widget type="ImageBox" skin="ImageBox" position="0 0 212 185" align="Stretch" name="AvatarImage"> <Widget type="ImageBox" skin="ImageBox" position="0 0 212 185" align="Stretch" name="AvatarImage">
<Property key="ImageTexture" value="CharacterPreview"/> <Property key="ImageTexture" value="CharacterPreview"/>
<Property key="NeedMouse" value="false"/> <Property key="NeedMouse" value="false"/>
</Widget>
<Widget type="TextBox" skin="ProgressText" position="0 150 212 24" align="HCenter Bottom" name="ArmorRating"> <Widget type="TextBox" skin="ProgressText" position="0 150 212 24" align="HCenter Bottom" name="ArmorRating">
<Property key="Caption" value="Armor Rating"/> <Property key="Caption" value="Armor Rating"/>
</Widget> </Widget>
</Widget> </Widget>
</Widget>
</Widget> </Widget>