Merge pull request #102 from nathanaelneveux/fix/issue-85-single-texture-layer

Fix single-layer voxel texture arrays

Author: splashdust

src/plugin.rs

@@ -8,7 +8,7 @@ use bevy::{
 use crate::{
     configuration::{DefaultWorld, VoxelWorldConfig},
     voxel_material::{
-        prepare_texture, set_repeat_sampler, LoadingTexture, StandardVoxelMaterial,
+        prepare_texture, prepare_voxel_texture, LoadingTexture, StandardVoxelMaterial,
         TextureLayers, VOXEL_TEXTURE_SHADER_HANDLE,
     },
     voxel_world::*,
@@ -178,8 +178,9 @@ where
                         RenderAssetUsages::default(),
                     )
                     .unwrap();
-                    set_repeat_sampler(&mut image);
-                    let _ = image.reinterpret_stacked_2d_as_array(4);
+                    prepare_voxel_texture(&mut image, 4).expect(
+                        "default voxel texture should be a valid 4-layer array texture",
+                    );
                     let mut image_assets =
                         app.world_mut().resource_mut::<Assets<Image>>();
                     image_assets.add(image)

src/voxel_material.rs

@@ -1,12 +1,13 @@
-use bevy::image::ImageAddressMode;
+use bevy::image::{ImageAddressMode, TextureReinterpretationError};
 use bevy::{
     asset::uuid_handle,
     mesh::{MeshVertexAttribute, MeshVertexBufferLayoutRef, VertexAttributeDescriptor},
     pbr::{MaterialExtension, MaterialExtensionKey, MaterialExtensionPipeline},
     prelude::*,
     reflect::TypePath,
     render::render_resource::{
-        AsBindGroup, RenderPipelineDescriptor, SpecializedMeshPipelineError, VertexFormat,
+        AsBindGroup, RenderPipelineDescriptor, SpecializedMeshPipelineError,
+        TextureViewDescriptor, TextureViewDimension, VertexFormat,
     },
 };
 use bevy_shader::{Shader, ShaderDefVal, ShaderRef};
@@ -96,11 +97,27 @@ pub(crate) fn prepare_texture(
     {
         return;
     }
-    loading_texture.is_loaded = true;
 
     let image = images.get_mut(&loading_texture.handle).unwrap();
+    if let Err(err) = prepare_voxel_texture(image, texture_layers.0) {
+        warn_once!("Failed to prepare voxel texture as a texture array: {err}");
+    }
+
+    loading_texture.is_loaded = true;
+}
+
+pub(crate) fn prepare_voxel_texture(
+    image: &mut Image,
+    texture_layers: u32,
+) -> Result<(), TextureReinterpretationError> {
     set_repeat_sampler(image);
-    let _ = image.reinterpret_stacked_2d_as_array(texture_layers.0);
+    image.reinterpret_stacked_2d_as_array(texture_layers)?;
+    image.texture_view_descriptor = Some(TextureViewDescriptor {
+        dimension: Some(TextureViewDimension::D2Array),
+        ..default()
+    });
+
+    Ok(())
 }
 
 pub(crate) fn set_repeat_sampler(image: &mut Image) {