From 081db95b456fcbd8c8c399027314b0e662df472e Mon Sep 17 00:00:00 2001 From: Serge Bazanski Date: Sun, 11 Jul 2021 01:02:53 +0000 Subject: [PATCH] engine/physics: separate into rust_library --- engine/BUILD | 4 +--- engine/lib.rs | 1 - engine/physics/BUILD.bazel | 24 ++++++++++++++++++++++++ engine/physics/{mod.rs => lib.rs} | 0 engine/render/light.rs | 3 ++- engine/render/material.rs | 2 +- engine/render/vulkan/material.rs | 2 +- hsvr/BUILD.bazel | 1 + hsvr/main.rs | 2 +- 9 files changed, 31 insertions(+), 8 deletions(-) create mode 100644 engine/physics/BUILD.bazel rename engine/physics/{mod.rs => lib.rs} (100%) diff --git a/engine/BUILD b/engine/BUILD index 575ee64..5d0322a 100644 --- a/engine/BUILD +++ b/engine/BUILD @@ -19,9 +19,6 @@ rust_library( "input.rs", "scripting.rs", - "physics/mod.rs", - "physics/color.rs", - "render/mod.rs", "render/light.rs", "render/material.rs", @@ -42,6 +39,7 @@ rust_library( ], deps = [ "//engine/util", + "//engine/physics", "//lib/ecs", "//third_party/cargo:cgmath", "//third_party/cargo:image", diff --git a/engine/lib.rs b/engine/lib.rs index 591744e..8bce77a 100644 --- a/engine/lib.rs +++ b/engine/lib.rs @@ -17,5 +17,4 @@ pub mod globals; pub mod input; pub mod render; -pub mod physics; pub mod scripting; diff --git a/engine/physics/BUILD.bazel b/engine/physics/BUILD.bazel new file mode 100644 index 0000000..c3b7dd4 --- /dev/null +++ b/engine/physics/BUILD.bazel @@ -0,0 +1,24 @@ +load("@rules_rust//rust:rust.bzl", "rust_library") + +rust_library( + name = "physics", + crate_name = "engine_physics", + edition = "2018", + rustc_flags = [ + "-C", "opt-level=3", + "-C", "overflow-checks=n", + "-C", "force-frame-pointers=y", + "-C", "lto=off", + "-Zpolonius", + "-Zborrowck=mir", + ], + srcs = [ + "lib.rs", + "color.rs", + ], + deps = [ + ], + visibility = [ + "//visibility:public", + ], +) diff --git a/engine/physics/mod.rs b/engine/physics/lib.rs similarity index 100% rename from engine/physics/mod.rs rename to engine/physics/lib.rs diff --git a/engine/render/light.rs b/engine/render/light.rs index dfb04ac..f1ec21e 100644 --- a/engine/render/light.rs +++ b/engine/render/light.rs @@ -18,7 +18,8 @@ use std::time; use cgmath as cgm; -use crate::physics::color; +use engine_physics::color; + use crate::render::vulkan::data; /// An Omni point light, with position in 3d space, and 'color' defined in lumens per CIE XYZ diff --git a/engine/render/material.rs b/engine/render/material.rs index 3e05740..b4f2deb 100644 --- a/engine/render/material.rs +++ b/engine/render/material.rs @@ -24,8 +24,8 @@ use vulkano::format as vf; use vulkano::image as vm; use engine_util::file; +use engine_physics::color; -use crate::physics::color; use crate::render::vulkan::data; use crate::render::vulkan::material::ChannelLayoutVulkan; diff --git a/engine/render/vulkan/material.rs b/engine/render/vulkan/material.rs index cbfea94..c47e418 100644 --- a/engine/render/vulkan/material.rs +++ b/engine/render/vulkan/material.rs @@ -27,7 +27,7 @@ use vulkano::sampler as vs; use vulkano::sync::GpuFuture; use vulkano::command_buffer::CommandBuffer; -use crate::physics::color; +use engine_physics::color as color; /// Construct a mipmapped vulkan image from an iterator of raw data. fn mipmapped_from_iter( diff --git a/hsvr/BUILD.bazel b/hsvr/BUILD.bazel index 4cd8dd9..e1e56c5 100644 --- a/hsvr/BUILD.bazel +++ b/hsvr/BUILD.bazel @@ -21,6 +21,7 @@ rust_binary( deps = [ "//engine", "//engine/util", + "//engine/physics", "//lib/ecs", "//third_party/cargo:cgmath", "//third_party/cargo:env_logger", diff --git a/hsvr/main.rs b/hsvr/main.rs index ffd81b9..487c626 100644 --- a/hsvr/main.rs +++ b/hsvr/main.rs @@ -5,8 +5,8 @@ use ecs_macros::Access; use engine::{globals, input, render, scripting}; use engine::render::material; use engine::render::vulkan::data; -use engine::physics; +use engine_physics as physics; use engine_util as util; struct Main {