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

add an ability to run the editor with no plugins

Browse Source
This commit is contained in:
Dmitry Stepanov
2022-03-08 18:29:00 +03:00
parent ff4d3cd440
commit 562815fee2
7 changed files with 27 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.idea/rg3d-core.iml
Generated
+1
View File
@@ -28,6 +28,7 @@
<sourceFolder url="file://$MODULE_DIR$/fyrox-ui/src" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/examples/scripting/src" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/executor/src" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/editor-standalone/src" isTestSource="false" />
<excludeFolder url="file://$MODULE_DIR$/target" />
<excludeFolder url="file://$MODULE_DIR$/examples/wasm/target" />
</content>
Cargo.toml
+1
View File
@@ -24,6 +24,7 @@ members = [
"fyrox-resource",
"examples/wasm",
"editor",
"editor-standalone"
]
exclude = ["examples/scripting"]
editor-standalone/Cargo.toml
+8
View File
@@ -0,0 +1,8 @@
[package]
name = "fyroxed-standalone"
version = "0.1.0"
edition = "2021"
[dependencies]
fyrox = { path = "../" }
fyroxed = { path = "../editor" }
editor-standalone/src/main.rs
+8
View File
@@ -0,0 +1,8 @@
use fyrox::event_loop::EventLoop;
use fyroxed::Editor;
fn main() {
let event_loop = EventLoop::new();
let editor = Editor::new(&event_loop, None);
editor.run(event_loop)
}
editor/src/inspector/mod.rs
+1
View File
@@ -120,6 +120,7 @@ impl Inspector {
.with_child({
warning_text = TextBuilder::new(
WidgetBuilder::new()
.with_visibility(false)
.with_margin(Thickness::left(4.0))
.with_foreground(Brush::Solid(Color::RED))
.on_row(0),
examples/scripting/.idea/workspace.xml
Generated
+7 -3
View File
@@ -10,10 +10,13 @@
</component>
<component name="ChangeListManager">
<list default="true" id="f1aceae8-7c33-40c3-a2da-82b82ccfcb24" name="Changes" comment="">
<change beforePath="$PROJECT_DIR$/../../editor/src/lib.rs" beforeDir="false" afterPath="$PROJECT_DIR$/../../editor/src/lib.rs" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../../editor-standalone/Cargo.toml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/../../editor-standalone/src/main.rs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../../.idea/rg3d-core.iml" beforeDir="false" afterPath="$PROJECT_DIR$/../../.idea/rg3d-core.iml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../../Cargo.toml" beforeDir="false" afterPath="$PROJECT_DIR$/../../Cargo.toml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../../editor/src/inspector/mod.rs" beforeDir="false" afterPath="$PROJECT_DIR$/../../editor/src/inspector/mod.rs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/editor/src/main.rs" beforeDir="false" afterPath="$PROJECT_DIR$/editor/src/main.rs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/unnamed.rgs" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/game/src/lib.rs" beforeDir="false" afterPath="$PROJECT_DIR$/game/src/lib.rs" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -135,6 +138,7 @@
<workItem from="1646732845950" duration="1279000" />
<workItem from="1646738292422" duration="3646000" />
<workItem from="1646743503532" duration="2478000" />
<workItem from="1646747457133" duration="2369000" />
</task>
<servers />
</component>
examples/scripting/game/src/lib.rs
+1 -1
View File
@@ -122,7 +122,7 @@ impl Plugin for GamePlugin {
fn on_standalone_init(&mut self, context: PluginContext) {
let mut scene = block_on(
block_on(SceneLoader::from_file(
"unnamed.rgs",
"data/scene.rgs",
context.serialization_context.clone(),
))
.expect("Invalid scene!")