Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix typo, move shaders back out of subfolders

Browse Source
This commit is contained in:
Imbris 2019-08-15 16:38:13 -04:00
parent d99a4f8d39
commit d89fff1499
11 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
assets/voxygen/shaders/figure/frag.glsl → assets/voxygen/shaders/figure-frag.glsl
View File

0
assets/voxygen/shaders/figure/vert.glsl → assets/voxygen/shaders/figure-vert.glsl
View File

0
assets/voxygen/shaders/postprocess/frag.glsl → assets/voxygen/shaders/postprocess-frag.glsl
View File

0
assets/voxygen/shaders/postprocess/vert.glsl → assets/voxygen/shaders/postprocess-vert.glsl
View File

0
assets/voxygen/shaders/skybox/frag.glsl → assets/voxygen/shaders/skybox-frag.glsl
View File

0
assets/voxygen/shaders/skybox/vert.glsl → assets/voxygen/shaders/skybox-vert.glsl
View File

0
assets/voxygen/shaders/terrain/frag.glsl → assets/voxygen/shaders/terrain-frag.glsl
View File

0
assets/voxygen/shaders/terrain/vert.glsl → assets/voxygen/shaders/terrain-vert.glsl
View File

0
assets/voxygen/shaders/ui/frag.glsl → assets/voxygen/shaders/ui-frag.glsl
View File

0
assets/voxygen/shaders/ui/vert.glsl → assets/voxygen/shaders/ui-vert.glsl
View File

22
voxygen/src/render/renderer.rs
View File

@ -453,7 +453,7 @@ struct GfxPipeline<P: gfx::pso::PipelineInit> {
pso: gfx::pso::PipelineState<gfx_backend::Resources, P::Meta>, pso: gfx::pso::PipelineState<gfx_backend::Resources, P::Meta>,
} }
/// Create new the pipelines used by the renderer. /// Creates all the pipelines used to render.
fn create_pipelines( fn create_pipelines(
factory: &mut gfx_backend::Factory, factory: &mut gfx_backend::Factory,
shader_reload_indicator: &mut ReloadIndicator, shader_reload_indicator: &mut ReloadIndicator,
@ -490,9 +490,9 @@ fn create_pipelines(
let skybox_pipeline = create_pipeline( let skybox_pipeline = create_pipeline(
factory, factory,
skybox::pipe::new(), skybox::pipe::new(),
&assets::load_watched::<String>("voxygen.shaders.skybox.vert", shader_reload_indicator) &assets::load_watched::<String>("voxygen.shaders.skybox-vert", shader_reload_indicator)
.unwrap(), .unwrap(),
&assets::load_watched::<String>("voxygen.shaders.skybox.frag", shader_reload_indicator) &assets::load_watched::<String>("voxygen.shaders.skybox-frag", shader_reload_indicator)
.unwrap(), .unwrap(),
&include_ctx, &include_ctx,
)?; )?;
@ -501,9 +501,9 @@ fn create_pipelines(
let figure_pipeline = create_pipeline( let figure_pipeline = create_pipeline(
factory, factory,
figure::pipe::new(), figure::pipe::new(),
&assets::load_watched::<String>("voxygen.shaders.figure.vert", shader_reload_indicator) &assets::load_watched::<String>("voxygen.shaders.figure-vert", shader_reload_indicator)
.unwrap(), .unwrap(),
&assets::load_watched::<String>("voxygen.shaders.figure.frag", shader_reload_indicator) &assets::load_watched::<String>("voxygen.shaders.figure-frag", shader_reload_indicator)
.unwrap(), .unwrap(),
&include_ctx, &include_ctx,
)?; )?;
@ -512,9 +512,9 @@ fn create_pipelines(
let terrain_pipeline = create_pipeline( let terrain_pipeline = create_pipeline(
factory, factory,
terrain::pipe::new(), terrain::pipe::new(),
&assets::load_watched::<String>("voxygen.shaders.terrain.vert", shader_reload_indicator) &assets::load_watched::<String>("voxygen.shaders.terrain-vert", shader_reload_indicator)
.unwrap(), .unwrap(),
&assets::load_watched::<String>("voxygen.shaders.terrain.frag", shader_reload_indicator) &assets::load_watched::<String>("voxygen.shaders.terrain-frag", shader_reload_indicator)
.unwrap(), .unwrap(),
&include_ctx, &include_ctx,
)?; )?;
@ -523,9 +523,9 @@ fn create_pipelines(
let ui_pipeline = create_pipeline( let ui_pipeline = create_pipeline(
factory, factory,
ui::pipe::new(), ui::pipe::new(),
&assets::load_watched::<String>("voxygen.shaders.ui.vert", shader_reload_indicator) &assets::load_watched::<String>("voxygen.shaders.ui-vert", shader_reload_indicator)
.unwrap(), .unwrap(),
&assets::load_watched::<String>("voxygen.shaders.ui.frag", shader_reload_indicator) &assets::load_watched::<String>("voxygen.shaders.ui-frag", shader_reload_indicator)
.unwrap(), .unwrap(),
&include_ctx, &include_ctx,
)?; )?;
@ -535,12 +535,12 @@ fn create_pipelines(
factory, factory,
postprocess::pipe::new(), postprocess::pipe::new(),
&assets::load_watched::<String>( &assets::load_watched::<String>(
"voxygen.shaders.postprocess.vert", "voxygen.shaders.postprocess-vert",
shader_reload_indicator, shader_reload_indicator,
) )
.unwrap(), .unwrap(),
&assets::load_watched::<String>( &assets::load_watched::<String>(
"voxygen.shaders.postprocess.frag", "voxygen.shaders.postprocess-frag",
shader_reload_indicator, shader_reload_indicator,
) )
.unwrap(), .unwrap(),