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

Merge branch 'V2MultiWear' of git://github.com/siana/SingularityViewer into V2MultiWear

Browse Source 
Conflicts:
	indra/llrender/llvertexbuffer.h
	indra/newview/llface.cpp
This commit is contained in:
Lirusaito
2012-07-03 01:57:55 -04:00
parent 9c61998dac 5a685febbf
commit 4e2af85770
4 changed files with 4916 additions and 2681 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
indra/llrender/llvertexbuffer.h
View File

@@ -91,7 +91,6 @@ public:
typedef std::list<Record> record_list_t;
std::vector<record_list_t> mFreeList;
std::vector<U32> mMissCount;
};
//============================================================================

7590
indra/newview/app_settings/CA.pem
View File

File diff suppressed because it is too large Load Diff

2
indra/newview/llface.cpp
View File

@@ -2006,7 +2006,7 @@ BOOL LLFace::getGeometryVolume(const LLVolume& volume,
(glow << 24);
U32 vec[4];
vec[0] = vec[1] = vec[2] = vec[3] = glow32;
std::fill_n(vec,4,glow32); // for clang
src.loadua((F32*) vec);

4
indra/newview/llsurfacepatch.cpp
View File

@@ -236,8 +236,8 @@ void LLSurfacePatch::eval(const U32 x, const U32 y, const U32 stride, LLVector3
const F32 xyScaleInv = (1.f / xyScale)*(0.2222222222f);
F32 vec[3] = {
(F32)fmod((mOriginGlobal.mdV[0] + x)*xyScaleInv, 256.f),
(F32)fmod((mOriginGlobal.mdV[1] + y)*xyScaleInv, 256.f),
(F32)fmod((F32)(mOriginGlobal.mdV[0] + x)*xyScaleInv, 256.f),
(F32)fmod((F32)(mOriginGlobal.mdV[1] + y)*xyScaleInv, 256.f),
0.f
};
F32 rand_val = llclamp(noise2(vec)* 0.75f + 0.5f, 0.f, 1.f);