tirbofish/dropbear · commit
8a5b9a964f5241d496642cd70c3a2279638d3ad8
fix: cargo fix
jarvis, run github actions
Signature present but could not be verified.
Unverified
@@ -5,7 +5,6 @@ use crate::shader::Shader; use glam::Mat4; use std::sync::Arc; use wgpu::MultisampleState; -use wgpu::util::{DeviceExt}; pub struct BillboardPipeline { pipeline: wgpu::RenderPipeline, @@ -1,5 +1,5 @@ use crate::asset::{AssetRegistry, Handle}; -use crate::buffer::{DynamicBuffer, MutableDataBuffer, UniformBuffer, WritableBuffer}; +use crate::buffer::{DynamicBuffer, UniformBuffer, WritableBuffer}; use crate::texture::TextureBuilder; use crate::{ graphics::SharedGraphicsContext, @@ -3,10 +3,7 @@ use crate::component::{ Component, ComponentDescriptor, ComponentInitFuture, DisabilityFlags, InspectableComponent, SerializedComponent, }; -use crate::ptr::WorldPtr; -use crate::scripting::result::DropbearNativeResult; use crate::states::SerializableCamera; -use crate::types::NVector3; use dropbear_engine::camera::{Camera, CameraBuilder, CameraSettings}; use dropbear_engine::graphics::SharedGraphicsContext; use egui::{CollapsingHeader, Ui}; @@ -1,6 +1,4 @@ -use crate::ptr::GraphicsContextPtr; -use dropbear_engine::graphics::SharedGraphicsContext; -use glam::{Quat, Vec3}; +use glam::Quat; use dropbear_engine::debug::DebugDraw; use crate::physics::collider::ColliderShape; @@ -70,12 +68,3 @@ impl DebugDrawExt for DebugDraw { } } } - -macro_rules! with_debug { - ($graphics:expr, |$dd:ident| $body:expr) => { - if let Some($dd) = $graphics.debug_draw.lock().as_mut() { - $body - } - }; -} - @@ -2,7 +2,6 @@ use crate::component::{ Component, ComponentDescriptor, ComponentInitFuture, DisabilityFlags, InspectableComponent, SerializedComponent, }; -use crate::ptr::WorldPtr; use crate::states::SerializedLight; use dropbear_engine::attenuation::ATTENUATION_PRESETS; use dropbear_engine::entity::{EntityTransform, Transform, inspect_rotation_dquat}; @@ -1,15 +1,11 @@ //! Components in the eucalyptus-editor and redback-runtime that relate to rapier3d based physics. use crate::physics::rigidbody::RigidBodyMode; -use crate::ptr::PhysicsStatePtr; -use crate::scripting::result::DropbearNativeResult; use crate::states::Label; -use crate::types::{IndexNative, NCollider, NShapeCastHit, NVector3, RayHit}; use dropbear_engine::entity::Transform; use hecs::Entity; use rapier3d::control::CharacterCollision; use rapier3d::na::{Quaternion, UnitQuaternion}; -use rapier3d::parry::query::{DefaultQueryDispatcher, ShapeCastOptions}; use rapier3d::prelude::*; use serde::{Deserialize, Serialize}; use std::collections::HashMap; @@ -21,13 +21,11 @@ use crate::states::Label; use dropbear_engine::asset::ASSET_REGISTRY; use dropbear_engine::entity::{MeshRenderer, inspect_rotation_dquat}; use dropbear_engine::graphics::SharedGraphicsContext; -use dropbear_engine::wgpu::util::{BufferInitDescriptor, DeviceExt}; -use dropbear_engine::wgpu::{Buffer, BufferUsages}; use egui::{CollapsingHeader, ComboBox, Ui}; use glam::{DQuat, Vec3}; use hecs::{Entity, World}; use rapier3d::prelude::ColliderBuilder; -use rapier3d::prelude::{Rotation, SharedShape, TypedShape, Vector}; +use rapier3d::prelude::Vector; use serde::{Deserialize, Serialize}; use std::sync::Arc; @@ -5,26 +5,17 @@ use crate::component::{ Component, ComponentDescriptor, DisabilityFlags, InspectableComponent, SerializedComponent, }; use crate::physics::PhysicsState; -use crate::ptr::WorldPtr; -use crate::scripting::native::DropbearNativeError; -use crate::scripting::result::DropbearNativeResult; use crate::states::Label; use dropbear_engine::graphics::SharedGraphicsContext; use egui::{ComboBox, DragValue, Ui}; use hecs::{Entity, World}; -use jni::objects::{JObject, JValue}; -use jni::{Env, jni_sig, jni_str}; use rapier3d::control::{ CharacterAutostep, CharacterCollision, CharacterLength, KinematicCharacterController, }; -use rapier3d::dynamics::RigidBodyType; -use rapier3d::math::Rotation; use rapier3d::na::{UnitVector3, Vector3}; -use rapier3d::prelude::QueryFilter; use serde::{Deserialize, Serialize}; use std::sync::Arc; use glam::Vec3; -use rapier3d::data::Index; /// The kinematic character controller (kcc) component. #[derive(Debug, Default, Serialize, Deserialize, Clone)] @@ -248,10 +239,4 @@ impl KCC { movement: None, } } -} - -#[repr(C)] -struct CharacterCollisionArray { - entity_id: u64, - collisions: Vec<Index>, -} +} @@ -4,11 +4,7 @@ use crate::component::{ Component, ComponentDescriptor, DisabilityFlags, InspectableComponent, SerializedComponent, }; use crate::physics::PhysicsState; -use crate::ptr::{PhysicsStatePtr, WorldPtr}; -use crate::scripting::native::DropbearNativeError; -use crate::scripting::result::DropbearNativeResult; use crate::states::Label; -use crate::types::{IndexNative, NCollider, NVector3, RigidBodyContext}; use dropbear_engine::graphics::SharedGraphicsContext; use egui::{CollapsingHeader, ComboBox, DragValue, Ui}; use hecs::{Entity, World}; @@ -1,6 +1,3 @@ -use crate::ptr::{CommandBufferPtr, CommandBufferUnwrapped, SceneLoaderPtr, SceneLoaderUnwrapped}; -use crate::scripting::result::DropbearNativeResult; -use crate::utils::Progress; pub mod shared { use crate::command::CommandBuffer; @@ -1,4 +1,3 @@ -use jni::objects::JObject; use eucalyptus_core::input::InputState; use eucalyptus_core::ptr::{CommandBufferPtr, CommandBufferUnwrapped, InputStatePtr}; use eucalyptus_core::scripting::result::DropbearNativeResult;