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

More finalization for spatial partitions

parent 928806b1
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
indra/newview/llspatialpartition.h
+ 36
− 36
View file @ 61fc2e77
...@@ -436,19 +436,19 @@ class LLSpatialBridge : public LLDrawable, public LLSpatialPartition ...@@ -436,19 +436,19 @@ class LLSpatialBridge : public LLDrawable, public LLSpatialPartition
void destroyTree(); void destroyTree();
virtual BOOL isSpatialBridge() const { return TRUE; } BOOL isSpatialBridge() const final { return TRUE; }
virtual void updateSpatialExtents(); void updateSpatialExtents() final;
virtual void updateBinRadius(); void updateBinRadius() final;
virtual void setVisible(LLCamera& camera_in, std::vector<LLDrawable*>* results = NULL, BOOL for_select = FALSE); void setVisible(LLCamera& camera_in, std::vector<LLDrawable*>* results = NULL, BOOL for_select = FALSE) final;
virtual void updateDistance(LLCamera& camera_in, bool force_update); void updateDistance(LLCamera& camera_in, bool force_update) final;
virtual void makeActive(); void makeActive() final;
virtual void move(LLDrawable *drawablep, LLSpatialGroup *curp, BOOL immediate = FALSE); void move(LLDrawable *drawablep, LLSpatialGroup *curp, BOOL immediate = FALSE) final;
virtual BOOL updateMove(); BOOL updateMove() final;
virtual void shiftPos(const LLVector4a& vec); void shiftPos(const LLVector4a& vec) override;
virtual void cleanupReferences(); void cleanupReferences() final;
virtual LLSpatialPartition* asPartition() { return this; } LLSpatialPartition* asPartition() final { return this; }
virtual LLCamera transformCamera(LLCamera& camera); LLCamera transformCamera(LLCamera& camera);
LLDrawable* mDrawable; LLDrawable* mDrawable;
}; };
...@@ -553,19 +553,19 @@ class LLWaterPartition : public LLSpatialPartition ...@@ -553,19 +553,19 @@ class LLWaterPartition : public LLSpatialPartition
{ {
public: public:
LLWaterPartition(LLViewerRegion* regionp); LLWaterPartition(LLViewerRegion* regionp);
virtual void getGeometry(LLSpatialGroup* group) { } void getGeometry(LLSpatialGroup* group) final { }
virtual void addGeometryCount(LLSpatialGroup* group, U32 &vertex_count, U32& index_count) { } void addGeometryCount(LLSpatialGroup* group, U32 &vertex_count, U32& index_count) final { }
}; };
//spatial partition for hole and edge water (implemented in LLVOWater.cpp) //spatial partition for hole and edge water (implemented in LLVOWater.cpp)
class LLVoidWaterPartition : public LLWaterPartition class LLVoidWaterPartition final : public LLWaterPartition
{ {
public: public:
LLVoidWaterPartition(LLViewerRegion* regionp); LLVoidWaterPartition(LLViewerRegion* regionp);
}; };
//spatial partition for terrain (impelmented in LLVOSurfacePatch.cpp) //spatial partition for terrain (impelmented in LLVOSurfacePatch.cpp)
class LLTerrainPartition : public LLSpatialPartition class LLTerrainPartition final : public LLSpatialPartition
{ {
public: public:
LLTerrainPartition(LLViewerRegion* regionp); LLTerrainPartition(LLViewerRegion* regionp);
...@@ -574,7 +574,7 @@ class LLTerrainPartition : public LLSpatialPartition ...@@ -574,7 +574,7 @@ class LLTerrainPartition : public LLSpatialPartition
}; };
//spatial partition for trees //spatial partition for trees
class LLTreePartition : public LLSpatialPartition class LLTreePartition final : public LLSpatialPartition
{ {
public: public:
LLTreePartition(LLViewerRegion* regionp); LLTreePartition(LLViewerRegion* regionp);
...@@ -588,27 +588,27 @@ class LLParticlePartition : public LLSpatialPartition ...@@ -588,27 +588,27 @@ class LLParticlePartition : public LLSpatialPartition
{ {
public: public:
LLParticlePartition(LLViewerRegion* regionp); LLParticlePartition(LLViewerRegion* regionp);
virtual void rebuildGeom(LLSpatialGroup* group); void rebuildGeom(LLSpatialGroup* group) final;
virtual void getGeometry(LLSpatialGroup* group); void getGeometry(LLSpatialGroup* group) final;
virtual void addGeometryCount(LLSpatialGroup* group, U32 &vertex_count, U32& index_count); void addGeometryCount(LLSpatialGroup* group, U32 &vertex_count, U32& index_count) final;
virtual F32 calcPixelArea(LLSpatialGroup* group, LLCamera& camera); F32 calcPixelArea(LLSpatialGroup* group, LLCamera& camera) final;
protected: protected:
U32 mRenderPass; U32 mRenderPass;
}; };
class LLHUDParticlePartition : public LLParticlePartition class LLHUDParticlePartition final : public LLParticlePartition
{ {
public: public:
LLHUDParticlePartition(LLViewerRegion* regionp); LLHUDParticlePartition(LLViewerRegion* regionp);
}; };
//spatial partition for grass (implemented in LLVOGrass.cpp) //spatial partition for grass (implemented in LLVOGrass.cpp)
class LLGrassPartition : public LLSpatialPartition class LLGrassPartition final : public LLSpatialPartition
{ {
public: public:
LLGrassPartition(LLViewerRegion* regionp); LLGrassPartition(LLViewerRegion* regionp);
virtual void getGeometry(LLSpatialGroup* group); void getGeometry(LLSpatialGroup* group) override;
virtual void addGeometryCount(LLSpatialGroup* group, U32 &vertex_count, U32& index_count); void addGeometryCount(LLSpatialGroup* group, U32 &vertex_count, U32& index_count) override;
protected: protected:
U32 mRenderPass; U32 mRenderPass;
}; };
...@@ -651,10 +651,10 @@ class LLVolumePartition final : public LLSpatialPartition, public LLVolumeGeomet ...@@ -651,10 +651,10 @@ class LLVolumePartition final : public LLSpatialPartition, public LLVolumeGeomet
{ {
public: public:
LLVolumePartition(LLViewerRegion* regionp); LLVolumePartition(LLViewerRegion* regionp);
virtual void rebuildGeom(LLSpatialGroup* group) { LLVolumeGeometryManager::rebuildGeom(group); } void rebuildGeom(LLSpatialGroup* group) override { LLVolumeGeometryManager::rebuildGeom(group); }
virtual void getGeometry(LLSpatialGroup* group) { LLVolumeGeometryManager::getGeometry(group); } void getGeometry(LLSpatialGroup* group) override { LLVolumeGeometryManager::getGeometry(group); }
virtual void rebuildMesh(LLSpatialGroup* group) { LLVolumeGeometryManager::rebuildMesh(group); } void rebuildMesh(LLSpatialGroup* group) override { LLVolumeGeometryManager::rebuildMesh(group); }
virtual void addGeometryCount(LLSpatialGroup* group, U32 &vertex_count, U32& index_count) { LLVolumeGeometryManager::addGeometryCount(group, vertex_count, index_count); } void addGeometryCount(LLSpatialGroup* group, U32 &vertex_count, U32& index_count) override { LLVolumeGeometryManager::addGeometryCount(group, vertex_count, index_count); }
}; };
//spatial bridge that uses volume geometry manager (implemented in LLVOVolume.cpp) //spatial bridge that uses volume geometry manager (implemented in LLVOVolume.cpp)
...@@ -662,10 +662,10 @@ class LLVolumeBridge : public LLSpatialBridge, public LLVolumeGeometryManager ...@@ -662,10 +662,10 @@ class LLVolumeBridge : public LLSpatialBridge, public LLVolumeGeometryManager
{ {
public: public:
LLVolumeBridge(LLDrawable* drawable, LLViewerRegion* regionp); LLVolumeBridge(LLDrawable* drawable, LLViewerRegion* regionp);
virtual void rebuildGeom(LLSpatialGroup* group) { LLVolumeGeometryManager::rebuildGeom(group); } virtual void rebuildGeom(LLSpatialGroup* group) final { LLVolumeGeometryManager::rebuildGeom(group); }
virtual void getGeometry(LLSpatialGroup* group) { LLVolumeGeometryManager::getGeometry(group); } virtual void getGeometry(LLSpatialGroup* group) final { LLVolumeGeometryManager::getGeometry(group); }
virtual void rebuildMesh(LLSpatialGroup* group) { LLVolumeGeometryManager::rebuildMesh(group); } virtual void rebuildMesh(LLSpatialGroup* group) final { LLVolumeGeometryManager::rebuildMesh(group); }
virtual void addGeometryCount(LLSpatialGroup* group, U32 &vertex_count, U32& index_count) { LLVolumeGeometryManager::addGeometryCount(group, vertex_count, index_count); } virtual void addGeometryCount(LLSpatialGroup* group, U32 &vertex_count, U32& index_count) final { LLVolumeGeometryManager::addGeometryCount(group, vertex_count, index_count); }
}; };
class LLHUDBridge final : public LLVolumeBridge class LLHUDBridge final : public LLVolumeBridge
...@@ -681,11 +681,11 @@ class LLBridgePartition : public LLSpatialPartition ...@@ -681,11 +681,11 @@ class LLBridgePartition : public LLSpatialPartition
{ {
public: public:
LLBridgePartition(LLViewerRegion* regionp); LLBridgePartition(LLViewerRegion* regionp);
virtual void getGeometry(LLSpatialGroup* group) { } virtual void getGeometry(LLSpatialGroup* group) final { }
virtual void addGeometryCount(LLSpatialGroup* group, U32 &vertex_count, U32& index_count) { } virtual void addGeometryCount(LLSpatialGroup* group, U32 &vertex_count, U32& index_count) final { }
}; };
class LLHUDPartition : public LLBridgePartition class LLHUDPartition final : public LLBridgePartition
{ {
public: public:
LLHUDPartition(LLViewerRegion* regionp); LLHUDPartition(LLViewerRegion* regionp);
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment