Archives/learn-wgpu
2
0
Fork 0
mirror of https://github.com/sotrh/learn-wgpu.git synced 2024-11-11 19:10:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix indentation

Browse Source 
In beginner chapter 9 'Model Loading', the `fn format_url(...)` line was
unnecessarily indented.  This PR also makes some minor reformatting
(presumably caused by changes to `rustfmt`).
This commit is contained in:
Kneasle 2022-04-14 16:30:19 +01:00
parent e514011384
commit 964ad9307b
5 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
code/beginner/tutorial9-models/src/resources.rs
View File

@ -6,14 +6,15 @@ use wgpu::util::DeviceExt;
use crate::{model, texture};
#[cfg(target_arch = "wasm32")]
fn format_url(file_name: &str) -> reqwest::Url {
fn format_url(file_name: &str) -> reqwest::Url {
let window = web_sys::window().unwrap();
let location = window.location();
let base = reqwest::Url::parse(&format!(
"{}/{}/",
location.origin().unwrap(),
option_env!("RES_PATH").unwrap_or("res"),
)).unwrap();
))
.unwrap();
base.join(file_name).unwrap()
}

2
code/intermediate/tutorial10-lighting/src/resources.rs
View File

@ -6,7 +6,7 @@ use wgpu::util::DeviceExt;
use crate::{model, texture};
#[cfg(target_arch = "wasm32")]
fn format_url(file_name: &str) -> reqwest::Url {
fn format_url(file_name: &str) -> reqwest::Url {
let window = web_sys::window().unwrap();
let location = window.location();
let base = reqwest::Url::parse(&format!(

5
code/intermediate/tutorial11-normals/src/resources.rs
View File

@ -6,14 +6,15 @@ use wgpu::util::DeviceExt;
use crate::{model, texture};
#[cfg(target_arch = "wasm32")]
fn format_url(file_name: &str) -> reqwest::Url {
fn format_url(file_name: &str) -> reqwest::Url {
let window = web_sys::window().unwrap();
let location = window.location();
let base = reqwest::Url::parse(&format!(
"{}/{}/",
location.origin().unwrap(),
option_env!("RES_PATH").unwrap_or("res"),
)).unwrap();
))
.unwrap();
base.join(file_name).unwrap()
}

2
code/intermediate/tutorial12-camera/src/resources.rs
View File

@ -6,7 +6,7 @@ use wgpu::util::DeviceExt;
use crate::{model, texture};
#[cfg(target_arch = "wasm32")]
fn format_url(file_name: &str) -> reqwest::Url {
fn format_url(file_name: &str) -> reqwest::Url {
let window = web_sys::window().unwrap();
let location = window.location();
let base = reqwest::Url::parse(&format!(

2
docs/beginner/tutorial9-models/README.md
View File

@ -142,7 +142,7 @@ use wgpu::util::DeviceExt;
use crate::{model, texture};
#[cfg(target_arch = "wasm32")]
fn format_url(file_name: &str) -> reqwest::Url {
fn format_url(file_name: &str) -> reqwest::Url {
let window = web_sys::window().unwrap();
let location = window.location();
let base = reqwest::Url::parse(&format!(