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

Merge branch 'master' of https://github.com/singularity-viewer/SingularityViewer.git

Browse Source 
Conflicts:
	indra/llrender/llpostprocess.cpp
This commit is contained in:
Shyotl
2015-05-16 02:53:19 -05:00
parent f827d77600 a4da61ae0b
commit 690f3614c1
283 changed files with 4359 additions and 2112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
indra/newview/llsurface.cpp
View File

@@ -1424,10 +1424,10 @@ BOOL LLSurface::generateWaterTexture(const F32 x, const F32 y,
S32 x_begin, y_begin, x_end, y_end;
x_begin = llmath::llround(x * scale_inv);
y_begin = llmath::llround(y * scale_inv);
x_end = llmath::llround((x + width) * scale_inv);
y_end = llmath::llround((y + width) * scale_inv);
x_begin = ll_round(x * scale_inv);
y_begin = ll_round(y * scale_inv);
x_end = ll_round((x + width) * scale_inv);
y_end = ll_round((y + width) * scale_inv);
if (x_end > tex_width)
{
@@ -1475,9 +1475,9 @@ BOOL LLSurface::generateWaterTexture(const F32 x, const F32 y,
// Want non-linear curve for transparency gradient
coloru = MAX_WATER_COLOR;
const F32 frac = 1.f - 2.f/(2.f - (height - WATER_HEIGHT));
S32 alpha = 64 + llmath::llround((255-64)*frac);
S32 alpha = 64 + ll_round((255-64)*frac);
alpha = llmin(llmath::llround((F32)MAX_WATER_COLOR.mV[3]), alpha);
alpha = llmin(ll_round((F32)MAX_WATER_COLOR.mV[3]), alpha);
alpha = llmax(64, alpha);
coloru.mV[3] = alpha;