fancy text

src/vulkan/dds.rs

@@ -1,6 +1,6 @@
 use std::{convert::TryInto, io::Read};
 
-use vulkano::{format::Format, sampler::Filter};
+use vulkano::{format::Format, sampler::{Filter, SamplerAddressMode}};
 
 use super::VulkanRenderer;
 
@@ -26,14 +26,14 @@ pub fn upload_texture_from_file(path: &str, renderer: &mut VulkanRenderer) -> Re
 
     if is_dxt1
     {
-        renderer.upload_texture(&tex_bytes[128..], tex_width, tex_height, Format::BC1_RGBUnormBlock, Filter::Linear, renderer.device.clone());
+        renderer.upload_texture(&tex_bytes[128..], tex_width, tex_height, Format::BC1_RGBUnormBlock, Filter::Linear, SamplerAddressMode::Repeat, renderer.device.clone());
     }
     if is_dx10
     {
         let dxgi_type = u32::from_ne_bytes(tex_bytes[128..132].try_into()?);
         assert!(dxgi_type == 83); // BC5 Unorm Typeless
         
-        renderer.upload_texture(&tex_bytes[128+20..], tex_width, tex_height, Format::BC5UnormBlock, Filter::Linear, renderer.device.clone());
+        renderer.upload_texture(&tex_bytes[128+20..], tex_width, tex_height, Format::BC5UnormBlock, Filter::Linear, SamplerAddressMode::Repeat, renderer.device.clone());
     }
 
     Ok(())

src/vulkan/mod.rs

@@ -65,9 +65,12 @@ vulkano::impl_vertex!(LinePoint, position);
 pub struct TextVertex {
     pub position: [f32; 3],
     pub uv: [f32; 2],
-    pub normal: [f32; 3],
 }
-vulkano::impl_vertex!(TextVertex, position, uv, normal);
+vulkano::impl_vertex!(TextVertex, position, uv);
+
+#[derive(Default, Debug, Clone)]
+pub struct TextInstanceData {}
+vulkano::impl_vertex!(TextInstanceData);
 
 pub trait Game {
     /// Returns true if event should be ignored by the vulkan handler
@@ -271,6 +274,7 @@ impl VulkanRenderer {
         let uniform_buffer = vs::ty::ObjectUniformData {
             view: Matrix4::identity().into(),
             projection: Matrix4::identity().into(),
+            ortho_projection: Matrix4::identity().into(),
             time: 0.0,
             light_position: [0.0, 0.0, 0.0],
             light_directional_rotation: [0.0, 0.0, 0.0],
@@ -448,6 +452,7 @@ impl VulkanRenderer {
                     CPUVertex::Vertex3D(_) => None,
                     CPUVertex::VertexText(vert) => Some(vert)
                 }).collect();
+                
                 let vertex_buffer = CpuAccessibleBuffer::from_iter(self.device.clone(), BufferUsage::vertex_buffer(), false, verts.into_iter()).unwrap();
                 self.game_data.meshes_text.push(Mesh { vertex_buffer, index_buffer, original_path });
                 self.game_data.meshes_text.len() - 1
@@ -455,7 +460,7 @@ impl VulkanRenderer {
         }
     }
 
-    pub fn upload_texture(self: &mut Self, bytes: &[u8], width: u32, height: u32, format: Format, filter: Filter, device: Arc<Device>) {
+    pub fn upload_texture(self: &mut Self, bytes: &[u8], width: u32, height: u32, format: Format, filter: Filter, wrap: SamplerAddressMode, device: Arc<Device>) {
         let dimensions = Dimensions::Dim2d { width, height };
 
         let usage = ImageUsage {
@@ -540,8 +545,8 @@ impl VulkanRenderer {
         future.flush().unwrap();
 
         let sampler = Sampler::new(device.clone(), filter, filter,
-            MipmapMode::Linear, SamplerAddressMode::Repeat, SamplerAddressMode::Repeat,
-            SamplerAddressMode::Repeat, 0.0, 1.0, 0.0, (image_view.mipmap_levels() - 1) as f32).unwrap();
+            MipmapMode::Linear, wrap, wrap, wrap,
+            0.0, 1.0, 0.0, (image_view.mipmap_levels() - 1) as f32).unwrap();
 
         self.game_data.textures.push(Texture { image: image_view, sampler });
     }

src/vulkan/pipelines.rs

@@ -1,6 +1,6 @@
 use std::{convert::TryInto, io::{self, ErrorKind, Read, Write}, path::PathBuf, sync::Arc};
 
-use vulkano::{command_buffer::AutoCommandBufferBuilder, descriptor::{descriptor::ShaderStages, descriptor_set::PersistentDescriptorSet}, pipeline::shader::{ShaderModule}};
+use vulkano::{command_buffer::AutoCommandBufferBuilder, descriptor::{descriptor::ShaderStages, descriptor_set::PersistentDescriptorSet}, pipeline::{shader::{ShaderModule}}};
 use vulkano::command_buffer::DynamicState;
 use vulkano::device::Device;
 use vulkano::framebuffer::RenderPassAbstract;
@@ -9,7 +9,7 @@ use vulkano::pipeline::GraphicsPipeline;
 use vulkano::pipeline::GraphicsPipelineAbstract;
 use vulkano::pipeline::shader::GraphicsShaderType;
 
-use crate::{GameObject, vulkan::TextVertex};
+use crate::{GameObject, vulkan::{TextVertex}};
 use crate::vulkan::{LinePoint, Vertex};
 use crate::vulkan::GameData;
 use crate::VulkanRenderer;
@@ -230,7 +230,7 @@ impl LineShader {
 }
 
 impl Drawcall for LineShader {
-    fn draw(self: &Self, builder: &mut AutoCommandBufferBuilder, _fb_index: usize, game_objects: Vec<&GameObject>, game_data: &GameData, dynamic_state: &DynamicState) {
+    fn draw(self: &Self, builder: &mut AutoCommandBufferBuilder, _fb_index: usize, _game_objects: Vec<&GameObject>, game_data: &GameData, dynamic_state: &DynamicState) {
         builder.draw(self.pipeline.clone(),
             &dynamic_state,
             vec![self.vertex_buffer.clone()],
@@ -302,7 +302,7 @@ impl TextShader {
                 ..ShaderStages::none()
             });
             let vs_entry = vs_module.graphics_entry_point(entry_name_c, vs_text::MainInput, vs_text::MainOutput, vs_layout, GraphicsShaderType::Vertex);
-        
+
             let gp = Arc::new(GraphicsPipeline::start()
                 .vertex_input_single_buffer::<TextVertex>()
                 .vertex_shader(vs_entry, ())
@@ -311,7 +311,7 @@ impl TextShader {
                 .depth_stencil_simple_depth()
                 .fragment_shader(fs_entry, ())
                 .blend_alpha_blending()
-                .cull_mode_back()
+                .cull_mode_disabled()
                 .render_pass(sub_pass.clone())
                 .build(device.clone())
                 .unwrap());