rename to Fyrox (second pass)

This commit is contained in:
Dmitry Stepanov
2022-01-09 17:50:52 +03:00
parent f43ceeda4a
commit c6ba27248a
23 changed files with 56 additions and 58 deletions
+1 -1
View File
@@ -31,5 +31,5 @@ jobs:
# RUSTSEC-2020-0097: xcb - Soundness issue with base::Error
# RUSTSEC-2021-0019: xcb - Multiple soundness issues
# RUSTSEC-2021-0119: nix - Out-of-bounds write in nix::unistd::getgrouplist - waiting for new winit release
# For more info: https://github.com/rg3dengine/rg3d/issues/208
# For more info: https://github.com/FyroxEngine/Fyrox/issues/208
- run: cargo audit --deny warnings --ignore RUSTSEC-2020-0016 --ignore RUSTSEC-2020-0056 --ignore RUSTSEC-2020-0097 --ignore RUSTSEC-2021-0019 --ignore RUSTSEC-2021-0119
+2 -2
View File
@@ -24,7 +24,7 @@ that you are working with good old structures which are placed in contiguous mem
object was placed in a pool, you get a handle to the object which can be used to access (borrow) the object
when you need. Such approach allows you to make any relations between the objects - handle is just a pair of
numbers, it won't cause issues with borrow checker. For more info check
[pool.rs](https://github.com/mrDIMAS/rg3d/blob/master/fyrox-core/src/pool.rs).
[pool.rs](https://github.com/FyroxEngine/Fyrox/blob/master/fyrox-core/src/pool.rs).
### Core
@@ -49,7 +49,7 @@ instance) or a hardware (OpenGL, DirectX, Vulkan, Metal, etc.).
### Sound
Fyrox uses software sound engine [fyrox-sound](https://github.com/mrDIMAS/rg3d/tree/master/fyrox-sound).
Fyrox uses software sound engine [fyrox-sound](https://github.com/FyroxEngine/Fyrox/tree/master/fyrox-sound).
The sound engine provides support for binaural sound rendering using HRTF, which gives excellent sound
spatialization.
+1 -1
View File
@@ -10,7 +10,7 @@ categories = ["game-engines", "graphics", "gui", "rendering", "wasm"]
include = ["/src/**/*", "/Cargo.toml", "/LICENSE", "/README.md"]
homepage = "https://rg3d.rs"
documentation = "https://docs.rs/rg3d"
repository = "https://github.com/mrDIMAS/rg3d"
repository = "https://github.com/FyroxEngine/Fyrox"
readme = "README.md"
resolver = "2"
rust-version = "1.56"
+13 -13
View File
@@ -6,14 +6,14 @@
<h1>Rust Game engine 3D (and 2D)</h1>
</div>
[![License (MIT)](https://img.shields.io/crates/l/rg3d)](https://github.com/mrDIMAS/rg3d/blob/master/LICENSE.md)
[![CI Status](https://github.com/rg3dengine/rg3d/actions/workflows/ci.yml/badge.svg)](https://github.com/rg3dengine/rg3d/actions/workflows/ci.yml)
[![audit](https://github.com/rg3dengine/rg3d/actions/workflows/audit.yml/badge.svg)](https://github.com/rg3dengine/rg3d/actions/workflows/audit.yml)
[![Dependency status](https://deps.rs/repo/github/rg3dengine/rg3d/status.svg)](https://deps.rs/repo/github/rg3dengine/rg3d)
[![License (MIT)](https://img.shields.io/crates/l/rg3d)](https://github.com/FyroxEngine/Fyrox/blob/master/LICENSE.md)
[![CI Status](https://github.com/FyroxEngine/Fyrox/actions/workflows/ci.yml/badge.svg)](https://github.com/FyroxEngine/Fyrox/actions/workflows/ci.yml)
[![audit](https://github.com/FyroxEngine/Fyrox/actions/workflows/audit.yml/badge.svg)](https://github.com/FyroxEngine/Fyrox/actions/workflows/audit.yml)
[![Dependency status](https://deps.rs/repo/github/FyroxEngine/Fyrox/status.svg)](https://deps.rs/repo/github/FyroxEngine/Fyrox)
[![Crates.io](https://img.shields.io/crates/v/rg3d)](https://crates.io/crates/rg3d)
[![docs.rs](https://img.shields.io/badge/docs-website-blue)](https://docs.rs/rg3d/)
[![docs.rs](https://img.shields.io/badge/docs-website-blue)](https://docs.rs/Fyrox/)
[![Discord](https://img.shields.io/discord/756573453561102427)](https://discord.gg/xENF5Uh)
[![Lines of code](https://tokei.rs/b1/github/mrDIMAS/rg3d)](https://github.com/mrDIMAS/rg3d)
[![Lines of code](https://tokei.rs/b1/github/FyroxEngine/Fyrox)](https://github.com/FyroxEngine/Fyrox)
A feature-rich, production-ready, general purpose 2D/3D game engine written in Rust with a scene editor.
@@ -46,7 +46,7 @@ first game.
- Comprehensive [documentation](https://docs.rs/rg3d).
- [Guide book](https://rg3d-book.github.io)
- 2D support.
- [Scene editor](https://github.com/rg3dengine/rg3d/tree/master/editor).
- [Scene editor](https://github.com/FyroxEngine/Fyrox/tree/master/editor).
- Fast iterative compilation.
- Classic object-oriented design.
- Lots of examples.
@@ -105,7 +105,7 @@ first game.
### Sound
- [High quality binaural sound with HRTF support](https://github.com/rg3dengine/rg3d/tree/master/fyrox-sound).
- [High quality binaural sound with HRTF support](https://github.com/FyroxEngine/Fyrox/tree/master/fyrox-sound).
- Generic and spatial sound sources.
- Built-in streaming for large sounds.
- Raw samples playback support.
@@ -141,7 +141,7 @@ first game.
### User Interface (UI)
- [Advanced node-based UI](https://github.com/mrDIMAS/rg3d/tree/master/fyrox-ui) with lots of widgets.
- [Advanced node-based UI](https://github.com/FyroxEngine/Fyrox/tree/master/fyrox-ui) with lots of widgets.
- More than 32 widgets
- Powerful layout system.
- Full TTF/OTF fonts support.
@@ -210,13 +210,13 @@ These screenshots are from [rusty-shooter](https://github.com/mrDIMAS/rusty-shoo
![5](pics/5.jpg?raw=true "Game 5")
## [Examples](https://github.com/mrDIMAS/rg3d/tree/master/examples)
## [Examples](https://github.com/FyroxEngine/Fyrox/tree/master/examples)
There are many examples covering various aspects of the engine. Also don't hesitate to create an issue or ask on Discord if you need help!
## [Editor](https://github.com/rg3dengine/rg3d/tree/master/editor)
## [Editor](https://github.com/FyroxEngine/Fyrox/tree/master/editor)
[![editor](https://raw.githubusercontent.com/rg3dengine/rg3d/master/editor/screenshots/latest.png)](https://github.com/rg3dengine/rg3d/tree/master/editor)
[![editor](https://raw.githubusercontent.com/FyroxEngine/Fyrox/master/editor/screenshots/latest.png)](https://github.com/FyroxEngine/Fyrox/tree/master/editor)
## Dependencies
@@ -230,7 +230,7 @@ sudo apt install libxcb-shape0-dev libxcb-xfixes0-dev libxcb1-dev libxkbcommon-d
Contributions are very welcome! Feel free to open Issues and Pull Requests.
Check the [good first issue](https://github.com/mrDIMAS/rg3d/issues?q=is%3Aissue+is%3Aopen+label%3A%22good+first+issue%22) label to see where you can help.
Check the [good first issue](https://github.com/FyroxEngine/Fyrox/issues?q=is%3Aissue+is%3Aopen+label%3A%22good+first+issue%22) label to see where you can help.
## Sponsors
+13 -14
View File
@@ -6,10 +6,9 @@ authors = ["Dmitry Stepanov <[email protected]>"]
edition = "2021"
rust-version = "1.56"
description = "A scene editor for Fyrox game engine"
documentation = "https://github.com/rg3dengine/rusty-editor"
homepage = "https://github.com/rg3dengine/rusty-editor"
homepage = "https://github.com/FyroxEngine/Fyrox"
keywords = ["fyrox", "editor", "rust"]
repository = "https://github.com/rg3dengine/rusty-editor"
repository = "https://github.com/FyroxEngine/Fyrox"
readme = "README.md"
include = ["/src/**/*", "/Cargo.toml", "/LICENSE", "/README.md", "/resources/**/*"]
@@ -25,7 +24,7 @@ strum_macros = "0.23.1"
[package.metadata.deb]
maintainer = "Voodlaz <[email protected]>"
copyright = "2021, Fyroxengine developers."
copyright = "2021, FyroxEngine developers."
license-file = ["LICENSE", "2"]
# description probably would be bigger in future, so we use a file
@@ -36,20 +35,20 @@ section = "editors"
priority = "optional"
assets = [
["target/release/rusty-editor", "/usr/bin/", "755"],
["resources/lib/*", "usr/lib/rusty-editor", "644"],
["resources/etc/rusty-editor-icon.png", "/usr/share/pixmaps/", "644"],
["resources/etc/rusty-editor-icon.png", "/usr/share/icons/hicolor/256x256/apps/", "644"],
["os-installation/linux/rusty-editor.desktop", "usr/share/applications/", "644"],
["target/release/Fyroxed", "/usr/bin/", "755"],
["resources/lib/*", "usr/lib/Fyroxed", "644"],
["resources/etc/Fyroxed-icon.png", "/usr/share/pixmaps/", "644"],
["resources/etc/Fyroxed-icon.png", "/usr/share/icons/hicolor/256x256/apps/", "644"],
["os-installation/linux/Fyroxed.desktop", "usr/share/applications/", "644"],
]
[package.metadata.generate-rpm]
assets = [
{ source = "target/release/rusty-editor", dest = "/usr/bin/rusty-editor", mode = "0755" },
{ source = "resources/lib/release.toml", dest = "/usr/lib/rusty-editor/release.toml", mode = "0644" },
{ source = "resources/etc/rusty-editor-icon.png", dest = "/usr/share/pixmaps/rusty-editor-icon.png", mode = "0644" },
{ source = "resources/etc/rusty-editor-icon.png", dest = "/usr/share/icons/hicolor/256x256/apps/rusty-editor-icon.png", mode = "0644" },
{ source = "os-installation/linux/rusty-editor.desktop", dest = "/usr/share/applications/rusty-editor.desktop", mode = "0644" }
{ source = "target/release/Fyroxed", dest = "/usr/bin/Fyroxed", mode = "0755" },
{ source = "resources/lib/release.toml", dest = "/usr/lib/Fyroxed/release.toml", mode = "0644" },
{ source = "resources/etc/Fyroxed-icon.png", dest = "/usr/share/pixmaps/Fyroxed-icon.png", mode = "0644" },
{ source = "resources/etc/Fyroxed-icon.png", dest = "/usr/share/icons/hicolor/256x256/apps/Fyroxed-icon.png", mode = "0644" },
{ source = "os-installation/linux/Fyroxed.desktop", dest = "/usr/share/applications/Fyroxed.desktop", mode = "0644" }
]
[features]
+1 -1
View File
@@ -1,6 +1,6 @@
# rusty editor
Scene editor for [Fyrox engine](https://github.com/rg3dengine/rg3d).
Scene editor for [Fyrox engine](https://github.com/FyroxEngine/Fyrox).
## Limitations
@@ -1,10 +1,10 @@
[Desktop Entry]
Name=Rusty Editor
Version=0.7.0
Comment=Scene editor for rg3d
Comment=Scene editor for Fyrox Engine
GenericName=Rusty Editor
Exec=rusty-editor
Icon=rusty-editor-icon
Exec=Fyroxed
Icon=Fyroxed-icon
Type=Application
Terminal=false
Categories=Editors

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 15 KiB

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 14 KiB

+3 -4
View File
@@ -1271,10 +1271,9 @@ impl Editor {
std::env::set_current_dir(working_directory.clone()).unwrap();
engine.get_window().set_title(&format!(
"rusty-editor: {}",
working_directory.to_string_lossy()
));
engine
.get_window()
.set_title(&format!("Fyroxed: {}", working_directory.to_string_lossy()));
engine.resource_manager.state().destroy_unused_resources();
+2 -2
View File
@@ -7,7 +7,7 @@ use std::path::PathBuf;
use crate::TEST_EXISTENCE;
fn project_dir() -> ProjectDirs {
ProjectDirs::from("org", "rg3dengine", "rusty-editor").unwrap()
ProjectDirs::from("org", "FyroxEngine", "Fyroxed").unwrap()
}
pub fn working_config_dir(filename: &str) -> PathBuf {
@@ -42,5 +42,5 @@ pub fn data_dir(filename: &str) -> PathBuf {
}
pub fn resources_dir(filename: &str) -> PathBuf {
PathBuf::from("/usr/lib/rusty-editor/").join(filename)
PathBuf::from("/usr/lib/Fyroxed/").join(filename)
}
+2 -2
View File
@@ -43,7 +43,7 @@ This example shows how to use the user interface system of the engine. It is bas
## Example 05 - Scene
This example shows how to load a simple scene made in [rusty-editor](https://github.com/mrDIMAS/rusty-editor)
This example shows how to load a simple scene made in [Fyroxed](https://github.com/FyroxEngine/Fyrox)
![Example 05](screenshots/scene.png?raw=true "Example 05")
@@ -65,7 +65,7 @@ TODO: It still should be improved, it needs to use a more high poly model to sho
## Example 09 - Lightmap
Lightmap is a texture with precomputed light. This example shows how to load a simple scene made in
[rusty-editor](https://github.com/mrDIMAS/rusty-editor) and generate a lightmap for it. Lightmaps are still in
[Fyroxed](https://github.com/FyroxEngine/Fyrox) and generate a lightmap for it. Lightmaps are still in
active development and not meant to be used.
![Example 09](screenshots/lightmap.png?raw=true "Example 09")
+2 -2
View File
@@ -2,7 +2,7 @@
//!
//! Difficulty: Easy.
//!
//! This example shows how to load simple scene made in [rusty-editor](https://github.com/mrDIMAS/rusty-editor)
//! This example shows how to load simple scene made in [Fyroxed](https://github.com/FyroxEngine/Fyrox)
//! and generate lightmap for it. Lightmaps are still in active development and not meant to be used.
pub mod shared;
@@ -230,7 +230,7 @@ fn create_scene_async(
)
.await;
// There is no difference between scene created in rusty-editor and any other
// There is no difference between scene created in Fyroxed and any other
// model file, so any scene can be used directly as resource.
let root = resource_manager
.request_model("examples/data/sponza/Sponza.rgs")
+2 -2
View File
@@ -2,7 +2,7 @@
//!
//! Difficulty: Easy.
//!
//! This example shows how to load simple scene made in [rusty-editor](https://github.com/mrDIMAS/rusty-editor)
//! This example shows how to load simple scene made in [Fyroxed](https://github.com/FyroxEngine/Fyrox)
//!
//! It is almost the same as Example 01, even easier.
@@ -57,7 +57,7 @@ async fn create_scene(resource_manager: ResourceManager) -> GameScene {
.await])
.build(&mut scene.graph);
// There is no difference between scene created in rusty-editor and any other
// There is no difference between scene created in Fyroxed and any other
// model file, so any scene can be used directly as resource.
resource_manager
.request_model("examples/data/test_scene.rgs")
+1 -1
View File
@@ -5,7 +5,7 @@ authors = ["toyboot4e <[email protected]>, Dmitry Stepanov <[email protected]>"
edition = "2021"
license = "MIT"
description = "Proc-macro for the Visit trait"
repository = "https://github.com/mrDIMAS/rg3d"
repository = "https://github.com/FyroxEngine/Fyrox"
include = ["/src/**/*", "/Cargo.toml", "/README.md"]
readme = "README.md"
resolver = "2"
+1 -1
View File
@@ -10,7 +10,7 @@ categories = ["game-development", "graphics", "gui", "rendering", "wasm"]
include = ["/src/**/*", "/Cargo.toml", "/LICENSE", "/README.md"]
homepage = "https://rg3d.rs"
documentation = "https://docs.rs/fyrox-core"
repository = "https://github.com/mrDIMAS/rg3d"
repository = "https://github.com/FyroxEngine/Fyrox"
readme = "README.md"
resolver = "2"
rust-version = "1.56"
+1 -1
View File
@@ -1,5 +1,5 @@
# fyrox-core
Shared library for rg3d-engine containing linear algebra and some useful algorithms.
Shared library for Fyrox-engine containing linear algebra and some useful algorithms.
**NOTE:** even though this crate has `fyrox` prefix in its name, it can be used separately without any issues.
+1 -1
View File
@@ -10,7 +10,7 @@ categories = ["game-development"]
include = ["/src/**/*", "/Cargo.toml", "/LICENSE"]
homepage = "https://rg3d.rs"
documentation = "https://docs.rs/fyrox-resource"
repository = "https://github.com/mrDIMAS/rg3d"
repository = "https://github.com/FyroxEngine/Fyrox"
resolver = "2"
rust-version = "1.56"
+1 -1
View File
@@ -10,7 +10,7 @@ categories = ["game-development", "multimedia::audio"]
include = ["/src/**/*", "/Cargo.toml", "/LICENSE", "/README.md", "/examples/*"]
homepage = "https://rg3d.rs"
documentation = "https://docs.rs/fyrox-sound"
repository = "https://github.com/mrDIMAS/rg3d"
repository = "https://github.com/FyroxEngine/Fyrox"
readme = "README.md"
resolver = "2"
rust-version = "1.56"
+1 -1
View File
@@ -10,7 +10,7 @@ categories = ["game-development", "gui"]
include = ["/src/**/*", "/Cargo.toml", "/LICENSE", "/README.md"]
homepage = "https://rg3d.rs"
documentation = "https://docs.rs/fyrox-ui"
repository = "https://github.com/mrDIMAS/rg3d"
repository = "https://github.com/FyroxEngine/Fyrox"
readme = "README.md"
resolver = "2"
rust-version = "1.56"
+2 -2
View File
@@ -66,7 +66,7 @@ fyrox-ui uses a bit unusual way of styling - you have to replace entire sub-grap
## Screenshots
[![editor](https://raw.githubusercontent.com/rg3dengine/rusty-editor/master/screenshots/latest.png)](https://github.com/mrDIMAS/rusty-editor/)
[![editor](https://raw.githubusercontent.com/FyroxEngine/Fyrox/master/screenshots/latest.png)](https://github.com/FyroxEngine/Fyrox/)
## Contributing
@@ -82,7 +82,7 @@ TODO.
There are two projects using this UI library:
- [rusty-editor](https://github.com/mrDIMAS/rusty-editor/)
- [Fyroxed](https://github.com/FyroxEngine/Fyrox/)
- [rusty-shooter](https://github.com/mrDIMAS/rusty-shooter)
However, it can be too difficult to understand how to use the library from those projects, so standalone samples should be added. This is still a TODO.
+1 -1
View File
@@ -670,7 +670,7 @@ impl ResourceManager {
/// # Supported formats
///
/// Currently only FBX (common format in game industry for storing complex 3d models)
/// and RGS (native rusty-editor format) formats are supported.
/// and RGS (native Fyroxed format) formats are supported.
pub fn request_model<P: AsRef<Path>>(&self, path: P) -> Model {
let mut state = self.state();
+2 -2
View File
@@ -16,7 +16,7 @@
//! # Supported formats
//!
//! Currently only FBX (common format in game industry for storing complex 3d models)
//! and RGS (native rusty-editor format) formats are supported.
//! and RGS (native Fyroxed format) formats are supported.
use crate::engine::resource_manager::ImportOptions;
use crate::{
animation::Animation,
@@ -370,7 +370,7 @@ impl ModelData {
(scene, NodeMapping::UseNames)
}
// Scene can be used directly as model resource. Such scenes can be created in
// rusty-editor.
// Fyroxed.
"rgs" => (
Scene::from_file(path.as_ref(), resource_manager).await?,
NodeMapping::UseHandles,