Compare commits
No commits in common. "c7ceef7d6698ae0b86ddf082cf53aacb0a98ffe5" and "1b1f742ae110685ba3c589a36accce4d61c77945" have entirely different histories.
c7ceef7d66
...
1b1f742ae1
@ -40,7 +40,7 @@ IF(CMAKE_BUILD_TYPE STREQUAL "Debug")
|
|||||||
add_definitions(-DGETTEXT_PACKAGE=\"gds-render\" -DLOCALEDATADIR=\"${CMAKE_CURRENT_BINARY_DIR}/translations/output\")
|
add_definitions(-DGETTEXT_PACKAGE=\"gds-render\" -DLOCALEDATADIR=\"${CMAKE_CURRENT_BINARY_DIR}/translations/output\")
|
||||||
message("${BoldMagenta}${CMAKE_CURRENT_BINARY_DIR}/translations/output used as data dir${ColorReset}")
|
message("${BoldMagenta}${CMAKE_CURRENT_BINARY_DIR}/translations/output used as data dir${ColorReset}")
|
||||||
else(CMAKE_BUILD_TYPE STREQUAL "Debug")
|
else(CMAKE_BUILD_TYPE STREQUAL "Debug")
|
||||||
message("${BoldCyan}Global locale directory used. Make sure files in /usr/share/locale are available${ColorReset}")
|
message("Global locale directory used. Make sure files in /usr/share/locale are available")
|
||||||
add_definitions(-DGETTEXT_PACKAGE=\"gds-render\" -DLOCALEDATADIR=\"/usr/share\")
|
add_definitions(-DGETTEXT_PACKAGE=\"gds-render\" -DLOCALEDATADIR=\"/usr/share\")
|
||||||
ENDIF(CMAKE_BUILD_TYPE STREQUAL "Debug")
|
ENDIF(CMAKE_BUILD_TYPE STREQUAL "Debug")
|
||||||
|
|
||||||
|
@ -145,7 +145,7 @@ static void calculate_path_miter_points(struct vector_2d *a, struct vector_2d *b
|
|||||||
vector_2d_subtract(m2, m2, &v_vec);
|
vector_2d_subtract(m2, m2, &v_vec);
|
||||||
}
|
}
|
||||||
|
|
||||||
void bounding_box_update_with_path(GList *vertices, double thickness,
|
void bounding_box_calculate_path_box(GList *vertices, double thickness,
|
||||||
conv_generic_to_vector_2d_t conv_func, union bounding_box *box)
|
conv_generic_to_vector_2d_t conv_func, union bounding_box *box)
|
||||||
{
|
{
|
||||||
GList *vertex_iterator;
|
GList *vertex_iterator;
|
||||||
@ -191,40 +191,24 @@ void bounding_box_update_point(union bounding_box *destination, conv_generic_to_
|
|||||||
destination->vectors.upper_right.y = MAX(destination->vectors.upper_right.y, point.y);
|
destination->vectors.upper_right.y = MAX(destination->vectors.upper_right.y, point.y);
|
||||||
}
|
}
|
||||||
|
|
||||||
void bounding_box_get_all_points(struct vector_2d *points, union bounding_box *box)
|
/**
|
||||||
{
|
* @brief Apply transformations onto bounding box.
|
||||||
if (!points || !box)
|
* @param scale Scaling factor
|
||||||
return;
|
* @param rotation_deg Roation of bounding box around the origin in degrees (counterclockwise)
|
||||||
|
* @param flip_at_x Flip the boundig box on the x axis before rotating.
|
||||||
points[0].x = box->vectors.lower_left.x;
|
* @param box Bounding box the operations should be applied to.
|
||||||
points[0].y = box->vectors.lower_left.y;
|
*/
|
||||||
points[1].x = box->vectors.upper_right.x;
|
|
||||||
points[1].y = box->vectors.lower_left.y;
|
|
||||||
points[2].x = box->vectors.upper_right.x;
|
|
||||||
points[2].y = box->vectors.upper_right.y;
|
|
||||||
points[3].x = box->vectors.lower_left.x;
|
|
||||||
points[3].y = box->vectors.upper_right.y;
|
|
||||||
}
|
|
||||||
|
|
||||||
void bounding_box_apply_transform(double scale, double rotation_deg, bool flip_at_x, union bounding_box *box)
|
void bounding_box_apply_transform(double scale, double rotation_deg, bool flip_at_x, union bounding_box *box)
|
||||||
{
|
{
|
||||||
int i;
|
int i;
|
||||||
struct vector_2d input_points[4];
|
|
||||||
|
|
||||||
if (!box)
|
/* Due to linearity, the order of the operations does not matter.
|
||||||
return;
|
* flip must be applied before rotation as defined by the GDS format
|
||||||
|
*/
|
||||||
bounding_box_get_all_points(input_points, box);
|
for (i = 0; i < 2; i++) {
|
||||||
|
box->vector_array[i].y *= (flip_at_x ? -1 : 1);
|
||||||
/* Reset box */
|
vector_2d_rotate(&box->vector_array[i], rotation_deg * M_PI / 180);
|
||||||
bounding_box_prepare_empty(box);
|
vector_2d_scale(&box->vector_array[i], scale);
|
||||||
|
|
||||||
for (i = 0; i < 4; i++) {
|
|
||||||
input_points[i].y *= (flip_at_x ? -1 : 1);
|
|
||||||
vector_2d_rotate(&input_points[i], rotation_deg * M_PI / 180.0);
|
|
||||||
vector_2d_scale(&input_points[i], scale);
|
|
||||||
|
|
||||||
bounding_box_update_point(box, NULL, &input_points[i]);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -63,7 +63,7 @@ static void update_box_with_gfx(union bounding_box *box, struct gds_graphics *gf
|
|||||||
* Please be aware if paths are the outmost elements of your cell.
|
* Please be aware if paths are the outmost elements of your cell.
|
||||||
* You might end up with a completely wrong calculated cell size.
|
* You might end up with a completely wrong calculated cell size.
|
||||||
*/
|
*/
|
||||||
bounding_box_update_with_path(gfx->vertices, gfx->width_absolute,
|
bounding_box_calculate_path_box(gfx->vertices, gfx->width_absolute,
|
||||||
(conv_generic_to_vector_2d_t)&convert_gds_point_to_2d_vector,
|
(conv_generic_to_vector_2d_t)&convert_gds_point_to_2d_vector,
|
||||||
¤t_box);
|
¤t_box);
|
||||||
break;
|
break;
|
||||||
|
@ -46,75 +46,12 @@ union bounding_box {
|
|||||||
|
|
||||||
typedef void (*conv_generic_to_vector_2d_t)(void *, struct vector_2d *);
|
typedef void (*conv_generic_to_vector_2d_t)(void *, struct vector_2d *);
|
||||||
|
|
||||||
/**
|
|
||||||
* @brief Calculate bounding box of polygon
|
|
||||||
* @param vertices List of vertices that describe the polygon
|
|
||||||
* @param conv_func Conversion function to convert vertices to vector_2d structs.
|
|
||||||
* @param box Box to write to. This box is not updated! All previous data is discarded
|
|
||||||
*/
|
|
||||||
void bounding_box_calculate_polygon(GList *vertices, conv_generic_to_vector_2d_t conv_func, union bounding_box *box);
|
void bounding_box_calculate_polygon(GList *vertices, conv_generic_to_vector_2d_t conv_func, union bounding_box *box);
|
||||||
|
|
||||||
/**
|
|
||||||
* @brief Update an exisitng bounding box with another one.
|
|
||||||
* @param destination Target box to update
|
|
||||||
* @param update Box to update the target with
|
|
||||||
*/
|
|
||||||
void bounding_box_update_box(union bounding_box *destination, union bounding_box *update);
|
void bounding_box_update_box(union bounding_box *destination, union bounding_box *update);
|
||||||
|
|
||||||
/**
|
|
||||||
* @brief Prepare an empty bounding box.
|
|
||||||
*
|
|
||||||
* Updating this specially prepared box, results in a bounding box that is the same size as the update
|
|
||||||
*
|
|
||||||
* @param box Box to preapre
|
|
||||||
*/
|
|
||||||
void bounding_box_prepare_empty(union bounding_box *box);
|
void bounding_box_prepare_empty(union bounding_box *box);
|
||||||
|
|
||||||
/**
|
|
||||||
* @brief Update bounding box with a point
|
|
||||||
* @param destination Bounding box to update
|
|
||||||
* @param conv_func Conversion function to convert \p pt to a vector_2d. May be NULL
|
|
||||||
* @param pt Point to update bounding box with
|
|
||||||
*/
|
|
||||||
void bounding_box_update_point(union bounding_box *destination, conv_generic_to_vector_2d_t conv_func, void *pt);
|
void bounding_box_update_point(union bounding_box *destination, conv_generic_to_vector_2d_t conv_func, void *pt);
|
||||||
|
|
||||||
/**
|
|
||||||
* @brief Return all four corner points of a bounding box
|
|
||||||
* @param[out] points Array of 4 vector_2d structs that has to be allocated by the caller
|
|
||||||
* @param box Bounding box
|
|
||||||
*/
|
|
||||||
void bounding_box_get_all_points(struct vector_2d *points, union bounding_box *box);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @brief Apply transformations onto bounding box.
|
|
||||||
*
|
|
||||||
* All corner points of the bounding \f$ \vec{P_i} \f$ box are transformed to output points \f$ \vec{P_o} \f$ by:
|
|
||||||
*
|
|
||||||
* \f$ \vec{P_o} = s \cdot \begin{pmatrix}\cos\left(\phi\right) & -\sin\left(\phi\right)\\ \sin\left(\phi\right) & \cos\left(\phi\right)\end{pmatrix} \cdot \begin{pmatrix} 1 & 0 \\ 0 & -1^{m} \end{pmatrix} \cdot \vec{P_i} \f$, with:
|
|
||||||
*
|
|
||||||
* * \f$s\f$: Scale
|
|
||||||
* * \f$m\f$: 1, if flipped_at_x is True, else 0
|
|
||||||
* * \f$\phi\f$: Rotation angle in radians. The conversion degrees => radians is done internally
|
|
||||||
*
|
|
||||||
* The result is the bounding box generated around all output points
|
|
||||||
*
|
|
||||||
* @param scale Scaling factor
|
|
||||||
* @param rotation_deg Rotation of bounding box around the origin in degrees (counterclockwise)
|
|
||||||
* @param flip_at_x Flip the boundig box on the x axis before rotating.
|
|
||||||
* @param box Bounding box the operations should be applied to.
|
|
||||||
* @note Keep in mind, that this bounding boxy is actually the bounding box of the rotated boundig box and not the object itself.
|
|
||||||
* It might be too big.
|
|
||||||
*/
|
|
||||||
void bounding_box_apply_transform(double scale, double rotation_deg, bool flip_at_x, union bounding_box *box);
|
void bounding_box_apply_transform(double scale, double rotation_deg, bool flip_at_x, union bounding_box *box);
|
||||||
|
void bounding_box_calculate_path_box(GList *vertices, double thickness, conv_generic_to_vector_2d_t conv_func, union bounding_box *box);
|
||||||
/**
|
|
||||||
* @brief Calculate the bounding box of a path and update the given bounding box
|
|
||||||
* @param vertices Vertices the path is made up of
|
|
||||||
* @param thickness Thisckness of the path
|
|
||||||
* @param conv_func Conversion function for vertices to vector_2d structs
|
|
||||||
* @param box Bounding box to write results in.
|
|
||||||
*/
|
|
||||||
void bounding_box_update_with_path(GList *vertices, double thickness, conv_generic_to_vector_2d_t conv_func, union bounding_box *box);
|
|
||||||
|
|
||||||
#endif /* _BOUNDING_BOX_H_ */
|
#endif /* _BOUNDING_BOX_H_ */
|
||||||
|
|
||||||
|
@ -1,4 +1,2 @@
|
|||||||
add_subdirectory(plugin-example)
|
add_subdirectory(plugin-example)
|
||||||
add_subdirectory(python-renderer)
|
add_custom_target(plugins DEPENDS pluginexample)
|
||||||
|
|
||||||
add_custom_target(plugins DEPENDS pluginexample pythonrenderer)
|
|
||||||
|
@ -1,11 +1,12 @@
|
|||||||
project(pluginexample)
|
project(pluginexample)
|
||||||
cmake_minimum_required(VERSION 2.8)
|
cmake_minimum_required(VERSION 2.8)
|
||||||
find_package(PkgConfig REQUIRED)
|
find_package(PkgConfig REQUIRED)
|
||||||
|
pkg_search_module(PYTHON REQUIRED python3)
|
||||||
|
|
||||||
aux_source_directory(src SOURCES)
|
aux_source_directory(src SOURCES)
|
||||||
|
|
||||||
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include)
|
include_directories(${PYTHON_INCLUDE_DIRS} ${CMAKE_CURRENT_SOURCE_DIR}/include)
|
||||||
link_libraries(version)
|
link_libraries(${PYTHON_LDFLAGS} version)
|
||||||
|
|
||||||
add_library(${PROJECT_NAME} SHARED EXCLUDE_FROM_ALL ${SOURCES})
|
add_library(${PROJECT_NAME} SHARED EXCLUDE_FROM_ALL ${SOURCES})
|
||||||
add_dependencies(${PROJECT_NAME} version)
|
add_dependencies(${PROJECT_NAME} version)
|
||||||
|
@ -1,13 +0,0 @@
|
|||||||
project(pythonrenderer)
|
|
||||||
cmake_minimum_required(VERSION 2.8)
|
|
||||||
find_package(PkgConfig REQUIRED)
|
|
||||||
pkg_search_module(PYTHON REQUIRED python3)
|
|
||||||
|
|
||||||
aux_source_directory(src SOURCES)
|
|
||||||
|
|
||||||
include_directories(${PYTHON_INCLUDE_DIRS} ${CMAKE_CURRENT_SOURCE_DIR}/include)
|
|
||||||
link_libraries(${PYTHON_LDFLAGS} version)
|
|
||||||
|
|
||||||
add_library(${PROJECT_NAME} SHARED EXCLUDE_FROM_ALL ${SOURCES})
|
|
||||||
add_dependencies(${PROJECT_NAME} version)
|
|
||||||
|
|
@ -1,19 +0,0 @@
|
|||||||
#include <stdio.h>
|
|
||||||
#include <glib.h>
|
|
||||||
#include <gds-render/gds-utils/gds-types.h>
|
|
||||||
#include <gds-render/output-renderers/external-renderer-interfaces.h>
|
|
||||||
|
|
||||||
int FUNC_DECL(EXTERNAL_LIBRARY_RENDER_FUNCTION)(struct gds_cell *toplevel, GList *layer_info_list, const char *output_file_name, double scale)
|
|
||||||
{
|
|
||||||
if (!toplevel)
|
|
||||||
return -1000;
|
|
||||||
|
|
||||||
printf("Rendering %s\n", toplevel->name);
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
int FUNC_DECL(EXTERNAL_LIBRARY_INIT_FUNCTION)(const char *params, const char *version)
|
|
||||||
{
|
|
||||||
printf("Init with params: %s\ngds-render version: %s\n", params, version);
|
|
||||||
return 0;
|
|
||||||
}
|
|
Loading…
x
Reference in New Issue
Block a user