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

Merge branch 'FMODStudio'

Browse Source 
Conflicts:
	indra/cmake/PNG.cmake
	indra/newview/llnetmap.cpp
	indra/newview/llviewermessage.cpp



PARAMETERS: CLEAN
This commit is contained in:
Shyotl
2015-01-26 17:15:46 -06:00
parent 2132978c41 6e4ef6f8a1
commit b865b92a6a
224 changed files with 4964 additions and 4731 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
indra/newview/llmediactrl.cpp
View File

@@ -120,8 +120,8 @@ LLMediaCtrl::LLMediaCtrl( const Params& p) :
if(!getDecoupleTextureSize())
{
S32 screen_width = llround((F32)getRect().getWidth() * LLUI::getScaleFactor().mV[VX]);
S32 screen_height = llround((F32)getRect().getHeight() * LLUI::getScaleFactor().mV[VY]);
S32 screen_width = llmath::llround((F32)getRect().getWidth() * LLUI::getScaleFactor().mV[VX]);
S32 screen_height = llmath::llround((F32)getRect().getHeight() * LLUI::getScaleFactor().mV[VY]);
setTextureSize(screen_width, screen_height);
}
@@ -464,8 +464,8 @@ void LLMediaCtrl::reshape( S32 width, S32 height, BOOL called_from_parent )
{
if(!getDecoupleTextureSize())
{
S32 screen_width = llround((F32)width * LLUI::getScaleFactor().mV[VX]);
S32 screen_height = llround((F32)height * LLUI::getScaleFactor().mV[VY]);
S32 screen_width = llmath::llround((F32)width * LLUI::getScaleFactor().mV[VX]);
S32 screen_height = llmath::llround((F32)height * LLUI::getScaleFactor().mV[VY]);
// when floater is minimized, these sizes are negative
if ( screen_height > 0 && screen_width > 0 )
@@ -797,13 +797,13 @@ void LLMediaCtrl::draw()
{
// max width, adjusted height
width = r.getWidth();
height = llmin(llmax(llround(width / media_aspect), 0), r.getHeight());
height = llmin(llmax(llmath::llround(width / media_aspect), 0), r.getHeight());
}
else
{
// max height, adjusted width
height = r.getHeight();
width = llmin(llmax(llround(height * media_aspect), 0), r.getWidth());
width = llmin(llmax(llmath::llround(height * media_aspect), 0), r.getWidth());
}
}
else
@@ -823,10 +823,10 @@ void LLMediaCtrl::draw()
/*if (mIgnoreUIScale)
{
x_offset = llround((F32)x_offset * LLUI::getScaleFactor().mV[VX]);
y_offset = llround((F32)y_offset * LLUI::getScaleFactor().mV[VY]);
width = llround((F32)width * LLUI::getScaleFactor().mV[VX]);
height = llround((F32)height * LLUI::getScaleFactor().mV[VY]);
x_offset = llmath::llround((F32)x_offset * LLUI::getScaleFactor().mV[VX]);
y_offset = llmath::llround((F32)y_offset * LLUI::getScaleFactor().mV[VY]);
width = llmath::llround((F32)width * LLUI::getScaleFactor().mV[VX]);
height = llmath::llround((F32)height * LLUI::getScaleFactor().mV[VY]);
}*/
// draw the browser
@@ -897,14 +897,14 @@ void LLMediaCtrl::convertInputCoords(S32& x, S32& y)
coords_opengl = mMediaSource->getMediaPlugin()->getTextureCoordsOpenGL();
}
x = llround((F32)x * LLUI::getScaleFactor().mV[VX]);
x = llmath::llround((F32)x * LLUI::getScaleFactor().mV[VX]);
if ( ! coords_opengl )
{
y = llround((F32)(y) * LLUI::getScaleFactor().mV[VY]);
y = llmath::llround((F32)(y) * LLUI::getScaleFactor().mV[VY]);
}
else
{
y = llround((F32)(getRect().getHeight() - y) * LLUI::getScaleFactor().mV[VY]);
y = llmath::llround((F32)(getRect().getHeight() - y) * LLUI::getScaleFactor().mV[VY]);
};
}