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

Make V2Renderer branch compile.

Browse Source
This commit is contained in:
Aleric Inglewood
2011-05-24 18:56:53 +02:00
parent d27abe5ed8
commit b82c94383b
4 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
indra/llmath/llcamera.cpp
View File

@@ -92,7 +92,7 @@ F32 LLCamera::getMaxView() const
// ---------------- LLCamera::setFoo() member functions ---------------- // ---------------- LLCamera::setFoo() member functions ----------------
void LLCamera::setUserClipPlane(LLPlane& plane) void LLCamera::setUserClipPlane(LLPlane const& plane)
{ {
mPlaneCount = 7; mPlaneCount = 7;
mAgentPlanes[6] = plane; mAgentPlanes[6] = plane;

2
indra/llmath/llcamera.h
View File

@@ -143,7 +143,7 @@ public:
virtual ~LLCamera(); virtual ~LLCamera();
void setUserClipPlane(LLPlane& plane); void setUserClipPlane(LLPlane const& plane);
void disableUserClipPlane(); void disableUserClipPlane();
virtual void setView(F32 vertical_fov_rads); virtual void setView(F32 vertical_fov_rads);
void setViewHeightInPixels(S32 height); void setViewHeightInPixels(S32 height);

2
indra/llmath/llplane.h
View File

@@ -78,7 +78,7 @@ public:
inline void getVector3(LLVector3& vec) const { vec.set(mV[0], mV[1], mV[2]); } inline void getVector3(LLVector3& vec) const { vec.set(mV[0], mV[1], mV[2]); }
// Retrieve the mask indicating which of the x, y, or z axis are greater or equal to zero. // Retrieve the mask indicating which of the x, y, or z axis are greater or equal to zero.
inline U8 calcPlaneMask() inline U8 calcPlaneMask() const
{ {
U8 mask = 0; U8 mask = 0;

1
indra/newview/pipeline.cpp
View File

@@ -8612,7 +8612,6 @@ void LLPipeline::generateSunShadow(LLCamera& camera)
//hack to disable projector shadows //hack to disable projector shadows
static bool clear = true;
static const LLCachedControl<S32> gen_shadow("RenderShadowDetail",0); static const LLCachedControl<S32> gen_shadow("RenderShadowDetail",0);
if (gen_shadow > 1) if (gen_shadow > 1)