From dbf880d011fdb8e4b1e29768a8cdd2cfb4e1267f Mon Sep 17 00:00:00 2001 From: Patrick Walton Date: Fri, 8 Feb 2019 14:53:20 -0800 Subject: [PATCH] Rename `demo3` to `demo` --- Cargo.lock | 9 +-------- Cargo.toml | 2 +- {demo3 => demo}/Cargo.toml | 2 +- {demo3 => demo}/resources/debug-font.json | 0 {demo3 => demo}/resources/textures/area-lut.png | Bin {demo3 => demo}/resources/textures/debug-font.png | Bin {demo3 => demo}/resources/textures/demo-effects.png | Bin {demo3 => demo}/resources/textures/demo-open.png | Bin {demo3 => demo}/resources/textures/gamma-lut.png | Bin {demo3 => demo}/shaders/debug_solid.fs.glsl | 2 +- {demo3 => demo}/shaders/debug_solid.vs.glsl | 2 +- {demo3 => demo}/shaders/debug_texture.fs.glsl | 2 +- {demo3 => demo}/shaders/debug_texture.vs.glsl | 2 +- {demo3 => demo}/shaders/fill.fs.glsl | 0 {demo3 => demo}/shaders/fill.vs.glsl | 2 +- {demo3 => demo}/shaders/mask_tile.fs.glsl | 2 +- {demo3 => demo}/shaders/mask_tile.vs.glsl | 2 +- {demo3 => demo}/shaders/post.fs.glsl | 2 +- {demo3 => demo}/shaders/post.vs.glsl | 2 +- {demo3 => demo}/shaders/solid_tile.fs.glsl | 0 {demo3 => demo}/shaders/solid_tile.vs.glsl | 2 +- {demo3 => demo}/src/main.rs | 2 +- gl/src/device.rs | 2 +- 23 files changed, 15 insertions(+), 22 deletions(-) rename {demo3 => demo}/Cargo.toml (96%) rename {demo3 => demo}/resources/debug-font.json (100%) rename {demo3 => demo}/resources/textures/area-lut.png (100%) rename {demo3 => demo}/resources/textures/debug-font.png (100%) rename {demo3 => demo}/resources/textures/demo-effects.png (100%) rename {demo3 => demo}/resources/textures/demo-open.png (100%) rename {demo3 => demo}/resources/textures/gamma-lut.png (100%) rename {demo3 => demo}/shaders/debug_solid.fs.glsl (91%) rename {demo3 => demo}/shaders/debug_solid.vs.glsl (92%) rename {demo3 => demo}/shaders/debug_texture.fs.glsl (92%) rename {demo3 => demo}/shaders/debug_texture.vs.glsl (93%) rename {demo3 => demo}/shaders/fill.fs.glsl (100%) rename {demo3 => demo}/shaders/fill.vs.glsl (97%) rename {demo3 => demo}/shaders/mask_tile.fs.glsl (92%) rename {demo3 => demo}/shaders/mask_tile.vs.glsl (97%) rename {demo3 => demo}/shaders/post.fs.glsl (98%) rename {demo3 => demo}/shaders/post.vs.glsl (92%) rename {demo3 => demo}/shaders/solid_tile.fs.glsl (100%) rename {demo3 => demo}/shaders/solid_tile.vs.glsl (95%) rename {demo3 => demo}/src/main.rs (99%) diff --git a/Cargo.lock b/Cargo.lock index 674fc365..f247a646 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -156,7 +156,7 @@ dependencies = [ ] [[package]] -name = "demo3" +name = "demo" version = "0.1.0" dependencies = [ "clap 2.32.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -522,13 +522,6 @@ dependencies = [ "smallvec 0.6.8 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "pathfinder_gfx_utils" -version = "0.2.0" -dependencies = [ - "euclid 0.19.4 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "pathfinder_gl" version = "0.1.0" diff --git a/Cargo.toml b/Cargo.toml index ef26daf5..36151ed8 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [workspace] members = [ - "demo3", + "demo", "geometry", "gl", "renderer", diff --git a/demo3/Cargo.toml b/demo/Cargo.toml similarity index 96% rename from demo3/Cargo.toml rename to demo/Cargo.toml index 72cc9e07..a5bf91f2 100644 --- a/demo3/Cargo.toml +++ b/demo/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "demo3" +name = "demo" version = "0.1.0" edition = "2018" authors = ["Patrick Walton "] diff --git a/demo3/resources/debug-font.json b/demo/resources/debug-font.json similarity index 100% rename from demo3/resources/debug-font.json rename to demo/resources/debug-font.json diff --git a/demo3/resources/textures/area-lut.png b/demo/resources/textures/area-lut.png similarity index 100% rename from demo3/resources/textures/area-lut.png rename to demo/resources/textures/area-lut.png diff --git a/demo3/resources/textures/debug-font.png b/demo/resources/textures/debug-font.png similarity index 100% rename from demo3/resources/textures/debug-font.png rename to demo/resources/textures/debug-font.png diff --git a/demo3/resources/textures/demo-effects.png b/demo/resources/textures/demo-effects.png similarity index 100% rename from demo3/resources/textures/demo-effects.png rename to demo/resources/textures/demo-effects.png diff --git a/demo3/resources/textures/demo-open.png b/demo/resources/textures/demo-open.png similarity index 100% rename from demo3/resources/textures/demo-open.png rename to demo/resources/textures/demo-open.png diff --git a/demo3/resources/textures/gamma-lut.png b/demo/resources/textures/gamma-lut.png similarity index 100% rename from demo3/resources/textures/gamma-lut.png rename to demo/resources/textures/gamma-lut.png diff --git a/demo3/shaders/debug_solid.fs.glsl b/demo/shaders/debug_solid.fs.glsl similarity index 91% rename from demo3/shaders/debug_solid.fs.glsl rename to demo/shaders/debug_solid.fs.glsl index b228301f..0ad312fc 100644 --- a/demo3/shaders/debug_solid.fs.glsl +++ b/demo/shaders/debug_solid.fs.glsl @@ -1,6 +1,6 @@ #version 330 -// pathfinder/demo3/shaders/debug_solid.fs.glsl +// pathfinder/demo/shaders/debug_solid.fs.glsl // // Copyright © 2019 The Pathfinder Project Developers. // diff --git a/demo3/shaders/debug_solid.vs.glsl b/demo/shaders/debug_solid.vs.glsl similarity index 92% rename from demo3/shaders/debug_solid.vs.glsl rename to demo/shaders/debug_solid.vs.glsl index 5c27446b..33b57de1 100644 --- a/demo3/shaders/debug_solid.vs.glsl +++ b/demo/shaders/debug_solid.vs.glsl @@ -1,6 +1,6 @@ #version 330 -// pathfinder/demo3/shaders/debug_solid.vs.glsl +// pathfinder/demo/shaders/debug_solid.vs.glsl // // Copyright © 2019 The Pathfinder Project Developers. // diff --git a/demo3/shaders/debug_texture.fs.glsl b/demo/shaders/debug_texture.fs.glsl similarity index 92% rename from demo3/shaders/debug_texture.fs.glsl rename to demo/shaders/debug_texture.fs.glsl index e660dce1..5ab9a15d 100644 --- a/demo3/shaders/debug_texture.fs.glsl +++ b/demo/shaders/debug_texture.fs.glsl @@ -1,6 +1,6 @@ #version 330 -// pathfinder/demo3/shaders/debug_texture.fs.glsl +// pathfinder/demo/shaders/debug_texture.fs.glsl // // Copyright © 2019 The Pathfinder Project Developers. // diff --git a/demo3/shaders/debug_texture.vs.glsl b/demo/shaders/debug_texture.vs.glsl similarity index 93% rename from demo3/shaders/debug_texture.vs.glsl rename to demo/shaders/debug_texture.vs.glsl index e356800e..c2a3e4c8 100644 --- a/demo3/shaders/debug_texture.vs.glsl +++ b/demo/shaders/debug_texture.vs.glsl @@ -1,6 +1,6 @@ #version 330 -// pathfinder/demo3/shaders/debug_texture.vs.glsl +// pathfinder/demo/shaders/debug_texture.vs.glsl // // Copyright © 2019 The Pathfinder Project Developers. // diff --git a/demo3/shaders/fill.fs.glsl b/demo/shaders/fill.fs.glsl similarity index 100% rename from demo3/shaders/fill.fs.glsl rename to demo/shaders/fill.fs.glsl diff --git a/demo3/shaders/fill.vs.glsl b/demo/shaders/fill.vs.glsl similarity index 97% rename from demo3/shaders/fill.vs.glsl rename to demo/shaders/fill.vs.glsl index dbe46795..c5a77496 100644 --- a/demo3/shaders/fill.vs.glsl +++ b/demo/shaders/fill.vs.glsl @@ -1,6 +1,6 @@ #version 330 -// pathfinder/demo3/fill.vs.glsl +// pathfinder/demo/fill.vs.glsl // // Copyright © 2019 The Pathfinder Project Developers. // diff --git a/demo3/shaders/mask_tile.fs.glsl b/demo/shaders/mask_tile.fs.glsl similarity index 92% rename from demo3/shaders/mask_tile.fs.glsl rename to demo/shaders/mask_tile.fs.glsl index c6efffe8..4795a3b1 100644 --- a/demo3/shaders/mask_tile.fs.glsl +++ b/demo/shaders/mask_tile.fs.glsl @@ -1,6 +1,6 @@ #version 330 -// pathfinder/demo3/resources/shaders/mask_tile.fs.glsl +// pathfinder/demo/resources/shaders/mask_tile.fs.glsl // // Copyright © 2018 The Pathfinder Project Developers. // diff --git a/demo3/shaders/mask_tile.vs.glsl b/demo/shaders/mask_tile.vs.glsl similarity index 97% rename from demo3/shaders/mask_tile.vs.glsl rename to demo/shaders/mask_tile.vs.glsl index 643d3214..0684e0b7 100644 --- a/demo3/shaders/mask_tile.vs.glsl +++ b/demo/shaders/mask_tile.vs.glsl @@ -1,6 +1,6 @@ #version 330 -// pathfinder/demo3/shaders/mask_tile.vs.glsl +// pathfinder/demo/shaders/mask_tile.vs.glsl // // Copyright © 2018 The Pathfinder Project Developers. // diff --git a/demo3/shaders/post.fs.glsl b/demo/shaders/post.fs.glsl similarity index 98% rename from demo3/shaders/post.fs.glsl rename to demo/shaders/post.fs.glsl index 2d383914..abe49322 100644 --- a/demo3/shaders/post.fs.glsl +++ b/demo/shaders/post.fs.glsl @@ -1,6 +1,6 @@ #version 330 -// pathfinder/demo3/shaders/post.fs.glsl +// pathfinder/demo/shaders/post.fs.glsl // // Copyright © 2019 The Pathfinder Project Developers. // diff --git a/demo3/shaders/post.vs.glsl b/demo/shaders/post.vs.glsl similarity index 92% rename from demo3/shaders/post.vs.glsl rename to demo/shaders/post.vs.glsl index 259c7960..529cfe88 100644 --- a/demo3/shaders/post.vs.glsl +++ b/demo/shaders/post.vs.glsl @@ -1,6 +1,6 @@ #version 330 -// pathfinder/demo3/shaders/post.vs.glsl +// pathfinder/demo/shaders/post.vs.glsl // // Copyright © 2019 The Pathfinder Project Developers. // diff --git a/demo3/shaders/solid_tile.fs.glsl b/demo/shaders/solid_tile.fs.glsl similarity index 100% rename from demo3/shaders/solid_tile.fs.glsl rename to demo/shaders/solid_tile.fs.glsl diff --git a/demo3/shaders/solid_tile.vs.glsl b/demo/shaders/solid_tile.vs.glsl similarity index 95% rename from demo3/shaders/solid_tile.vs.glsl rename to demo/shaders/solid_tile.vs.glsl index bd906262..17201e91 100644 --- a/demo3/shaders/solid_tile.vs.glsl +++ b/demo/shaders/solid_tile.vs.glsl @@ -1,6 +1,6 @@ #version 330 -// pathfinder/demo3/resources/shaders/solid_tile.vs.glsl +// pathfinder/demo/resources/shaders/solid_tile.vs.glsl // // Copyright © 2019 The Pathfinder Project Developers. // diff --git a/demo3/src/main.rs b/demo/src/main.rs similarity index 99% rename from demo3/src/main.rs rename to demo/src/main.rs index deeca445..f327eff0 100644 --- a/demo3/src/main.rs +++ b/demo/src/main.rs @@ -1,4 +1,4 @@ -// pathfinder/demo3/src/main.rs +// pathfinder/demo/src/main.rs // // Copyright © 2019 The Pathfinder Project Developers. // diff --git a/gl/src/device.rs b/gl/src/device.rs index 67f9311c..03eacdfa 100644 --- a/gl/src/device.rs +++ b/gl/src/device.rs @@ -1,4 +1,4 @@ -// pathfinder/demo3/src/device.rs +// pathfinder/demo/src/device.rs // // Copyright © 2019 The Pathfinder Project Developers. //