Fix imports from the recent refactoring change

src/entity/components/rendering.rs

@@ -1,4 +1,5 @@
-use crate::rendering::asset_graph::nodes::adt_node::{IRTexture, M2Node};
+use crate::rendering::asset_graph::nodes::adt_node::M2Node;
+use crate::rendering::rend3_backend::IRTexture;
 use rend3::types::ObjectHandle;
 use sargerust_files::m2::types::{M2TextureFlags, M2TextureType};
 use std::collections::HashSet;

src/entity/systems/display_id_resolver_system.rs

@@ -4,8 +4,9 @@ use crate::game::application::GameApplication;
 use crate::io::mpq::load_dbc;
 use crate::io::mpq::loader::MPQLoader;
 use crate::rendering::asset_graph::m2_generator::M2Generator;
-use crate::rendering::asset_graph::nodes::adt_node::{IRTexture, M2Node};
+use crate::rendering::asset_graph::nodes::adt_node::M2Node;
 use crate::rendering::asset_graph::resolver::Resolver;
+use crate::rendering::rend3_backend::IRTexture;
 use hecs::Without;
 use itertools::{Itertools, enumerate};
 use log::{info, warn};

src/game/map_manager.rs

@@ -15,13 +15,13 @@ use crate::io::common::loader::RawAssetLoader;
 use crate::io::mpq::loader::MPQLoader;
 use crate::rendering::asset_graph::m2_generator::M2Generator;
 use crate::rendering::asset_graph::nodes::adt_node::{
-    ADTNode, DoodadReference, IRObject, IRTexture, IRTextureReference, M2Node, TerrainTile, WMOGroupNode, WMONode,
-    WMOReference,
+    ADTNode, DoodadReference, IRObject, M2Node, TerrainTile, WMOGroupNode, WMONode, WMOReference,
 };
 use crate::rendering::asset_graph::resolver::Resolver;
 use crate::rendering::common::coordinate_systems;
 use crate::rendering::common::special_types::TerrainTextureLayerRend3;
 use crate::rendering::importer::adt_importer::ADTImporter;
+use crate::rendering::rend3_backend::{IRTexture, IRTextureReference};
 use crate::rendering::utils::{transform_for_doodad_ref, transform_for_wmo_ref};
 use sargerust_files::adt::reader::ADTReader;
 use sargerust_files::adt::types::ADTAsset;

src/physics/collider_factory.rs

@@ -1,11 +1,12 @@
 use crate::physics::physics_simulator::PhysicsSimulator;
 use crate::physics::terrain_tile_colliders::TerrainTileColliders;
 use crate::rendering::asset_graph::nodes::adt_node::{
-    ADTNode, DoodadReference, IRMesh, M2Node, NodeReference, TerrainTile, WMOGroupNode, WMONode, WMOReference,
+    ADTNode, DoodadReference, M2Node, NodeReference, TerrainTile, WMOGroupNode, WMONode, WMOReference,
 };
 use crate::rendering::common::coordinate_systems;
 use crate::rendering::common::mesh_merger::MeshMerger;
 use crate::rendering::common::types::Mesh;
+use crate::rendering::rend3_backend::IRMesh;
 use crate::util::weak_dashmap::WeakKeyDashMapPruneOnInsert;
 use glam::{Affine3A, Quat, Vec3};
 use itertools::Itertools;

src/rendering/application.rs

@@ -9,17 +9,17 @@ use winit::event::Event;
 
 use crate::game::application::GameApplication;
 use crate::rendering::asset_graph::m2_generator::M2Generator;
-use crate::rendering::asset_graph::nodes::adt_node::{
-    ADTNode, DoodadReference, IRM2Material, IRMaterial, IRTexture, IRTextureReference,
-};
+use crate::rendering::asset_graph::nodes::adt_node::{ADTNode, DoodadReference};
 use crate::rendering::asset_graph::resolver::Resolver;
 use crate::rendering::common::coordinate_systems;
 use crate::rendering::common::types::{AlbedoType, Material, TransparencyType};
 use crate::rendering::rend3_backend::material::terrain::terrain_material::TerrainMaterial;
 use crate::rendering::rend3_backend::material::terrain::terrain_routine::TerrainRoutine;
 use crate::rendering::rend3_backend::material::units::units_material::UnitsMaterial;
 use crate::rendering::rend3_backend::material::units::units_routine::UnitsRoutine;
-use crate::rendering::rend3_backend::{Rend3BackendConverter, gpu_loaders};
+use crate::rendering::rend3_backend::{
+    IRM2Material, IRMaterial, IRTexture, IRTextureReference, Rend3BackendConverter, gpu_loaders,
+};
 use glam::{Mat4, UVec2, Vec3A, Vec4};
 use itertools::Itertools;
 use log::{debug, trace, warn};

src/rendering/asset_graph/m2_generator.rs

@@ -1,10 +1,11 @@
 use crate::io::mpq::loader::MPQLoader;
-use crate::rendering::asset_graph::nodes::adt_node::{IRM2Material, IRMesh, IRTexture, M2Node, WMOGroupNode, WMONode};
+use crate::rendering::asset_graph::nodes::adt_node::{M2Node, WMOGroupNode, WMONode};
 use crate::rendering::asset_graph::resolver::GraphNodeGenerator;
 use crate::rendering::importer::wmo_importer::WMOGroupImporter;
 use crate::rendering::loader::blp_loader::BLPLoader;
 use crate::rendering::loader::m2_loader::M2Loader;
 use crate::rendering::loader::wmo_loader::WMOLoader;
+use crate::rendering::rend3_backend::{IRM2Material, IRMesh, IRTexture};
 use itertools::Itertools;
 use std::sync::{Arc, RwLock};
 

src/rendering/common/special_types.rs

@@ -1,4 +1,5 @@
-use crate::rendering::asset_graph::nodes::adt_node::{IRObject, IRTextureReference};
+use crate::rendering::asset_graph::nodes::adt_node::IRObject;
+use crate::rendering::rend3_backend::IRTextureReference;
 use rend3::types::Texture2DHandle;
 use std::sync::{Arc, RwLock};
 

src/rendering/loader/m2_loader.rs

@@ -2,10 +2,9 @@ use std::sync::Arc;
 
 use crate::io::common::loader::RawAssetLoader;
 use crate::io::mpq::loader::MPQLoader;
-use crate::rendering::asset_graph::nodes::adt_node::IRTextureReference;
 use crate::rendering::common::types::{Material, Mesh};
 use crate::rendering::importer::m2_importer::{M2Importer, M2Material};
-use crate::rendering::loader::blp_loader::BLPLoader;
+use crate::rendering::rend3_backend::IRTextureReference;
 use image_blp::BlpImage;
 use itertools::Itertools;
 use sargerust_files::m2::reader::M2Reader;

src/rendering/loader/wmo_loader.rs

@@ -1,10 +1,9 @@
 use crate::io::common::loader::RawAssetLoader;
 use crate::io::mpq::loader::MPQLoader;
-use crate::rendering::asset_graph::nodes::adt_node::{
-    DoodadReference, IRTextureReference, NodeReference, WMOGroupNode, WMONode,
-};
+use crate::rendering::asset_graph::nodes::adt_node::{DoodadReference, NodeReference, WMOGroupNode, WMONode};
 use crate::rendering::common::highlevel_types::PlaceableDoodad;
 use crate::rendering::common::types::{AlbedoType, Material, TransparencyType};
+use crate::rendering::rend3_backend::IRTextureReference;
 use glam::{Affine3A, Quat, Vec3, Vec4};
 use log::debug;
 use sargerust_files::wmo::reader::WMOReader;

src/rendering/rend3_backend/gpu_loaders.rs

@@ -1,5 +1,4 @@
-use crate::rendering::asset_graph::nodes::adt_node::{IRMaterial, IRMesh, IRTexture};
-use crate::rendering::rend3_backend::Rend3BackendConverter;
+use crate::rendering::rend3_backend::{IRMaterial, IRMesh, IRTexture, Rend3BackendConverter};
 use rend3::Renderer;
 use rend3::types::{MaterialHandle, MeshHandle, Texture2DHandle};
 use std::ops::DerefMut;