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 clippy warnings + attempt to fix ci (yet. another. attempt)

Browse Source
This commit is contained in:
Dmitry Stepanov
2024-03-23 22:10:11 +03:00
parent 266afc6173
commit 7c5aacd468
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/ci.yml
+1 -1
View File
@@ -46,7 +46,7 @@ jobs:
- name: Set env variables (Windows)
if: ${{ matrix.os == 'windows-latest' }}
run: |
setx RUSTFLAGS "-C prefer-dynamic=yes"
$Env:RUSTFLAGS = '-C prefer-dynamic=yes'
cargo build --verbose --workspace --all-targets --all-features --profile github-ci
cargo test --verbose --workspace --all-features --profile github-ci
fyrox-impl/src/engine/mod.rs
+1 -1
View File
@@ -3334,7 +3334,7 @@ mod test {
let mut time = 0.0;
let dt = 1.0 / 60.0;
let mut lag = 0.0;
while time < 1.0 {
while time < 3.0 {
engine.update(dt, &event_loop, &mut lag, Default::default());
time += dt;
}
fyrox-impl/src/material/shader/mod.rs
+8 -8
View File
@@ -522,7 +522,7 @@ impl Shader {
}
/// Creates a shader from string.
pub fn from_str(str: &str) -> Result<Self, ShaderError> {
pub fn from_string(str: &str) -> Result<Self, ShaderError> {
Ok(Self {
definition: ShaderDefinition::from_str(str)?,
cache_index: Default::default(),
@@ -624,7 +624,7 @@ pub trait ShaderResourceExtension: Sized {
impl ShaderResourceExtension for ShaderResource {
fn from_str(str: &str, kind: ResourceKind) -> Result<Self, ShaderError> {
Ok(Resource::new_ok(kind, Shader::from_str(str)?))
Ok(Resource::new_ok(kind, Shader::from_string(str)?))
}
fn standard() -> Self {
@@ -666,42 +666,42 @@ impl ShaderResourceExtension for ShaderResource {
lazy_static! {
static ref STANDARD: ShaderResource = ShaderResource::new_ok(
STANDARD_SHADER_NAME.into(),
Shader::from_str(STANDARD_SHADER_SRC).unwrap(),
Shader::from_string(STANDARD_SHADER_SRC).unwrap(),
);
}
lazy_static! {
static ref STANDARD_2D: ShaderResource = ShaderResource::new_ok(
STANDARD_2D_SHADER_NAME.into(),
Shader::from_str(STANDARD_2D_SHADER_SRC).unwrap(),
Shader::from_string(STANDARD_2D_SHADER_SRC).unwrap(),
);
}
lazy_static! {
static ref STANDARD_PARTICLE_SYSTEM: ShaderResource = ShaderResource::new_ok(
STANDARD_PARTICLE_SYSTEM_SHADER_NAME.into(),
Shader::from_str(STANDARD_PARTICLE_SYSTEM_SHADER_SRC).unwrap(),
Shader::from_string(STANDARD_PARTICLE_SYSTEM_SHADER_SRC).unwrap(),
);
}
lazy_static! {
static ref STANDARD_SPRITE: ShaderResource = ShaderResource::new_ok(
STANDARD_SPRITE_SHADER_NAME.into(),
Shader::from_str(STANDARD_SPRITE_SHADER_SRC).unwrap(),
Shader::from_string(STANDARD_SPRITE_SHADER_SRC).unwrap(),
);
}
lazy_static! {
static ref STANDARD_TERRAIN: ShaderResource = ShaderResource::new_ok(
STANDARD_TERRAIN_SHADER_NAME.into(),
Shader::from_str(STANDARD_TERRAIN_SHADER_SRC).unwrap(),
Shader::from_string(STANDARD_TERRAIN_SHADER_SRC).unwrap(),
);
}
lazy_static! {
static ref STANDARD_TWOSIDES: ShaderResource = ShaderResource::new_ok(
STANDARD_TWOSIDES_SHADER_NAME.into(),
Shader::from_str(STANDARD_TWOSIDES_SHADER_SRC).unwrap(),
Shader::from_string(STANDARD_TWOSIDES_SHADER_SRC).unwrap(),
);
}