From d5f4d0f05fcb8490984649d78d6c026f87a77f4e Mon Sep 17 00:00:00 2001 From: John Firebaugh Date: Thu, 27 Apr 2017 14:33:00 -0700 Subject: [core] Move render-related sources out of style directory/namespace Moves the following to the renderer directory and out of the style namespace: * CascadeParameters * PropertyEvaluationParameters * UpdateParameters * PropertyEvaluator * DataDrivenPropertyEvaluator * CrossFadedPropertyEvaluator * PaintPropertyBinder * PaintProperyStatistics * PossiblyEvaluatedPropertyValue * TransitioningLight * EvaluatedLight --- cmake/core-files.cmake | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'cmake') diff --git a/cmake/core-files.cmake b/cmake/core-files.cmake index 17498ec427..9513c01810 100644 --- a/cmake/core-files.cmake +++ b/cmake/core-files.cmake @@ -162,8 +162,12 @@ set(MBGL_CORE_FILES src/mbgl/renderer/bucket.hpp src/mbgl/renderer/bucket_parameters.cpp src/mbgl/renderer/bucket_parameters.hpp + src/mbgl/renderer/cascade_parameters.hpp src/mbgl/renderer/circle_bucket.cpp src/mbgl/renderer/circle_bucket.hpp + src/mbgl/renderer/cross_faded_property_evaluator.cpp + src/mbgl/renderer/cross_faded_property_evaluator.hpp + src/mbgl/renderer/data_driven_property_evaluator.hpp src/mbgl/renderer/debug_bucket.cpp src/mbgl/renderer/debug_bucket.hpp src/mbgl/renderer/fill_bucket.cpp @@ -177,6 +181,8 @@ set(MBGL_CORE_FILES src/mbgl/renderer/line_bucket.cpp src/mbgl/renderer/line_bucket.hpp src/mbgl/renderer/paint_parameters.hpp + src/mbgl/renderer/paint_property_binder.hpp + src/mbgl/renderer/paint_property_statistics.hpp src/mbgl/renderer/painter.cpp src/mbgl/renderer/painter.hpp src/mbgl/renderer/painter_background.cpp @@ -188,6 +194,9 @@ set(MBGL_CORE_FILES src/mbgl/renderer/painter_line.cpp src/mbgl/renderer/painter_raster.cpp src/mbgl/renderer/painter_symbol.cpp + src/mbgl/renderer/possibly_evaluated_property_value.hpp + src/mbgl/renderer/property_evaluation_parameters.hpp + src/mbgl/renderer/property_evaluator.hpp src/mbgl/renderer/raster_bucket.cpp src/mbgl/renderer/raster_bucket.hpp src/mbgl/renderer/render_background_layer.cpp @@ -203,22 +212,25 @@ set(MBGL_CORE_FILES src/mbgl/renderer/render_item.hpp src/mbgl/renderer/render_layer.cpp src/mbgl/renderer/render_layer.hpp + src/mbgl/renderer/render_light.hpp src/mbgl/renderer/render_line_layer.cpp src/mbgl/renderer/render_line_layer.hpp src/mbgl/renderer/render_pass.hpp src/mbgl/renderer/render_raster_layer.cpp src/mbgl/renderer/render_raster_layer.hpp - src/mbgl/renderer/render_symbol_layer.cpp - src/mbgl/renderer/render_symbol_layer.hpp src/mbgl/renderer/render_source.cpp src/mbgl/renderer/render_source.hpp src/mbgl/renderer/render_source_observer.hpp + src/mbgl/renderer/render_symbol_layer.cpp + src/mbgl/renderer/render_symbol_layer.hpp src/mbgl/renderer/render_tile.cpp src/mbgl/renderer/render_tile.hpp src/mbgl/renderer/symbol_bucket.cpp src/mbgl/renderer/symbol_bucket.hpp src/mbgl/renderer/tile_pyramid.cpp src/mbgl/renderer/tile_pyramid.hpp + src/mbgl/renderer/transitioning_property.hpp + src/mbgl/renderer/update_parameters.hpp # renderer/sources src/mbgl/renderer/sources/render_geojson_source.cpp @@ -305,28 +317,18 @@ set(MBGL_CORE_FILES include/mbgl/style/transition_options.hpp include/mbgl/style/types.hpp include/mbgl/style/undefined.hpp - src/mbgl/style/cascade_parameters.hpp src/mbgl/style/class_dictionary.cpp src/mbgl/style/class_dictionary.hpp - src/mbgl/style/cross_faded_property_evaluator.cpp - src/mbgl/style/cross_faded_property_evaluator.hpp - src/mbgl/style/data_driven_property_evaluator.hpp src/mbgl/style/image.cpp src/mbgl/style/layer.cpp src/mbgl/style/layer_impl.cpp src/mbgl/style/layer_impl.hpp src/mbgl/style/layer_observer.hpp src/mbgl/style/layout_property.hpp - src/mbgl/style/light_impl.hpp src/mbgl/style/observer.hpp src/mbgl/style/paint_property.hpp - src/mbgl/style/paint_property_binder.hpp - src/mbgl/style/paint_property_statistics.hpp src/mbgl/style/parser.cpp src/mbgl/style/parser.hpp - src/mbgl/style/possibly_evaluated_property_value.hpp - src/mbgl/style/property_evaluation_parameters.hpp - src/mbgl/style/property_evaluator.hpp src/mbgl/style/rapidjson_conversion.hpp src/mbgl/style/source.cpp src/mbgl/style/source_impl.cpp @@ -336,10 +338,8 @@ set(MBGL_CORE_FILES src/mbgl/style/style.hpp src/mbgl/style/tile_source_impl.cpp src/mbgl/style/tile_source_impl.hpp - src/mbgl/style/transitioning_property.hpp src/mbgl/style/types.cpp src/mbgl/style/update_batch.hpp - src/mbgl/style/update_parameters.hpp # style/conversion include/mbgl/style/conversion/constant.hpp -- cgit v1.2.1