From cb5218a003d65cca62023831153e6490cb2973f8 Mon Sep 17 00:00:00 2001 From: Snowiiii Date: Sat, 27 Jul 2024 21:49:36 +0200 Subject: [PATCH] [vent-ui] smaller changes --- crates/vent-runtime/src/render/d3/mod.rs | 2 +- crates/vent-ui/assets/shaders/gui.frag | 4 ++-- crates/vent-ui/assets/shaders/gui.frag.spv | Bin 608 -> 776 bytes crates/vent-ui/src/font/ab_glyph.rs | 2 +- crates/vent-ui/src/font/mod.rs | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/crates/vent-runtime/src/render/d3/mod.rs b/crates/vent-runtime/src/render/d3/mod.rs index f96c28d..2b7c6ed 100644 --- a/crates/vent-runtime/src/render/d3/mod.rs +++ b/crates/vent-runtime/src/render/d3/mod.rs @@ -144,7 +144,7 @@ impl Renderer for Renderer3D { let model = concat!( env!("CARGO_MANIFEST_DIR"), - "/assets/models/test/bistro_outside.glb" + "/assets/models/test/Sponza-GLTF/Sponza.gltf" ); // Sponza-GLTF/Sponza.gltf diff --git a/crates/vent-ui/assets/shaders/gui.frag b/crates/vent-ui/assets/shaders/gui.frag index 5615a6e..49ee4ef 100644 --- a/crates/vent-ui/assets/shaders/gui.frag +++ b/crates/vent-ui/assets/shaders/gui.frag @@ -1,10 +1,10 @@ #version 450 core -layout(location = 0) out vec4 color; +layout(location = 0) out vec4 outColor; layout(set = 0, binding = 0) uniform sampler2D sTexture; layout(location = 0) in struct { vec4 Color; vec2 UV; } In; void main() { - color = vec4(255); //In.Color * texture(sTexture, In.UV.st) + outColor = In.Color * texture(sTexture, In.UV.st); } \ No newline at end of file diff --git a/crates/vent-ui/assets/shaders/gui.frag.spv b/crates/vent-ui/assets/shaders/gui.frag.spv index 5fdbdca4383c06cdd0bb3328f7c5aceb7ce50e8e..b1d27863e53f1ed2b8f926e7c3b1374ac0facb30 100644 GIT binary patch literal 776 zcmYk3$w~uJ5Jk(h>BK2f50E}tK0~l)9Hph zsII#A-I`t}rTt38Oe{n-+A%pRQGyA$H1pTDcelOK_@#Gre5j%pNhVZNk4ntqwfE=O z4=?7hC2Sd;JPn8vsz&^fREC|_mto8qe2%XMZ-XHrOhW(3NkK(i2vRD@Im5%_L~qX< zCa~TH@#wz)HU1p-3F8{QJ&GO0>Zh?edzi<2aW_K|YfSI_-E5P{;tk>yu7ho&cTcgq zb@*2CzLfk~j-5eH{XAa1b=zR~Q7do$B7O#wH(%_`at&||-^uYoj_Y8L`OA2<)@-u< z8s2_#)2F~KCR^u1o%xMiBxirIZ{jKXZ4sNVzM03)f5Ja-FW|DAKY#Mbuif@%B@a(_&Jiv0sI CWgzDO literal 608 zcmYk2O-n*y5QQgiUMA_&^JkicCZ`zRMdC8$BW{#(DQP0;gPuXIPo znRD)$d1odm9akdOq88QIjit4s1QT#+7DwaT@nF7q9-N(@s;Ebj3Dq>B66-|$?eXQ^ z4;y$JZ=#du0kVXy5#JP*VT*dPHBZym>5N$B*C5XCCZCIs*@P4(iIxeLf>!x3uSw}4 z=S=qxOT9DPFwrRQ-vMi4`yXZKANLB_+LgY|BTwPF_&)vIQS4q_{;Nc< zB!87-ca%E;tKGySzJ`5N>T0-L(GR%H7Myx_E7}Sl(si2;>U_JNi{yM;?7o__Hi`Cg qrw-V=`M$jMJ4AcSTQBw=au?j*I``Dv=Le=tyau_Wd;Frl#Qy+0Xd8b3 diff --git a/crates/vent-ui/src/font/ab_glyph.rs b/crates/vent-ui/src/font/ab_glyph.rs index bdb7e80..b3f8776 100644 --- a/crates/vent-ui/src/font/ab_glyph.rs +++ b/crates/vent-ui/src/font/ab_glyph.rs @@ -72,7 +72,7 @@ impl AbGlyphLoader { glyphs.push(glyph); characters.push(character); } - dbg!(characters.len()); + log::debug!("Loaded Charaters: {}", characters.len()); let outlined: Vec<_> = glyphs .into_iter() diff --git a/crates/vent-ui/src/font/mod.rs b/crates/vent-ui/src/font/mod.rs index 8ce9d7e..686a991 100644 --- a/crates/vent-ui/src/font/mod.rs +++ b/crates/vent-ui/src/font/mod.rs @@ -49,7 +49,7 @@ impl Font { let characters = &self.characters; - if !self.buffer_cache.contains_key(&text) { + if !self.buffer_cache.contains_key(&text) { // Todo, Support changing colors for same text let mut batched_vertices = Vec::new(); // Loop through each character in the text let mut current_x = x;