删除impl
This commit is contained in:
@@ -10,7 +10,7 @@ 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();
|
||||
@@ -18,7 +18,7 @@ std::unique_ptr<Object> build_object(Args&&... args) {
|
||||
|
||||
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();
|
||||
@@ -41,12 +41,12 @@ void render_once(Scene* scene) {
|
||||
}
|
||||
|
||||
TEST(plottable_migration, curve_plots_share_partitioned_rendering) {
|
||||
using Scene = Impl<Render_Scene_2D>;
|
||||
using Frequency = Impl<Frequency_Axis>;
|
||||
using Numeric = Impl<Numeric_Axis>;
|
||||
using Time = Impl<Time_Axis>;
|
||||
using Trace = Impl<Frequency_Trace>;
|
||||
using Sweep = Impl<Sweep_Spectrum>;
|
||||
using Scene = Render_Scene_2D;
|
||||
using Frequency = Frequency_Axis;
|
||||
using Numeric = Numeric_Axis;
|
||||
using Time = Time_Axis;
|
||||
using Trace = Frequency_Trace;
|
||||
using Sweep = Sweep_Spectrum;
|
||||
initialize_runtime({.workers = 2});
|
||||
const Size canvas{160, 120};
|
||||
auto frequency = build_object<Frequency>();
|
||||
@@ -104,12 +104,12 @@ TEST(plottable_migration, curve_plots_share_partitioned_rendering) {
|
||||
}
|
||||
|
||||
TEST(plottable_migration, raster_plots_share_partitioned_color_blocks) {
|
||||
using Scene = Impl<Render_Scene_2D>;
|
||||
using Frequency = Impl<Frequency_Axis>;
|
||||
using Numeric = Impl<Numeric_Axis>;
|
||||
using Time = Impl<Time_Axis>;
|
||||
using Glow = Impl<Afterglow>;
|
||||
using Fall = Impl<Waterfall>;
|
||||
using Scene = Render_Scene_2D;
|
||||
using Frequency = Frequency_Axis;
|
||||
using Numeric = Numeric_Axis;
|
||||
using Time = Time_Axis;
|
||||
using Glow = Afterglow;
|
||||
using Fall = Waterfall;
|
||||
initialize_runtime({.workers = 2});
|
||||
const Size canvas{160, 120};
|
||||
auto frequency = build_object<Frequency>();
|
||||
@@ -160,10 +160,10 @@ TEST(plottable_migration, raster_plots_share_partitioned_color_blocks) {
|
||||
}
|
||||
|
||||
TEST(plottable_migration, direct_overlay_and_constellation_build_and_render) {
|
||||
using Scene = Impl<Render_Scene_2D>;
|
||||
using Numeric = Impl<Numeric_Axis>;
|
||||
using Diagram = Impl<Constellation_Diagram>;
|
||||
using Overlay = Impl<Selection_Rectangle_Overlay>;
|
||||
using Scene = Render_Scene_2D;
|
||||
using Numeric = Numeric_Axis;
|
||||
using Diagram = Constellation_Diagram;
|
||||
using Overlay = Selection_Rectangle_Overlay;
|
||||
initialize_runtime({.workers = 2});
|
||||
const Size canvas{160, 120};
|
||||
auto horizontal = build_object<Numeric>();
|
||||
@@ -190,9 +190,9 @@ TEST(plottable_migration, direct_overlay_and_constellation_build_and_render) {
|
||||
}
|
||||
|
||||
TEST(selection_overlay, control_extends_selection_and_plain_click_clears_it) {
|
||||
using Scene = Impl<Render_Scene_2D>;
|
||||
using Numeric = Impl<Numeric_Axis>;
|
||||
using Overlay = Impl<Selection_Rectangle_Overlay>;
|
||||
using Scene = Render_Scene_2D;
|
||||
using Numeric = Numeric_Axis;
|
||||
using Overlay = Selection_Rectangle_Overlay;
|
||||
initialize_runtime({.workers = 2});
|
||||
const Size canvas{160, 120};
|
||||
auto horizontal = build_object<Numeric>();
|
||||
@@ -233,10 +233,10 @@ TEST(selection_overlay, control_extends_selection_and_plain_click_clears_it) {
|
||||
}
|
||||
|
||||
TEST(selection_overlay, time_axis_selection_keeps_axis_coordinates_while_window_moves) {
|
||||
using Scene = Impl<Render_Scene_2D>;
|
||||
using Time = Impl<Time_Axis>;
|
||||
using Numeric = Impl<Numeric_Axis>;
|
||||
using Overlay = Impl<Selection_Rectangle_Overlay>;
|
||||
using Scene = Render_Scene_2D;
|
||||
using Time = Time_Axis;
|
||||
using Numeric = Numeric_Axis;
|
||||
using Overlay = Selection_Rectangle_Overlay;
|
||||
initialize_runtime({.workers = 2});
|
||||
const Size canvas{160, 120};
|
||||
auto time = build_object<Time>();
|
||||
|
||||
Reference in New Issue
Block a user