storytold/storyteller-bevy
2
0
Fork 0
mirror of https://github.com/storytold/storyteller-bevy.git synced 2026-10-16 00:03:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Its compile

Browse Source
This commit is contained in:
rewin
2024-03-15 22:39:16 +03:00
parent 96e15921ae
commit d9175ca8d8
27 changed files with 40 additions and 205 deletions
Download Patch File Download Diff File Expand all files Collapse all files
editor.ron
+4 -2
View File
@@ -1,6 +1,8 @@
{
"space_editor_core::hotkeys::HotkeySet<space_editor_ui::tools::gizmo::GizmoHotkey>": "{\"space_editor_core::hotkeys::HotkeySet<space_editor_ui::tools::gizmo::GizmoHotkey>\":(bindings:{Rotate:[R],Translate:[G],Scale:[S],Multiple:[ShiftLeft],Clone:[AltLeft],Delete:[X]},name:\"GizmoHotkey\")}",
"space_undo::ChangeChainSettings": "{\"space_undo::ChangeChainSettings\":(max_change_chain_size:200)}",
"space_persistence::PersistenceSettings": "{\"space_persistence::PersistenceSettings\":(load_on_startup:true,save_on_close:true)}",
"space_undo::ChangeChainSettings": "{\"space_undo::ChangeChainSettings\":(max_change_chain_size:200)}",
"space_editor_core::hotkeys::HotkeySet<space_editor_ui::tools::gizmo::GizmoHotkey>": "{\"space_editor_core::hotkeys::HotkeySet<space_editor_ui::tools::gizmo::GizmoHotkey>\":(bindings:{Rotate:[R],Translate:[G],Scale:[S],Multiple:[ShiftLeft],Clone:[AltLeft],Delete:[X]},name:\"GizmoHotkey\")}",
"space_editor_ui::sizing::Sizing": "{\"space_editor_ui::sizing::Sizing\":(icon:Regular,gizmos:Gizmos,text:14.0)}",
"space_editor_ui::settings::GameModeSettings": "{\"space_editor_ui::settings::GameModeSettings\":(mode:Game3D)}",
"space_editor_ui::settings::NewWindowSettings": "{\"space_editor_ui::settings::NewWindowSettings\":(new_tab:SameNode)}",
}
studio/assets/gltf/base-human-male.gltf.meta
-7
View File
@@ -1,7 +0,0 @@
(
meta_format_version: "1.0",
asset: Load(
loader: "bevy_gltf::loader::GltfLoader",
settings: (),
),
)
studio/assets/gltf/sample-room.bin.meta
-4
View File
@@ -1,4 +0,0 @@
(
meta_format_version: "1.0",
asset: Ignore,
)
studio/assets/gltf/sample-room.gltf.meta
-7
View File
@@ -1,7 +0,0 @@
(
meta_format_version: "1.0",
asset: Load(
loader: "bevy_gltf::loader::GltfLoader",
settings: (),
),
)
studio/assets/skyboxes/README.md.meta
-4
View File
@@ -1,4 +0,0 @@
(
meta_format_version: "1.0",
asset: Ignore,
)
studio/assets/skyboxes/gum_trees_4k.hdr.meta
-7
View File
@@ -1,7 +0,0 @@
(
meta_format_version: "1.0",
asset: Load(
loader: "bevy_render::texture::hdr_texture_loader::HdrTextureLoader",
settings: (),
),
)
studio/assets/skyboxes/gum_trees_4k_diffuse.zstd.ktx2.meta
-11
View File
@@ -1,11 +0,0 @@
(
meta_format_version: "1.0",
asset: Load(
loader: "bevy_render::texture::image_loader::ImageLoader",
settings: (
format: FromExtension,
is_srgb: true,
sampler: Default,
),
),
)
studio/assets/skyboxes/gum_trees_4k_specular.zstd.ktx2.meta
-11
View File
@@ -1,11 +0,0 @@
(
meta_format_version: "1.0",
asset: Load(
loader: "bevy_render::texture::image_loader::ImageLoader",
settings: (
format: FromExtension,
is_srgb: true,
sampler: Default,
),
),
)
studio/assets/skyboxes/kloofendal_28d_misty_4k.hdr.meta
-7
View File
@@ -1,7 +0,0 @@
(
meta_format_version: "1.0",
asset: Load(
loader: "bevy_render::texture::hdr_texture_loader::HdrTextureLoader",
settings: (),
),
)
studio/assets/skyboxes/kloofendal_28d_misty_4k_diffuse.zstd.ktx2.meta
-11
View File
@@ -1,11 +0,0 @@
(
meta_format_version: "1.0",
asset: Load(
loader: "bevy_render::texture::image_loader::ImageLoader",
settings: (
format: FromExtension,
is_srgb: true,
sampler: Default,
),
),
)
studio/assets/skyboxes/kloofendal_28d_misty_4k_specular.zstd.ktx2.meta
-11
View File
@@ -1,11 +0,0 @@
(
meta_format_version: "1.0",
asset: Load(
loader: "bevy_render::texture::image_loader::ImageLoader",
settings: (
format: FromExtension,
is_srgb: true,
sampler: Default,
),
),
)
studio/assets/skyboxes/meadow_4k.hdr.meta
-7
View File
@@ -1,7 +0,0 @@
(
meta_format_version: "1.0",
asset: Load(
loader: "bevy_render::texture::hdr_texture_loader::HdrTextureLoader",
settings: (),
),
)
studio/assets/skyboxes/meadow_4k_diffuse.zstd.ktx2.meta
-11
View File
@@ -1,11 +0,0 @@
(
meta_format_version: "1.0",
asset: Load(
loader: "bevy_render::texture::image_loader::ImageLoader",
settings: (
format: FromExtension,
is_srgb: true,
sampler: Default,
),
),
)
studio/assets/skyboxes/meadow_4k_specular.zstd.ktx2.meta
-11
View File
@@ -1,11 +0,0 @@
(
meta_format_version: "1.0",
asset: Load(
loader: "bevy_render::texture::image_loader::ImageLoader",
settings: (
format: FromExtension,
is_srgb: true,
sampler: Default,
),
),
)
studio/assets/skyboxes/promenade_de_vidy_4k.hdr.meta
-7
View File
@@ -1,7 +0,0 @@
(
meta_format_version: "1.0",
asset: Load(
loader: "bevy_render::texture::hdr_texture_loader::HdrTextureLoader",
settings: (),
),
)
studio/assets/skyboxes/promenade_de_vidy_4k_diffuse.zstd.ktx2.meta
-11
View File
@@ -1,11 +0,0 @@
(
meta_format_version: "1.0",
asset: Load(
loader: "bevy_render::texture::image_loader::ImageLoader",
settings: (
format: FromExtension,
is_srgb: true,
sampler: Default,
),
),
)
studio/assets/skyboxes/promenade_de_vidy_4k_specular.zstd.ktx2.meta
-11
View File
@@ -1,11 +0,0 @@
(
meta_format_version: "1.0",
asset: Load(
loader: "bevy_render::texture::image_loader::ImageLoader",
settings: (
format: FromExtension,
is_srgb: true,
sampler: Default,
),
),
)
studio/assets/skyboxes/scythian_tombs_4k.hdr.meta
-7
View File
@@ -1,7 +0,0 @@
(
meta_format_version: "1.0",
asset: Load(
loader: "bevy_render::texture::hdr_texture_loader::HdrTextureLoader",
settings: (),
),
)
studio/assets/skyboxes/scythian_tombs_4k_diffuse.zstd.ktx2.meta
-11
View File
@@ -1,11 +0,0 @@
(
meta_format_version: "1.0",
asset: Load(
loader: "bevy_render::texture::image_loader::ImageLoader",
settings: (
format: FromExtension,
is_srgb: true,
sampler: Default,
),
),
)
studio/assets/skyboxes/scythian_tombs_4k_specular.zstd.ktx2.meta
-11
View File
@@ -1,11 +0,0 @@
(
meta_format_version: "1.0",
asset: Load(
loader: "bevy_render::texture::image_loader::ImageLoader",
settings: (
format: FromExtension,
is_srgb: true,
sampler: Default,
),
),
)
studio/assets/skyboxes/test_scene_diffuse.zstd.ktx2.meta
-11
View File
@@ -1,11 +0,0 @@
(
meta_format_version: "1.0",
asset: Load(
loader: "bevy_render::texture::image_loader::ImageLoader",
settings: (
format: FromExtension,
is_srgb: true,
sampler: Default,
),
),
)
studio/assets/skyboxes/test_scene_specular.zstd.ktx2.meta
-11
View File
@@ -1,11 +0,0 @@
(
meta_format_version: "1.0",
asset: Load(
loader: "bevy_render::texture::image_loader::ImageLoader",
settings: (
format: FromExtension,
is_srgb: true,
sampler: Default,
),
),
)
studio/src/anim/camera.rs
+1 -1
View File
@@ -84,7 +84,7 @@ fn draw_camera_keyframes(
let t = seek_time.inv_lerp(timestamp_a.0, timestamp_b.0);
let (_, rot_a, pos_a) = xform_a.to_scale_rotation_translation();
let (_, rot_b, pos_b) = xform_b.to_scale_rotation_translation();
let pos = t.lerp(pos_a, pos_b);
let pos = pos_a.lerp(pos_b, t);
let rot = Quat::slerp(rot_a, rot_b, t);
gizmos.sphere(pos, rot, 0.25, Color::WHITE);
studio/src/bvh/mod.rs
+22 -4
View File
@@ -1,11 +1,29 @@
use std::ops::{Deref, DerefMut};
use bevy::{
app::{App, Plugin, PostUpdate, Update},
asset::{Asset, AssetApp, AssetEvent, Assets, Handle},
core::Name,
ecs::{
query::{QueryData, QueryFilter, WorldQuery},
system::Command,
component::Component,
entity::Entity,
event::{Event, EventReader, EventWriter},
query::{QueryData, QueryFilter, With, Without, WorldQuery},
schedule::{apply_deferred, IntoSystemConfigs},
system::{Command, Commands, Query, Res, Resource},
world::World,
},
hierarchy::{BuildWorldChildren, Children},
math::{EulerRot, Quat, Vec3},
reflect::{Reflect, TypePath},
render::color::Color,
time::{Time, Timer, TimerMode},
transform::{
components::{GlobalTransform, Transform},
TransformSystem,
},
prelude::*,
transform::TransformSystem,
};
use space_editor::space_prefab::ext::{in_state, resource_exists, Deref, DerefMut, SpatialBundle};
use studio_bvh::{frames::Frame, ChannelType};
mod error;
studio/src/debug.rs
+1
View File
@@ -69,6 +69,7 @@ impl Plugin for DebugPlugin {
.disable::<BottomMenuPlugin>()
.disable::<GizmoToolPlugin>()
.disable::<EditorGizmoConfigPlugin>()
.disable::<MeshlessVisualizerPlugin>()
.disable::<space_editor::prelude::SelectedPlugin>(),
);
studio/src/math/interp/ecs.rs
+4 -3
View File
@@ -1,4 +1,5 @@
use bevy::prelude::*;
use space_editor::space_prefab::ext::{Deref, DerefMut};
use crate::math::{NearlyEq, NearlyZero};
@@ -56,7 +57,7 @@ where
Easing::SineOut => self.t.curve_sin_out(),
};
t.lerp(self.initial, self.target)
Lerp::lerp(t, self.initial, self.target)
}
}
}
@@ -68,8 +69,8 @@ where
{
fn default() -> Self {
Self {
initial: default(),
target: default(),
initial: T::default(),
target: T::default(),
t: 0.,
easing: Easing::Linear,
}
studio/src/screenshot.rs
+8 -6
View File
@@ -55,13 +55,15 @@ impl Plugin for ScreenShotPlugin {
core_3d::graph::Core3d,
ScreenCaptureNode,
)
.add_render_graph_edges(
.add_render_graph_edge(
core_3d::graph::Core3d,
&[
core_3d::graph::Node3d::Tonemapping,
ScreenCaptureNode,
core_3d::graph::Node3d::EndMainPassPostProcessing,
],
core_3d::graph::Node3d::Tonemapping,
ScreenCaptureNode,
)
.add_render_graph_edge(
core_3d::graph::Core3d,
ScreenCaptureNode,
core_3d::graph::Node3d::EndMainPassPostProcessing,
);
}
}