Various changes

This commit is contained in:
Wojtek Figat
2021-07-01 21:01:23 +02:00
parent d7332509f7
commit 2deac50c53
7 changed files with 180 additions and 394 deletions

View File

@@ -2,7 +2,6 @@
#pragma once
// Forward declarations
class Foliage;
class FoliageCluster;
class FoliageType;

View File

@@ -492,10 +492,8 @@ void Foliage::DrawCluster(RenderContext& renderContext, FoliageCluster* cluster,
// Draw visible children
if (cluster->Children[0])
{
#if BUILD_DEBUG
// Don't store instances in non-leaf nodes
ASSERT(cluster->Instances.IsEmpty());
#endif
ASSERT_LOW_LAYER(cluster->Instances.IsEmpty());
#define DRAW_CLUSTER(idx) \
if (renderContext.View.CullingFrustum.Intersects(cluster->Children[idx]->TotalBounds)) \

View File

@@ -64,7 +64,6 @@ public:
/// <summary>
/// Determines whether this foliage instance has valid lightmap data.
/// </summary>
/// <returns><c>true</c> if this foliage instance has valid lightmap data; otherwise, <c>false</c>.</returns>
FORCE_INLINE bool HasLightmap() const
{
return Lightmap.TextureIndex != INVALID_INDEX;

View File

@@ -206,7 +206,6 @@ public:
/// <summary>
/// Determines whether this instance is ready (model is loaded).
/// </summary>
/// <returns><c>true</c> if foliage type model is loaded and instance type is ready; otherwise, <c>false</c>.</returns>
FORCE_INLINE bool IsReady() const
{
return _isReady != 0;
@@ -215,7 +214,6 @@ public:
/// <summary>
/// Gets the random scale for the foliage instance of this type.
/// </summary>
/// <returns>The scale vector.</returns>
Vector3 GetRandomScale() const;
private: