Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update and fix for the texture window - Sort of. Had to remove a number of info displays due to a couple problems, will revisit them at a later date.

Browse Source
This commit is contained in:
Beeks
2010-08-25 18:16:34 -04:00
parent ac16891d19
commit c945631672
5 changed files with 143 additions and 187 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
indra/newview/floatersculptpreview.cpp
View File

@@ -135,7 +135,6 @@ BOOL LLFloaterSculptPreview::postBuild()
if (mRawImagep->getWidth() * mRawImagep->getHeight () <= LL_IMAGE_REZ_LOSSLESS_CUTOFF * LL_IMAGE_REZ_LOSSLESS_CUTOFF)
childEnable("lossless_check");
gSavedSettings.setBOOL("EmeraldTemporaryUpload",FALSE);
childSetValue("temp_check",FALSE);
}
else

2
indra/newview/llfloateravatarlist.cpp
View File

@@ -693,7 +693,7 @@ void LLFloaterAvatarList::refreshAvatarList()
}
//<edit> custom colors for certain types of avatars!
element["columns"][LIST_AVATAR_NAME]["color"] = gColors.getColor( "MapAvatar" ).getValue();
//element["columns"][LIST_AVATAR_NAME]["color"] = gColors.getColor( "MapAvatar" ).getValue();
LLViewerRegion* parent_estate = LLWorld::getInstance()->getRegionFromPosGlobal(entry->getPosition());
LLUUID estate_owner = LLUUID::null;
if(parent_estate && parent_estate->isAlive())

195
indra/newview/llpreviewtexture.cpp
View File

@@ -41,7 +41,6 @@
#include "llimagetga.h"
#include "llinventoryview.h"
#include "llinventory.h"
#include "floatersculptpreview.h"
#include "llresmgr.h"
#include "lltextbox.h"
#include "lltextureview.h"
@@ -69,15 +68,12 @@ LLPreviewTexture::LLPreviewTexture(const std::string& name,
const LLUUID& object_id,
BOOL show_keep_discard)
: LLPreview(name, rect, title, item_uuid, object_id, TRUE, PREVIEW_TEXTURE_MIN_WIDTH, PREVIEW_TEXTURE_MIN_HEIGHT ),
mItemImageID(item_uuid),
mImageName(name),
mLoadingFullImage( FALSE ),
mShowKeepDiscard(show_keep_discard),
mCopyToInv(FALSE),
mIsCopyable(FALSE),
mLastHeight(0),
mLastWidth(0),
mAspectRatio(0.f)
mLastWidth(0)
{
const LLInventoryItem *item = getItem();
if(item)
@@ -132,23 +128,21 @@ LLPreviewTexture::LLPreviewTexture(
PREVIEW_TEXTURE_MIN_WIDTH,
PREVIEW_TEXTURE_MIN_HEIGHT ),
mImageID(asset_id),
mItemImageID(asset_id),
mImageName(name),
mLoadingFullImage( FALSE ),
mShowKeepDiscard(FALSE),
mCopyToInv(copy_to_inv),
mIsCopyable(copy_to_inv),
mLastHeight(0),
mLastWidth(0),
mAspectRatio(0.f)
mLastWidth(0)
{
init();
setTitle(title);
LLRect curRect = getRect();
translate(curRect.mLeft - rect.mLeft, curRect.mTop - rect.mTop);
}
@@ -159,26 +153,17 @@ LLPreviewTexture::~LLPreviewTexture()
getWindow()->decBusyCount();
}
if(mImage.notNull())
{
mImage->destroySavedRawImage() ;
}
mImage = NULL;
}
void LLPreviewTexture::init()
{
LLUICtrlFactory::getInstance()->buildFloater(this,"floater_preview_texture.xml");
childSetVisible("desc", !mCopyToInv); // Hide description field for embedded textures
childSetVisible("desc txt", !mCopyToInv);
childSetVisible("Copy To Inventory", mCopyToInv);
childSetVisible("Keep", mShowKeepDiscard);
childSetVisible("Discard", mShowKeepDiscard);
if (mCopyToInv)
/*if (mCopyToInv)
{
llinfos << "Loading embedded" << llendl;
LLUICtrlFactory::getInstance()->buildFloater(this,"floater_preview_embedded_texture.xml");
childSetAction("Copy To Inventory",LLPreview::onBtnCopyToInv,this);
@@ -186,6 +171,7 @@ void LLPreviewTexture::init()
else if (mShowKeepDiscard)
{
llinfos << "Loading Keep/Discard" << llendl;
LLUICtrlFactory::getInstance()->buildFloater(this,"floater_preview_texture_keep_discard.xml");
childSetAction("Keep",onKeepBtn,this);
@@ -193,35 +179,15 @@ void LLPreviewTexture::init()
}
else
{
// If the buttons are hidden move stuff down to use the space.
LLRect keep_rect, old_rect, new_rect;
S32 diff;
childGetRect("Keep", keep_rect);
childGetRect("combo_aspect_ratio", old_rect);
diff = old_rect.mBottom - keep_rect.mBottom;
new_rect.setOriginAndSize(old_rect.mLeft, old_rect.mBottom - diff,
old_rect.getWidth(), old_rect.getHeight());
childSetRect("combo_aspect_ratio", new_rect);
{*/
LLUICtrlFactory::getInstance()->buildFloater(this,"floater_preview_texture.xml");
childSetVisible("Copy To Inventory", mCopyToInv);
childSetVisible("Keep", mShowKeepDiscard);
childSetVisible("Discard", mShowKeepDiscard);
llinfos << "Image has alpha :" << mImage->getIsAlphaMask() << llendl;
childGetRect("aspect_ratio", old_rect);
new_rect.setOriginAndSize(old_rect.mLeft, old_rect.mBottom - diff,
old_rect.getWidth(), old_rect.getHeight());
childSetRect("aspect_ratio", new_rect);
//}
childGetRect("dimensions", old_rect);
new_rect.setOriginAndSize(old_rect.mLeft, old_rect.mBottom - diff,
old_rect.getWidth(), old_rect.getHeight());
childSetRect("dimensions", new_rect);
}
childSetAction("copy_uuid", onClickCopyID, this);
childSetEnabled("copy_uuid", canSaveAs());
childSetAction("preview_sculpt", onPreviewSculpt, this);
childSetEnabled("preview_sculpt", canSaveAs());
if (!mCopyToInv)
{
@@ -233,8 +199,36 @@ void LLPreviewTexture::init()
childSetText("desc", item->getDescription());
childSetPrevalidate("desc", &LLLineEditor::prevalidatePrintableNotPipe);
}
// If the buttons are hidden move stuff down to use the space.
LLRect keep_rect, old_rect, new_rect;
S32 diff;
childGetRect("Keep", keep_rect);
childGetRect("combo_aspect_ratio", old_rect);
diff = old_rect.mBottom - keep_rect.mBottom;
new_rect.setOriginAndSize(old_rect.mLeft, old_rect.mBottom - diff - 3,
old_rect.getWidth(), old_rect.getHeight());
childSetRect("combo_aspect_ratio", new_rect);
childGetRect("aspect_ratio", old_rect);
new_rect.setOriginAndSize(old_rect.mLeft, old_rect.mBottom - diff - 3,
old_rect.getWidth(), old_rect.getHeight());
childSetRect("aspect_ratio", new_rect);
childGetRect("dimensions", old_rect);
new_rect.setOriginAndSize(old_rect.mLeft, old_rect.mBottom - diff - 3,
old_rect.getWidth(), old_rect.getHeight());
childSetRect("dimensions", new_rect);
}
childSetText("uuid", getItemID().asString());
childSetText("uploader", getItemCreatorName());
childSetText("uploadtime", getItemCreationDate());
childSetCommitCallback("combo_aspect_ratio", onAspectRatioCommit, this);
LLComboBox* combo = getChild<LLComboBox>("combo_aspect_ratio");
combo->setCurrentByIndex(0);
@@ -261,7 +255,6 @@ void LLPreviewTexture::draw()
if ( mImage.notNull() )
{
if(mImage->isMissingAsset()) setTitle("Asset Missing");
// Draw the texture
glColor3f( 1.f, 1.f, 1.f );
gl_draw_scaled_image(interior.mLeft,
@@ -273,12 +266,7 @@ void LLPreviewTexture::draw()
// Pump the texture priority
F32 pixel_area = mLoadingFullImage ? (F32)MAX_IMAGE_AREA : (F32)(interior.getWidth() * interior.getHeight() );
mImage->addTextureStats( pixel_area );
if(pixel_area > 0.f)
{
//boost the previewed image priority to the highest to make it to get loaded first.
mImage->setAdditionalDecodePriority(1.0f) ;
}
// Don't bother decoding more than we can display, unless
// we're loading the full image.
if (!mLoadingFullImage)
@@ -329,8 +317,7 @@ void LLPreviewTexture::draw()
}
}
}
else
if( !mSavedFileTimer.hasExpired() )
else if( !mSavedFileTimer.hasExpired() )
{
// *TODO: Translate
LLFontGL::getFontSansSerif()->renderUTF8(std::string("File Saved"), 0,
@@ -343,42 +330,7 @@ void LLPreviewTexture::draw()
}
}
void LLPreviewTexture::onClickCopyID(void* data)
{
LLPreviewTexture *self = (LLPreviewTexture*)data;
char buffer[UUID_STR_LENGTH]; /*Flawfinder: ignore*/
self->mImageID.toString(buffer);
llinfos << "copying id " << self->mImageID << " to clipboard" << llendl;
gViewerWindow->mWindow->copyTextToClipboard(utf8str_to_wstring(buffer));
}
void LLPreviewTexture::onPreviewSculpt(void* data)
{
LLPreviewTexture *self = (LLPreviewTexture*)data;
self->mImage->setLoadedCallback( LLPreviewTexture::OnFileLoadedForPreview,
0, TRUE, FALSE, new LLUUID( self->mItemUUID ) );
}
void LLPreviewTexture::OnFileLoadedForPreview(BOOL success,
LLViewerImage *src_vi,
LLImageRaw* src,
LLImageRaw* aux_src,
S32 discard_level,
BOOL final,
void* userdata)
{
if( final && success )
{
LLFloaterSculptPreview::show(src);
}
}
void LLPreviewTexture::onClickSaveButton(void* user_data)
{
LLPreviewTexture* self = (LLPreviewTexture*)user_data;
self->saveAs();
}
// virtual
BOOL LLPreviewTexture::canSaveAs() const
{
@@ -400,18 +352,9 @@ void LLPreviewTexture::saveAs()
}
// remember the user-approved/edited file name.
mSaveFileName = file_picker.getFirstFile();
std::string filename = mSaveFileName;
LLStringUtil::toLower(filename);
if (filename.find(".tga") != filename.length() - 4)
{
mSaveFileName += ".tga";
}
mLoadingFullImage = TRUE;
getWindow()->incBusyCount();
// <edit>
//mImage->setLoadedCallback( LLPreviewTexture::onFileLoadedForSave,
mImage->setLoadedCallbackNoAux( LLPreviewTexture::onFileLoadedForSave,
// </edit>
mImage->setLoadedCallback( LLPreviewTexture::onFileLoadedForSave,
0, TRUE, FALSE, new LLUUID( mItemUUID ) );
}
@@ -474,18 +417,40 @@ void LLPreviewTexture::onFileLoadedForSave(BOOL success,
}
}
// <edit>
// virtual
LLUUID LLPreviewTexture::getItemID()
{
const LLViewerInventoryItem* item = getItem();
if(item)
if(item && item->getPermissions().allowCopyBy(gAgent.getID()))
{
return item->getUUID();
}
return LLUUID::null;
}
// </edit>
std::string LLPreviewTexture::getItemCreationDate()
{
const LLViewerInventoryItem* item = getItem();
if(item)
{
std::string time;
timeToFormattedString(item->getCreationDate(), gSavedSettings.getString("TimestampFormat"), time);
return time;
}
return "Unknown";
}
std::string LLPreviewTexture::getItemCreatorName()
{
const LLViewerInventoryItem* item = getItem();
if(item)
{
std::string name;
gCacheName->getFullName(item->getCreatorUUID(), name);
return name;
}
return "Unknown";
}
// It takes a while until we get height and width information.
// When we receive it, reshape the window accordingly.
@@ -503,11 +468,12 @@ void LLPreviewTexture::updateDimensions()
S32 vert_pad = PREVIEW_HEADER_SIZE + 2 * CLIENT_RECT_VPAD + LLPANEL_BORDER_WIDTH;
S32 max_client_width = gViewerWindow->getWindowWidth() - horiz_pad;
S32 max_client_height = gViewerWindow->getWindowHeight() - vert_pad;
if (mAspectRatio > 0.f) client_height = llceil((F32)client_width / mAspectRatio);
if (mAspectRatio > 0.f)
client_height = llceil((F32)client_width / mAspectRatio);
while ((client_width > max_client_width) ||
(client_height > max_client_height ))
(client_height > max_client_height ) )
{
client_width /= 2;
client_height /= 2;
@@ -538,7 +504,7 @@ void LLPreviewTexture::updateDimensions()
view_width = llmax(view_width, getMinWidth());
view_height = llmax(view_height, getMinHeight());
if (client_height != mLastHeight || client_width != mLastWidth)
{
mLastWidth = client_width;
@@ -608,8 +574,8 @@ void LLPreviewTexture::updateDimensions()
window_rect.mTop -= (PREVIEW_HEADER_SIZE + CLIENT_RECT_VPAD);
window_rect.mBottom += PREVIEW_BORDER + button_height + CLIENT_RECT_VPAD + info_height + CLIENT_RECT_VPAD;
mClientRect.setLeftTopAndSize(window_rect.getCenterX() - (client_width / 2), window_rect.mTop, client_width, client_height);
mClientRect.setLeftTopAndSize(window_rect.getCenterX() - (client_width / 2), window_rect.mTop, client_width, client_height);
// Hide the aspect ratio label if the window is too narrow
// Assumes the label should be to the right of the dimensions
LLRect dim_rect, aspect_label_rect;
@@ -662,7 +628,6 @@ void LLPreviewTexture::loadAsset()
{
mImage = gImageList.getImage(mImageID, MIPMAP_TRUE, FALSE);
mImage->setBoostLevel(LLViewerImageBoostLevel::BOOST_PREVIEW);
mImage->forceToSaveRawImage(0) ;
mAssetStatus = PREVIEW_ASSET_LOADING;
}

31
indra/newview/llpreviewtexture.h
View File

@@ -38,7 +38,6 @@
#include "llframetimer.h"
#include "llviewerimage.h"
class LLComboBox;
class LLImageRaw;
class LLPreviewTexture : public LLPreview
@@ -60,20 +59,15 @@ public:
~LLPreviewTexture();
virtual void draw();
static void onClickCopyID(void* data);
static void onPreviewSculpt(void* data);
static void SaveToInventory(void* data);
virtual BOOL canSaveAs() const;
virtual void saveAs();
// <edit>
virtual LLUUID getItemID();
// </edit>
virtual LLUUID getItemID();
virtual std::string getItemCreatorName();
virtual std::string getItemCreationDate();
virtual void loadAsset();
virtual EAssetStatus getAssetStatus();
static void onClickSaveButton (void* user_data);
static void saveToFile(void* userdata);
static void onFileLoadedForSave(
BOOL success,
@@ -83,16 +77,8 @@ public:
S32 discard_level,
BOOL final,
void* userdata );
static void OnFileLoadedForPreview(
BOOL success,
LLViewerImage *src_vi,
LLImageRaw* src,
LLImageRaw* aux_src,
S32 discard_level,
BOOL final,
void* userdata );
LLImageRaw* mImageRaw;
protected:
void init();
bool setAspectRatio(const F32 width, const F32 height);
@@ -102,9 +88,6 @@ protected:
private:
void updateDimensions();
LLUUID mItemImageID;
std::string mImageName;
LLUUID mAssetImageID;
LLUUID mImageID;
LLPointer<LLViewerImage> mImage;
BOOL mLoadingFullImage;
@@ -116,10 +99,10 @@ private:
// This is stored off in a member variable, because the save-as
// button and drag and drop functionality need to know.
BOOL mIsCopyable;
S32 mLastHeight;
S32 mLastWidth;
F32 mAspectRatio; // 0 = Unconstrained
F32 mAspectRatio;
};

101
indra/newview/skins/default/xui/en-us/floater_preview_texture.xml
View File

@@ -1,43 +1,61 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater bottom="-331" can_close="true" can_drag_on_left="false" can_minimize="true"
can_resize="true" enabled="true" height="324" left="300" min_height="120"
min_width="300" mouse_opaque="true" name="preview_texture" width="335">
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom="-40" drop_shadow_visible="true" enabled="true" follows="left|top"
font="SansSerif" h_pad="0" halign="left" height="19" left="13"
mouse_opaque="true" name="desc txt" v_pad="0" width="80">
Description:
<floater bottom="-331" can_close="true" can_drag_on_left="false" can_minimize="true" can_resize="true" enabled="true" height="324" left="300" min_height="150" min_width="300" mouse_opaque="true" name="preview_texture" width="335">
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" bottom="-40"
drop_shadow_visible="true" enabled="true" follows="left|top" font="SansSerifSmall" h_pad="0" halign="left" height="15"
left="13" mouse_opaque="true" name="desc txt" v_pad="0" width="80">
Description:
</text>
<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-38"
enabled="true" follows="left|top|right" font="SansSerif"
handle_edit_keys_directly="false" height="19" left="93" max_length="127"
mouse_opaque="true" name="desc" select_all_on_focus_received="false"
select_on_focus="false" width="229" />
<button bottom="8" enabled="true" follows="left|bottom" font="SansSerif"
halign="center" height="20" label="Keep" label_selected="Keep" left="9"
mouse_opaque="true" name="Keep" scale_image="true" width="100" />
<button bottom="8" enabled="true" follows="left|bottom" font="SansSerif"
halign="center" height="20" label="Discard" label_selected="Discard"
left="114" mouse_opaque="true" name="Discard" scale_image="true"
width="100" />
<button bottom="8" enabled="true" follows="left|bottom" font="SansSerif"
halign="center" height="20" label="Copy To Inventory" left="9"
mouse_opaque="true" name="Copy To Inventory" scale_image="true" width="170" />
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom="35" drop_shadow_visible="true" enabled="true" follows="left|bottom"
font="SansSerifSmall" h_pad="0" halign="left" height="14" left="13"
mouse_opaque="true" name="dimensions" v_pad="0" width="135">
Dimensions: [WIDTH] x [HEIGHT]
<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-43" enabled="false"
follows="left|top|right" font="SansSerifSmall" handle_edit_keys_directly="false" height="17" left="93"
max_length="127" mouse_opaque="true" name="desc" select_all_on_focus_received="false" select_on_focus="false"
width="229" />
<!--<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom_delta="-20" drop_shadow_visible="true" enabled="true" follows="left|top" font="SansSerifSmall" h_pad="0"
halign="left" height="16" left="13" mouse_opaque="true" name="uuid txt" v_pad="0" width="80">
UUID:
</text>
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom="35" drop_shadow_visible="true" enabled="true" follows="right|bottom"
font="SansSerifSmall" h_pad="0" halign="right" height="14" left="86"
mouse_opaque="true" name="aspect_ratio" v_pad="0" width="110">
Preview Aspect Ratio
<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="0" enabled="false"
follows="left|top|right" font="SansSerifSmall" handle_edit_keys_directly="false" height="16" left="93"
max_length="127" mouse_opaque="true" name="uuid" select_all_on_focus_received="false" select_on_focus="false"
width="229" />
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom_delta="-20" drop_shadow_visible="true" enabled="true" follows="left|top" font="SansSerifSmall" h_pad="0"
halign="left" height="16" left="13" mouse_opaque="true" name="uploader txt" v_pad="0" width="80">
Uploaded by:
</text>
<combo_box allow_text_entry="true" bottom="32" follows="right|bottom" height="20"
left="202" max_chars="20" mouse_opaque="true" enabled="true" width="108"
name="combo_aspect_ratio" tool_tip="Preview at a fixed aspect ratio">
<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="0" enabled="false"
follows="left|top|right" font="SansSerifSmall" handle_edit_keys_directly="false" height="16" left="93"
right="-80" max_length="127" mouse_opaque="true" name="uploader" select_all_on_focus_received="false"
select_on_focus="false" width="420" />
<button bottom_delta="-1" enabled="true" follows="right|top" font="SansSerifSmall" halign="center" height="18"
label="Profile" right="320" mouse_opaque="true" name="openprofile" scale_image="true" width="60" />
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom_delta="-20" drop_shadow_visible="true" enabled="true" follows="left|top" font="SansSerifSmall"
h_pad="0" halign="left" height="16" left="13" mouse_opaque="true" name="uploadtime txt" v_pad="0" width="80">
Uploaded on:
</text>
<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="0" enabled="false"
follows="left|top|right" font="SansSerifSmall" handle_edit_keys_directly="false" height="16" left="93"
right="-80" max_length="127" mouse_opaque="true" name="uploadtime" select_all_on_focus_received="false"
select_on_focus="false" width="420" />-->
<button bottom="8" enabled="true" follows="left|bottom" font="SansSerif" halign="center" height="20"
label="Keep" label_selected="Keep" left="9" mouse_opaque="true" name="Keep" scale_image="true" width="100" />
<button bottom="8" enabled="true" follows="left|bottom" font="SansSerif" halign="center" height="20"
label="Discard" label_selected="Discard" left="114" mouse_opaque="true" name="Discard" scale_image="true" width="100" />
<button bottom="8" enabled="true" follows="left|bottom" font="SansSerif" halign="center" height="20"
label="Copy To Inventory" left="9" mouse_opaque="true" name="Copy To Inventory" scale_image="true" width="170" />
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom="35" drop_shadow_visible="true" enabled="true" follows="left|bottom" font="SansSerifSmall" h_pad="0"
halign="left" height="14" left="13" mouse_opaque="true" name="dimensions" v_pad="0" width="135">
Dimensions: [WIDTH] x [HEIGHT]
</text>
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom="35" drop_shadow_visible="true" enabled="true" follows="right|bottom" font="SansSerifSmall" h_pad="0"
halign="right" height="14" left="86" mouse_opaque="true" name="aspect_ratio" v_pad="0" width="110">
Preview Aspect Ratio
</text>
<combo_box allow_text_entry="true" bottom="32" follows="right|bottom" height="20" left="202" max_chars="20"
mouse_opaque="true" enabled="true" width="108" name="combo_aspect_ratio" tool_tip="Preview at a fixed aspect ratio">
<combo_item name="Unconstrained" value="Unconstrained">
Unconstrained
</combo_item>
@@ -63,13 +81,4 @@
2:1
</combo_item>
</combo_box>
<button bottom="-318" enabled="true" follows="right|bottom" font="SansSerif"
halign="center" height="20" label="Copy UUID" left="130"
mouse_opaque="true" name="copy_uuid" scale_image="true" width="90" />
<button bottom_delta="0" enabled="true" follows="right|bottom" font="SansSerif"
halign="center" height="20" label="Preview Sculpt" left_delta="90"
mouse_opaque="true" name="preview_sculpt" scale_image="true" width="100" />
<button bottom_delta="20" enabled="true" follows="right|bottom" font="SansSerif"
halign="center" height="20" label="Save Texture" left_delta="-90"
mouse_opaque="true" name="Save" scale_image="true" width="90" />
</floater>
</floater>