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

Merge branch 'master' of https://bitbucket.org/Shyotl/singularityviewer-internal

Browse Source 
Conflicts:
	indra/newview/llnetmap.cpp - Thankies Shyotl~
This commit is contained in:
Inusaito Sayori
2014-07-21 23:31:59 -04:00
parent 8159eff664 cd85afc9a5
commit 5191baa659
111 changed files with 2419 additions and 3960 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
indra/llmath/llvolume.cpp
View File

@@ -50,7 +50,6 @@
#include "llstl.h"
#include "llsdserialize.h"
#include "llvector4a.h"
#include "llmatrix4a.h"
#include "lltimer.h"
#define DEBUG_SILHOUETTE_BINORMALS 0
@@ -2184,7 +2183,7 @@ BOOL LLVolume::generate()
0, 0, scale[2], 0,
0, 0, 0, 1 };
LLMatrix4 rot((F32*) mPathp->mPath[s].mRot.mMatrix);
LLMatrix4 rot(mPathp->mPath[s].mRot.getF32ptr());
LLMatrix4 scale_mat(sc);
scale_mat *= rot;
@@ -3670,16 +3669,14 @@ S32 LLVolume::getNumTriangles(S32* vcount) const
void LLVolume::generateSilhouetteVertices(std::vector<LLVector3> &vertices,
std::vector<LLVector3> &normals,
const LLVector3& obj_cam_vec_in,
const LLMatrix4& mat_in,
const LLMatrix3& norm_mat_in,
const LLMatrix4a& mat_in,
const LLMatrix4a& norm_mat_in,
S32 face_mask)
{
LLMatrix4a mat;
mat.loadu(mat_in);
const LLMatrix4a& mat = mat_in;
const LLMatrix4a& norm_mat = norm_mat_in;
LLMatrix4a norm_mat;
norm_mat.loadu(norm_mat_in);
LLVector4a obj_cam_vec;
obj_cam_vec.load3(obj_cam_vec_in.mV);