Skip to content

Commit

Permalink
Revert "Fix Extracted* not being cleared"
Browse files Browse the repository at this point in the history
This reverts commit e131640.

This fixed the performance regression, but broke other stuff. It
doesn't make sense for an entity to be both SyncToRenderWorld and
TemporaryRenderEntity.
  • Loading branch information
rparrett committed Dec 5, 2024
1 parent e7dc0e7 commit fef88f1
Showing 1 changed file with 1 addition and 8 deletions.
9 changes: 1 addition & 8 deletions src/render/extract.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ use bevy::math::Affine3A;
use bevy::render::primitives::{Aabb, Frustum};
use bevy::render::render_resource::FilterMode;
use bevy::render::render_resource::TextureFormat;
use bevy::render::sync_world::{RenderEntity, TemporaryRenderEntity};
use bevy::render::sync_world::RenderEntity;
use bevy::{prelude::*, render::Extract, utils::HashMap};

use crate::prelude::TilemapGridSize;
Expand Down Expand Up @@ -33,7 +33,6 @@ pub struct ExtractedTile {
#[derive(Bundle)]
pub struct ExtractedTileBundle {
tile: ExtractedTile,
temporary: TemporaryRenderEntity,
}

#[derive(Bundle)]
Expand All @@ -49,7 +48,6 @@ pub struct ExtractedTilemapBundle {
visibility: InheritedVisibility,
frustum_culling: FrustumCulling,
render_settings: TilemapRenderSettings,
temporary: TemporaryRenderEntity,
}

#[derive(Component)]
Expand All @@ -62,7 +60,6 @@ pub(crate) struct ExtractedTilemapTexture {
pub texture: TilemapTexture,
pub filtering: FilterMode,
pub format: TextureFormat,
pub temporary: TemporaryRenderEntity,
}

impl ExtractedTilemapTexture {
Expand Down Expand Up @@ -143,7 +140,6 @@ impl ExtractedTilemapTexture {
tile_count,
texture_size,
format,
temporary: TemporaryRenderEntity,
}
}
}
Expand Down Expand Up @@ -287,7 +283,6 @@ pub fn extract(
visibility: *data.8,
frustum_culling: *data.9,
render_settings: *data.10,
temporary: TemporaryRenderEntity,
},
),
);
Expand All @@ -302,7 +297,6 @@ pub fn extract(
tile,
tilemap_id: TilemapId(data.0.id()),
},
temporary: TemporaryRenderEntity,
},
));
}
Expand All @@ -325,7 +319,6 @@ pub fn extract(
visibility: *data.8,
frustum_culling: *data.9,
render_settings: *data.10,
temporary: TemporaryRenderEntity,
},
),
);
Expand Down

0 comments on commit fef88f1

Please sign in to comment.