All around version bumps

kvark · Nov 18, 2023 · 117743f · 117743f
1 parent de39394
commit 117743f
Show file tree

Hide file tree

Showing 9 changed files with 44 additions and 37 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -40,13 +40,13 @@ readme = "docs/README.md"
 [features]
 
 [dependencies]
-blade-asset = { version = "0.1.0", path = "blade-asset" }
-blade-macros = { version = "0.2.0", path = "blade-macros" }
-blade-graphics = { version = "0.2.0", path = "blade-graphics" }
-blade-render = { version = "0.1.0", path = "blade-render" }
+blade-asset = { version = "0.2.0", path = "blade-asset" }
+blade-egui = { version = "0.2.0", path = "blade-egui" }
+blade-macros = { version = "0.2.1", path = "blade-macros" }
+blade-graphics = { version = "0.3.0", path = "blade-graphics" }
+blade-render = { version = "0.2.0", path = "blade-render" }
 
 [dev-dependencies]
-blade-egui = { version = "0.1.0", path = "blade-egui" }
 bytemuck = { workspace = true }
 choir = { workspace = true }
 egui = { workspace = true }

diff --git a/blade-asset/Cargo.toml b/blade-asset/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "blade-asset"
-version = "0.1.0"
+version = "0.2.0"
 edition = "2021"
 description = "Asset manager for Blade"
 keywords = ["asset"]

diff --git a/blade-egui/Cargo.toml b/blade-egui/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "blade-egui"
-version = "0.1.0"
+version = "0.2.0"
 edition = "2021"
 description = "egui integration for Blade"
 keywords = ["graphics"]
@@ -10,7 +10,7 @@ repository = "https://github.com/kvark/blade"
 [lib]
 
 [dependencies]
-blade-graphics = { version = "0.2", path = "../blade-graphics"}
+blade-graphics = { version = "0.3", path = "../blade-graphics"}
 blade-macros = { version = "0.2", path = "../blade-macros"}
 bytemuck = { workspace = true }
 egui = { workspace = true, features = ["bytemuck"] }

diff --git a/blade-graphics/Cargo.toml b/blade-graphics/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "blade-graphics"
-version = "0.2.0"
+version = "0.3.0"
 edition = "2021"
 description = "Graphics abstraction for Blade"
 keywords = ["graphics"]

diff --git a/blade-macros/Cargo.toml b/blade-macros/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "blade-macros"
-version = "0.2.0"
+version = "0.2.1"
 edition = "2021"
 description = "Macros helpers for Blade users"
 keywords = ["proc-macro"]
@@ -16,6 +16,6 @@ proc-macro2 = "1"
 quote = "1.0"
 
 [dev-dependencies]
-blade-graphics = { version = "0.2", path = "../blade-graphics" }
-blade-asset = { version = "0.1", path = "../blade-asset" }
+blade-graphics = { version = "0.3", path = "../blade-graphics" }
+blade-asset = { version = "0.2", path = "../blade-asset" }
 bytemuck = { workspace = true }
diff --git a/blade-render/Cargo.toml b/blade-render/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "blade-render"
-version = "0.1.0"
+version = "0.2.0"
 edition = "2021"
 description = "Renderer built on Blade"
 keywords = ["graphics", "engine"]
@@ -16,9 +16,9 @@ asset = ["gltf" , "base64", "exr", "mikktspace", "slab", "texpresso", "zune-core
 [dependencies]
 base64 = { workspace = true, optional = true }
 bitflags = { workspace = true }
-blade-graphics = { version = "0.2", path = "../blade-graphics" }
-blade-asset = { version = "0.1", path = "../blade-asset" }
-blade-macros = { version = "0.2", path = "../blade-macros" }
+blade-graphics = { version = "0.3", path = "../blade-graphics" }
+blade-asset = { version = "0.2", path = "../blade-asset" }
+blade-macros = { version = "0.2.1", path = "../blade-macros" }
 bytemuck = { workspace = true }
 choir = { workspace = true }
 exr = { version = "1.6", optional = true }
@@ -31,11 +31,8 @@ profiling = { workspace = true }
 slab = { workspace = true, optional = true }
 strum = { workspace = true }
 texpresso = { version = "2.0", optional = true }
-#zune-core = { version = "0.2", optional = true }
-#zune-jpeg = { version = "0.3", optional = true }
-#zune-png = { version = "0.2", optional = true }
-zune-core = { git = "https://github.com/etemesi254/zune-image", optional = true }
-zune-jpeg = { git = "https://github.com/etemesi254/zune-image", optional = true }
-zune-png = { git = "https://github.com/etemesi254/zune-image", optional = true }
-zune-hdr = { git = "https://github.com/etemesi254/zune-image", optional = true }
-zune-imageprocs = { git = "https://github.com/etemesi254/zune-image", optional = true }
+zune-core = { version = "0.4", optional = true }
+zune-jpeg = { version = "0.4", optional = true }
+zune-png = { version = "0.4", optional = true }
+zune-hdr = { version = "0.4", optional = true }
+zune-imageprocs = { version = "0.4", optional = true }
diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
@@ -1,23 +1,29 @@
 Changelog for Blade
 
-## Unreleased
+## blade-graphics-0.3, blade-render-0.2 (17 Nov 2023)
 - tangent space generation
 - spatio-temporal resampling
+- SVGF de-noising
+- environment map importance sampling
 - shaders as assets
   - with includes, enums, and bitflags
   - with hot reloading
+- load textures: `exr`, `hdr`
+- utility: `FramePacer`
+- examples: scene editing in "scene"
+  - using egui-gizmo for manipulation
 
-## 0.2 (31 May 2023)
+## blade-graphics-0.2, blade-render-0.1 (31 May 2023)
 - ray tracing support
-- examples: ray-query, scene
+- examples: "ray-query", "scene"
 - crate: `blade-egui` for egui integration
 - crate: `blade-asset` for asset pipeline
 - crate: `blade-render` for ray-traced renderer
     - load models: `gltf`
 	- load textures: `png`, `jpg`
 
-## 0.1 (25 Jan 2023)
+## blade-graphics-0.1 (25 Jan 2023)
 - backends: Vulkan, Metal, OpenGL ES + WebGL2
-- examples: mini, bunnymark, particle
+- examples: "mini", "bunnymark", "particle"
 - crate `blade-graphics` for GPU abstracting GPU operations
 - crate `blade-macros` for `ShaderData` derivation
diff --git a/docs/README.md b/docs/README.md
@@ -3,7 +3,8 @@
 [![Matrix](https://img.shields.io/static/v1?label=dev&message=%23blade&color=blueviolet&logo=matrix)](https://matrix.to/#/#blade-dev:matrix.org)
 [![Build Status](https://github.com/kvark/blade/workflows/check/badge.svg)](https://github.com/kvark/blade/actions)
 [![Docs](https://docs.rs/blade/badge.svg)](https://docs.rs/blade)
-[![Crates.io](https://img.shields.io/crates/v/blade.svg?maxAge=2592000)](https://crates.io/crates/blade)
+[![Crates.io](https://img.shields.io/crates/v/blade-graphics.svg?maxAge=2592000)](https://crates.io/crates/blade-graphics)
+[![Crates.io](https://img.shields.io/crates/v/blade-render.svg?maxAge=2592000)](https://crates.io/crates/blade-render)
 
 ![](logo.png)
 

diff --git a/examples/bunnymark/main.rs b/examples/bunnymark/main.rs
@@ -39,7 +39,7 @@ struct Sprite {
 
 struct Example {
     pipeline: gpu::RenderPipeline,
-    command_encoder: gpu::CommandEncoder,
+    command_encoder: Option<gpu::CommandEncoder>,
     prev_sync_point: Option<gpu::SyncPoint>,
     texture: gpu::Texture,
     view: gpu::TextureView,
@@ -169,7 +169,7 @@ impl Example {
 
         Self {
             pipeline,
-            command_encoder,
+            command_encoder: Some(command_encoder),
             prev_sync_point: None,
             texture,
             view,
@@ -223,10 +223,11 @@ impl Example {
     fn render(&mut self) {
         let frame = self.context.acquire_frame();
 
-        self.command_encoder.start();
-        self.command_encoder.init_texture(frame.texture());
+        let encoder = self.command_encoder.as_mut().unwrap();
+        encoder.start();
+        encoder.init_texture(frame.texture());
 
-        if let mut pass = self.command_encoder.render(gpu::RenderTargetSet {
+        if let mut pass = encoder.render(gpu::RenderTargetSet {
             colors: &[gpu::RenderTarget {
                 view: frame.texture_view(),
                 init_op: gpu::InitOp::Clear(gpu::TextureColor::TransparentBlack),
@@ -258,8 +259,8 @@ impl Example {
                 rc.draw(0, 4, 0, 1);
             }
         }
-        self.command_encoder.present(frame);
-        let sync_point = self.context.submit(&mut self.command_encoder);
+        encoder.present(frame);
+        let sync_point = self.context.submit(encoder);
         if let Some(sp) = self.prev_sync_point.take() {
             self.context.wait_for(&sp, !0);
         }
@@ -271,6 +272,8 @@ impl Example {
             self.context.wait_for(&sp, !0);
         }
         self.context.destroy_texture(self.texture);
+        self.context
+            .destroy_command_encoder(self.command_encoder.take().unwrap());
     }
 }