FyroxEngine/Fyrox
1
0
Fork 0
mirror of https://github.com/FyroxEngine/Fyrox.git synced 2026-10-12 02:02:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed build of fyrox-impl on publishing

Browse Source
This commit is contained in:
Dmitry Stepanov
2025-10-21 21:06:07 +03:00
parent 8f70f0f33f
commit e4cddc3a10
5 changed files with 28 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
fyrox-impl/Cargo.toml
+1 -1
View File
@@ -26,7 +26,7 @@ fyrox-graphics = { path = "../fyrox-graphics", version = "1.0.0-rc.1" }
fyrox-graphics-gl = { path = "../fyrox-graphics-gl", version = "1.0.0-rc.1" }
fyrox-texture = { path = "../fyrox-texture", version = "1.0.0-rc.1" }
fyrox-autotile = { path = "../fyrox-autotile", version = "1.0.0-rc.1" }
fyrox-material = { path = "../fyrox-material", version = "1.0.0-rc.1" }
fyrox-material = { path = "../fyrox-material", version = "1.0.0-rc.2" }
rapier2d = { version = "0.29", features = ["debug-render"] }
rapier3d = { version = "0.29", features = ["debug-render"] }
image = { version = "0.25.1", default-features = false, features = ["gif", "jpeg", "png", "tga", "tiff", "bmp"] }
fyrox-impl/src/renderer/resources.rs
+9 -1
View File
@@ -173,7 +173,15 @@ impl ShadersContainer {
box_blur: RenderPassContainer::from_str(server, include_str!("shaders/blur.shader"))?,
ui: RenderPassContainer::from_str(
server,
include_str!("../../../fyrox-material/src/shader/standard/widget.shader"),
str::from_utf8(
fyrox_material::shader::STANDARD_WIDGET
.data_source
.as_ref()
.unwrap()
.bytes
.as_ref(),
)
.unwrap(),
)?,
environment_map_specular_convolution: RenderPassContainer::from_str(
server,
fyrox-material/Cargo.toml
+1 -1
View File
@@ -1,6 +1,6 @@
[package]
name = "fyrox-material"
version = "1.0.0-rc.1"
version = "1.0.0-rc.2"
authors = ["Dmitry Stepanov <[email protected]>"]
edition = "2021"
license = "MIT"
fyrox-material/src/shader/mod.rs
+16 -8
View File
@@ -909,7 +909,8 @@ impl ShaderResourceExtension for ShaderResource {
}
lazy_static! {
static ref STANDARD: BuiltInResource<Shader> = BuiltInResource::new(
/// Standard shader.
pub static ref STANDARD: BuiltInResource<Shader> = BuiltInResource::new(
STANDARD_SHADER_NAME,
embedded_data_source!("standard/standard.shader"),
|data| {
@@ -920,7 +921,8 @@ lazy_static! {
)
}
);
static ref STANDARD_2D: BuiltInResource<Shader> = BuiltInResource::new(
/// Standard 2D shader.
pub static ref STANDARD_2D: BuiltInResource<Shader> = BuiltInResource::new(
STANDARD_2D_SHADER_NAME,
embedded_data_source!("standard/standard2d.shader"),
|data| ShaderResource::new_ok(
@@ -929,7 +931,8 @@ lazy_static! {
Shader::from_string_bytes(data).unwrap(),
)
);
static ref STANDARD_PARTICLE_SYSTEM: BuiltInResource<Shader> = BuiltInResource::new(
/// Standard particle system shader.
pub static ref STANDARD_PARTICLE_SYSTEM: BuiltInResource<Shader> = BuiltInResource::new(
STANDARD_PARTICLE_SYSTEM_SHADER_NAME,
embedded_data_source!("standard/standard_particle_system.shader"),
|data| ShaderResource::new_ok(
@@ -938,7 +941,8 @@ lazy_static! {
Shader::from_string_bytes(data).unwrap(),
)
);
static ref STANDARD_SPRITE: BuiltInResource<Shader> = BuiltInResource::new(
/// Standard sprite shader.
pub static ref STANDARD_SPRITE: BuiltInResource<Shader> = BuiltInResource::new(
STANDARD_SPRITE_SHADER_NAME,
embedded_data_source!("standard/standard_sprite.shader"),
|data| ShaderResource::new_ok(
@@ -947,7 +951,8 @@ lazy_static! {
Shader::from_string_bytes(data).unwrap(),
)
);
static ref STANDARD_TERRAIN: BuiltInResource<Shader> = BuiltInResource::new(
/// Standard terrain shader.
pub static ref STANDARD_TERRAIN: BuiltInResource<Shader> = BuiltInResource::new(
STANDARD_TERRAIN_SHADER_NAME,
embedded_data_source!("standard/terrain.shader"),
|data| {
@@ -958,7 +963,8 @@ lazy_static! {
)
}
);
static ref STANDARD_TILE: BuiltInResource<Shader> = BuiltInResource::new(
/// Standard tile shader.
pub static ref STANDARD_TILE: BuiltInResource<Shader> = BuiltInResource::new(
STANDARD_TILE_SHADER_NAME,
embedded_data_source!("standard/tile.shader"),
|data| {
@@ -969,7 +975,8 @@ lazy_static! {
)
}
);
static ref STANDARD_TWOSIDES: BuiltInResource<Shader> = BuiltInResource::new(
/// Standard two-sides shader.
pub static ref STANDARD_TWOSIDES: BuiltInResource<Shader> = BuiltInResource::new(
STANDARD_TWOSIDES_SHADER_NAME,
embedded_data_source!("standard/standard-two-sides.shader"),
|data| ShaderResource::new_ok(
@@ -978,7 +985,8 @@ lazy_static! {
Shader::from_string_bytes(data).unwrap(),
)
);
static ref STANDARD_WIDGET: BuiltInResource<Shader> = BuiltInResource::new(
/// Standard widget shader.
pub static ref STANDARD_WIDGET: BuiltInResource<Shader> = BuiltInResource::new(
STANDARD_WIDGET_SHADER_NAME,
embedded_data_source!("standard/widget.shader"),
|data| ShaderResource::new_ok(
fyrox-ui/Cargo.toml
+1 -1
View File
@@ -20,7 +20,7 @@ fyrox-resource = { path = "../fyrox-resource", version = "1.0.0-rc.1" }
fyrox-texture = { path = "../fyrox-texture", version = "1.0.0-rc.1" }
fyrox-graph = { path = "../fyrox-graph", version = "1.0.0-rc.1" }
fyrox-animation = { path = "../fyrox-animation", version = "1.0.0-rc.1" }
fyrox-material = { path = "../fyrox-material", version = "1.0.0-rc.1" }
fyrox-material = { path = "../fyrox-material", version = "1.0.0-rc.2" }
lazy_static = "1.4.0"
copypasta = "0.10.1"
fontdue = "0.9.2"