Skip to content
Snippets Groups Projects
Commit d56e8707 authored by Rye Mutt's avatar Rye Mutt :bread:
Browse files

Small cleanups

parent d9f45807
No related branches found
No related tags found
No related merge requests found
......@@ -47,7 +47,7 @@ class LLViewerTextEditor : public LLTextEditor
virtual void makePristine();
/*virtual*/ void onVisibilityChange( BOOL new_visibility );
/*virtual*/ void onVisibilityChange( BOOL new_visibility ) override;
// mousehandler overrides
virtual BOOL handleMouseDown(S32 x, S32 y, MASK mask);
......
......@@ -44,7 +44,7 @@ class LLViewerTextureAnim : public LLTextureAnim
LLViewerTextureAnim(LLVOVolume* vobj);
virtual ~LLViewerTextureAnim();
/*virtual*/ void reset();
/*virtual*/ void reset() override;
S32 animateTextures(F32 &off_s, F32 &off_t, F32 &scale_s, F32 &scale_t, F32 &rotate);
enum
......
......@@ -63,12 +63,12 @@ class LLVOPartGroup : public LLAlphaObject
LLVOPartGroup(const LLUUID &id, const LLPCode pcode, LLViewerRegion *regionp);
/*virtual*/ BOOL isActive() const; // Whether this object needs to do an idleUpdate.
void idleUpdate(LLAgent &agent, const F64 &time);
/*virtual*/ BOOL isActive() const override; // Whether this object needs to do an idleUpdate.
void idleUpdate(LLAgent &agent, const F64 &time) override;
virtual F32 getBinRadius();
virtual void updateSpatialExtents(LLVector4a& newMin, LLVector4a& newMax);
virtual U32 getPartitionType() const;
F32 getBinRadius() override;
void updateSpatialExtents(LLVector4a& newMin, LLVector4a& newMax) override;
U32 getPartitionType() const override;
/*virtual*/ BOOL lineSegmentIntersect(const LLVector4a& start, const LLVector4a& end,
S32 face,
......@@ -78,13 +78,13 @@ class LLVOPartGroup : public LLAlphaObject
LLVector4a* intersection,
LLVector2* tex_coord,
LLVector4a* normal,
LLVector4a* tangent);
LLVector4a* tangent) override;
/*virtual*/ void setPixelAreaAndAngle(LLAgent &agent);
/*virtual*/ void updateTextures();
/*virtual*/ void setPixelAreaAndAngle(LLAgent &agent) override;
/*virtual*/ void updateTextures() override;
/*virtual*/ LLDrawable* createDrawable(LLPipeline *pipeline);
/*virtual*/ BOOL updateGeometry(LLDrawable *drawable);
/*virtual*/ LLDrawable* createDrawable(LLPipeline *pipeline) override;
/*virtual*/ BOOL updateGeometry(LLDrawable *drawable) override;
void getGeometry(const LLViewerPart& part,
LLStrider<LLVector4a>& verticesp);
......
......@@ -227,14 +227,14 @@ class LLVOSky final : public LLStaticViewerObject
void cacheEnvironment(const LLSettingsSky::ptr_t& psky, AtmosphericsVars& atmosphericsVars);
void calc(const LLSettingsSky::ptr_t& psky);
/*virtual*/ void idleUpdate(LLAgent &agent, const F64 &time);
/*virtual*/ void idleUpdate(LLAgent &agent, const F64 &time) override;
bool updateSky();
// Graphical stuff for objects - maybe broken out into render class
// later?
/*virtual*/ void updateTextures();
/*virtual*/ LLDrawable* createDrawable(LLPipeline *pipeline);
/*virtual*/ BOOL updateGeometry(LLDrawable *drawable);
/*virtual*/ void updateTextures() override;
/*virtual*/ LLDrawable* createDrawable(LLPipeline *pipeline) override;
/*virtual*/ BOOL updateGeometry(LLDrawable *drawable) override;
const LLHeavenBody& getSun() const { return mSun; }
const LLHeavenBody& getMoon() const { return mMoon; }
......
......@@ -51,17 +51,14 @@ class LLVOSurfacePatch final : public LLStaticViewerObject
LLVOSurfacePatch(const LLUUID &id, const LLPCode pcode, LLViewerRegion *regionp);
/*virtual*/ void markDead();
// Initialize data that's only inited once per class.
static void initClass();
/*virtual*/ void markDead() override;
virtual U32 getPartitionType() const;
/*virtual*/ LLDrawable* createDrawable(LLPipeline *pipeline);
/*virtual*/ void updateGL();
/*virtual*/ BOOL updateGeometry(LLDrawable *drawable);
/*virtual*/ BOOL updateLOD();
/*virtual*/ LLDrawable* createDrawable(LLPipeline *pipeline) override;
/*virtual*/ void updateGL() override;
/*virtual*/ BOOL updateGeometry(LLDrawable *drawable) override;
/*virtual*/ BOOL updateLOD() override;
/*virtual*/ void updateFaceSize(S32 idx);
void getGeometry(LLStrider<LLVector3> &verticesp,
LLStrider<LLVector3> &normalsp,
......@@ -69,11 +66,11 @@ class LLVOSurfacePatch final : public LLStaticViewerObject
LLStrider<LLVector2> &texCoords1p,
LLStrider<U16> &indicesp);
/*virtual*/ void updateTextures();
/*virtual*/ void setPixelAreaAndAngle(LLAgent &agent); // generate accurate apparent angle and area
/*virtual*/ void updateTextures() override;
/*virtual*/ void setPixelAreaAndAngle(LLAgent &agent) override; // generate accurate apparent angle and area
/*virtual*/ void updateSpatialExtents(LLVector4a& newMin, LLVector4a& newMax);
/*virtual*/ BOOL isActive() const; // Whether this object needs to do an idleUpdate.
/*virtual*/ void updateSpatialExtents(LLVector4a& newMin, LLVector4a& newMax) override;
/*virtual*/ BOOL isActive() const override; // Whether this object needs to do an idleUpdate.
void setPatch(LLSurfacePatch *patchp);
LLSurfacePatch *getPatch() const { return mPatchp; }
......@@ -90,7 +87,7 @@ class LLVOSurfacePatch final : public LLStaticViewerObject
LLVector2* tex_coord = NULL, // return the texture coordinates of the intersection point
LLVector4a* normal = NULL, // return the surface normal at the intersection point
LLVector4a* tangent = NULL // return the surface tangent at the intersection point
);
) override;
BOOL mDirtiedPatch;
protected:
......
......@@ -412,11 +412,6 @@ void LLVOTree::idleUpdate(LLAgent &agent, const F64 &time)
mTrunkLOD = trunk_LOD;
}
void LLVOTree::render(LLAgent &agent)
{
}
void LLVOTree::setPixelAreaAndAngle(LLAgent &agent)
{
auto& viewerCamera = LLViewerCamera::instanceFast();
......
......@@ -61,7 +61,6 @@ class LLVOTree final : public LLViewerObject
/*virtual*/ void idleUpdate(LLAgent &agent, const F64 &time) override;
// Graphical stuff for objects - maybe broken out into render class later?
/*virtual*/ void render(LLAgent &agent);
/*virtual*/ void setPixelAreaAndAngle(LLAgent &agent) override;
/*virtual*/ void updateTextures() override;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment