Add generated textures to repo for now
This commit is contained in:
parent
869598dc98
commit
9259003354
6 changed files with 32 additions and 7 deletions
11
.gitignore
vendored
11
.gitignore
vendored
|
@ -4,7 +4,16 @@
|
|||
/flamegraph.svg
|
||||
/perf.data*
|
||||
/chunks/
|
||||
/assets
|
||||
|
||||
/assets/*
|
||||
!/assets/grass_block_*.png
|
||||
!/assets/font
|
||||
|
||||
/assets/font/*
|
||||
!/assets/font/ascii_shadow.png
|
||||
|
||||
/release/
|
||||
|
||||
|
||||
profile.txt
|
||||
callgrind.out.*
|
||||
|
|
BIN
assets/font/ascii_shadow.png
(Stored with Git LFS)
Normal file
BIN
assets/font/ascii_shadow.png
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/grass_block_side_plains.png
(Stored with Git LFS)
Normal file
BIN
assets/grass_block_side_plains.png
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/grass_block_top_plains.png
(Stored with Git LFS)
Normal file
BIN
assets/grass_block_top_plains.png
(Stored with Git LFS)
Normal file
Binary file not shown.
|
@ -1,5 +1,7 @@
|
|||
use std::convert::TryInto;
|
||||
|
||||
use anyhow::Context;
|
||||
|
||||
use crate::{
|
||||
geometry::Geometry, geometry_buffers::GeometryBuffers, render_context::RenderContext,
|
||||
texture::Texture, vertex::HudVertex,
|
||||
|
@ -27,8 +29,10 @@ pub struct TextRenderer {
|
|||
|
||||
impl TextRenderer {
|
||||
pub fn new(render_context: &RenderContext) -> anyhow::Result<Self> {
|
||||
let bytes = std::fs::read("assets/font/ascii_shadow.png")?;
|
||||
let texture = Texture::from_bytes(render_context, &bytes, "font")?;
|
||||
let bytes = std::fs::read("assets/font/ascii_shadow.png")
|
||||
.context("Failed to load assets/font/ascii_shadow.png")?;
|
||||
let texture = Texture::from_bytes(render_context, &bytes, "font")
|
||||
.context("Failed to decode assets/font/ascii_shadow.png")?;
|
||||
|
||||
let sampler = render_context
|
||||
.device
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
use std::{num::NonZeroU32, ops::Range};
|
||||
|
||||
use anyhow::Context;
|
||||
use cgmath::{Vector2, Zero};
|
||||
use image::{EncodableLayout, ImageBuffer, Rgba};
|
||||
use wgpu::Origin3d;
|
||||
|
@ -317,8 +318,9 @@ impl TextureManager {
|
|||
}
|
||||
|
||||
pub fn load(&mut self, render_context: &RenderContext, path: &str) -> anyhow::Result<usize> {
|
||||
let bytes = std::fs::read(path)?;
|
||||
let texture = Texture::from_bytes(render_context, &bytes, path)?;
|
||||
let bytes = std::fs::read(path).context(format!("Failed to load {}", path))?;
|
||||
let texture = Texture::from_bytes(render_context, &bytes, path)
|
||||
.context(format!("Failed to decode {}", path))?;
|
||||
|
||||
let id = self.textures.len();
|
||||
self.textures.push(texture);
|
||||
|
@ -333,8 +335,9 @@ impl TextureManager {
|
|||
path: &str,
|
||||
tile_size: Vector2<u32>,
|
||||
) -> anyhow::Result<Range<usize>> {
|
||||
let bytes = std::fs::read(path)?;
|
||||
let mut textures = Texture::from_bytes_atlas(render_context, &bytes, tile_size, path)?;
|
||||
let bytes = std::fs::read(path).context(format!("Failed to load {}", path))?;
|
||||
let mut textures = Texture::from_bytes_atlas(render_context, &bytes, tile_size, path)
|
||||
.context(format!("Failed to decode {}", path))?;
|
||||
|
||||
let start = self.textures.len();
|
||||
self.textures.append(&mut textures);
|
||||
|
|
Loading…
Reference in a new issue