删除impl
This commit is contained in:
@@ -7,14 +7,14 @@ using namespace aethera;
|
||||
using namespace aethera::render_2d;
|
||||
template <typename Object, typename... Args>
|
||||
std::unique_ptr<Object> build_object(Args&&... args) {
|
||||
typename Object::Builder builder(std::forward<Args>(args)...);
|
||||
typename Object::template Builder<Object> builder(std::forward<Args>(args)...);
|
||||
auto result = builder.build();
|
||||
if (!result) std::terminate();
|
||||
return std::move(result).value();
|
||||
}
|
||||
template <typename Scene, typename... Renderables>
|
||||
std::unique_ptr<Scene> build_scene(Renderables*... renderables) {
|
||||
typename Scene::Builder builder;
|
||||
typename Scene::template Builder<Scene> builder;
|
||||
(builder.add_renderable(renderables), ...);
|
||||
auto result = builder.build();
|
||||
if (!result) std::terminate();
|
||||
@@ -52,10 +52,10 @@ std::unique_ptr<Frame_2D> render_frame(Scene* scene) {
|
||||
}
|
||||
}
|
||||
TEST(spectrum_data, publishes_samples_through_tagged_frame_buffer) {
|
||||
using Frequency = Impl<Frequency_Axis>;
|
||||
using Power = Impl<Numeric_Axis>;
|
||||
using Object = Impl<Spectrum>;
|
||||
using Scene_Object = Impl<Render_Scene_2D>;
|
||||
using Frequency = Frequency_Axis;
|
||||
using Power = Numeric_Axis;
|
||||
using Object = Spectrum;
|
||||
using Scene_Object = Render_Scene_2D;
|
||||
auto frequency = build_object<Frequency>();
|
||||
auto power = build_object<Power>();
|
||||
auto spectrum = build_object<Object>(frequency.get(), power.get());
|
||||
@@ -69,10 +69,10 @@ TEST(spectrum_data, publishes_samples_through_tagged_frame_buffer) {
|
||||
(std::vector<Spectrum_Power>{-100.0, -50.0, 0.0}));
|
||||
}
|
||||
TEST(spectrum_markers, uses_tagged_properties_as_the_only_marker_interface) {
|
||||
using Frequency = Impl<Frequency_Axis>;
|
||||
using Power = Impl<Numeric_Axis>;
|
||||
using Object = Impl<Spectrum>;
|
||||
using Scene_Object = Impl<Render_Scene_2D>;
|
||||
using Frequency = Frequency_Axis;
|
||||
using Power = Numeric_Axis;
|
||||
using Object = Spectrum;
|
||||
using Scene_Object = Render_Scene_2D;
|
||||
auto frequency = build_object<Frequency>();
|
||||
auto power = build_object<Power>();
|
||||
auto spectrum = build_object<Object>(frequency.get(), power.get());
|
||||
@@ -103,10 +103,10 @@ TEST(spectrum_markers, uses_tagged_properties_as_the_only_marker_interface) {
|
||||
EXPECT_EQ(spectrum->read_prop<Spectrum::Base_Tag>().selected_marker, -1);
|
||||
}
|
||||
TEST(render_scene_2d, composites_axes_and_spectrum_into_final_frame) {
|
||||
using Frequency = Impl<Frequency_Axis>;
|
||||
using Power = Impl<Numeric_Axis>;
|
||||
using Spectrum_Object = Impl<Spectrum>;
|
||||
using Scene_Object = Impl<Render_Scene_2D>;
|
||||
using Frequency = Frequency_Axis;
|
||||
using Power = Numeric_Axis;
|
||||
using Spectrum_Object = Spectrum;
|
||||
using Scene_Object = Render_Scene_2D;
|
||||
initialize_runtime({.workers = 2});
|
||||
auto frequency = build_object<Frequency>();
|
||||
auto power = build_object<Power>();
|
||||
@@ -194,10 +194,10 @@ TEST(render_scene_2d, composites_axes_and_spectrum_into_final_frame) {
|
||||
}
|
||||
|
||||
TEST(spectrum_data, repeatedly_publishes_new_samples_during_long_running_render) {
|
||||
using Frequency = Impl<Frequency_Axis>;
|
||||
using Power = Impl<Numeric_Axis>;
|
||||
using Spectrum_Object = Impl<Spectrum>;
|
||||
using Scene_Object = Impl<Render_Scene_2D>;
|
||||
using Frequency = Frequency_Axis;
|
||||
using Power = Numeric_Axis;
|
||||
using Spectrum_Object = Spectrum;
|
||||
using Scene_Object = Render_Scene_2D;
|
||||
initialize_runtime({.workers = 4});
|
||||
auto frequency = build_object<Frequency>();
|
||||
auto power = build_object<Power>();
|
||||
|
||||
Reference in New Issue
Block a user