@@ -77,7 +77,6 @@ fn add_chunk_objects(
77
77
texture_manager : & terrain_util:: TextureManager ,
78
78
) {
79
79
if let Some ( mesh) = create_chunk_mesh ( chunk, texture_manager) {
80
- texture_handle =
81
80
let texture_handle = obtain_texture_handle ( & asset_server) . clone ( ) ;
82
81
let material = create_chunk_material ( texture_handle, & mut ResMut :: reborrow ( materials) ) ;
83
82
spawn_chunk ( commands, & mut ResMut :: reborrow ( meshes) , material, mesh, chunk) ;
@@ -138,94 +137,3 @@ fn spawn_chunk(
138
137
} ,
139
138
) ) ;
140
139
}
141
-
142
- #[ cfg( test) ]
143
- mod tests {
144
- // use super::*;
145
- // use bevy::asset::AssetPlugin;
146
- // fn setup_app() -> App {
147
- // let mut app = App::new();
148
- // app.add_plugins(MinimalPlugins)
149
- // .add_plugins(AssetPlugin::default());
150
- // app
151
- // }
152
- //
153
- // #[test]
154
- // fn test_setup_world_system() {
155
- // let mut app = setup_app();
156
- //
157
- // app.insert_resource(terrain_resources::ChunkManager::new());
158
- // app.insert_resource(terrain_util::TextureManager::new());
159
- // app.insert_resource(AssetServer::new(AssetSources {sources: std::collections::HashMap:<'static>::new(), }, AssetServerMode::Processed, false));
160
- //
161
- // app.add_systems(Startup, setup_world_system);
162
- // app.update();
163
- //
164
- // let mut chunk_manager = app.world.get_resource_mut::<terrain_resources::ChunkManager>().unwrap();
165
- // let chunk = chunk_manager.get_chunk(Vec3 { x: 0.0, y: 0.0, z: 0.0});
166
- //
167
- // assert!(chunk.is_some());
168
- // }
169
- use super :: * ;
170
- use bevy:: asset:: AssetPlugin ;
171
-
172
- fn setup_app ( ) -> App {
173
- let mut app = App :: new ( ) ;
174
- app
175
- . add_plugins ( MinimalPlugins )
176
- . add_plugins ( AssetPlugin :: default ( ) ) ;
177
- app
178
- }
179
-
180
- #[ test]
181
- fn test_create_chunk_material ( ) {
182
- let app = setup_app ( ) ;
183
- let mut world = app. world ;
184
-
185
- world. insert_resource ( Assets :: < StandardMaterial > :: default ( ) ) ;
186
-
187
- let asset_server = world. get_resource_ref :: < AssetServer > ( ) . unwrap ( ) ;
188
-
189
- let texture_handle = obtain_texture_handle ( & asset_server) . clone ( ) ;
190
-
191
- let mut materials = world. get_resource_mut :: < Assets < StandardMaterial > > ( ) . unwrap ( ) ;
192
-
193
- let material = create_chunk_material ( texture_handle, & mut materials) ;
194
- assert ! ( materials. get( & material) . is_some( ) ) ;
195
- }
196
-
197
-
198
- #[ test]
199
- fn test_spawn_chunk ( ) {
200
- let mut app = setup_app ( ) ;
201
- let world = & mut app. world ;
202
- let mut command_queue = CommandQueue :: default ( ) ;
203
- let mut commands = Commands :: new ( & mut command_queue, world) ;
204
-
205
- world. insert_resource ( Assets :: < StandardMaterial > :: default ( ) ) ;
206
- world. insert_resource ( Assets :: < Mesh > :: default ( ) ) ;
207
-
208
- let asset_server = world. get_resource_ref :: < AssetServer > ( ) . unwrap ( ) ;
209
- let mut materials = world. get_resource_mut :: < Assets < StandardMaterial > > ( ) . unwrap ( ) ;
210
- let mut meshes = world. get_resource_mut :: < Assets < Mesh > > ( ) . unwrap ( ) ;
211
-
212
- let chunk = terrain_util:: Chunk :: default ( ) ;
213
- let mesh = create_chunk_mesh ( & chunk, & terrain_util:: TextureManager :: default ( ) ) . unwrap ( ) ;
214
-
215
- let texture_handle = obtain_texture_handle ( & asset_server) . clone ( ) ;
216
-
217
- let material = create_chunk_material ( texture_handle, & mut materials) ;
218
-
219
- spawn_chunk ( & mut commands, & mut meshes, material, mesh, & chunk) ;
220
-
221
- command_queue. apply ( world) ;
222
-
223
- let mut query = world. query :: < & terrain_components:: ChunkMesh > ( ) ;
224
- assert_eq ! ( query. iter( world) . count( ) , 1 ) ;
225
- }
226
-
227
- #[ test]
228
- fn test_setup_world_system ( ) {
229
-
230
- }
231
- }
0 commit comments