caiyu/gmio
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

benchmarks: fix compilation errors

Browse Source
This commit is contained in:
Hugues Delorme 2015-12-04 10:32:11 +01:00
parent ac93858dbd
commit d5404814e7
3 changed files with 36 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
benchmarks/benchmark_assimp/main.cpp
View File

@ -23,6 +23,10 @@
#include <gmio_core/error.h> #include <gmio_core/error.h>
#include <gmio_stl/stl_io.h> #include <gmio_stl/stl_io.h>
#include <gmio_stl/stl_io_options.h>
#include <gmio_stl/stl_triangle.h>
#include <gmio_stl/stl_mesh.h>
#include <gmio_stl/stl_mesh_creator.h>
#include <cstring> #include <cstring>
#include <iostream> #include <iostream>
@ -40,15 +44,15 @@ static unsigned totalTriangleCount(const aiScene* scene)
} }
GMIO_INLINE void copy_gmio_stl_coords( GMIO_INLINE void copy_gmio_stl_coords(
aiVector3D* vec3, const gmio_stl_coords_t& coords) aiVector3D* vec3, const gmio_stl_coords& coords)
{ {
*vec3 = *((aiVector3D*)&coords); *vec3 = *((aiVector3D*)&coords);
} }
GMIO_INLINE void copy_aiVector3D( GMIO_INLINE void copy_aiVector3D(
gmio_stl_coords_t* coords, const aiVector3D& vec3) gmio_stl_coords* coords, const aiVector3D& vec3)
{ {
*coords = *((gmio_stl_coords_t*)&vec3); *coords = *((gmio_stl_coords*)&vec3);
} }
namespace BmkAssimp { namespace BmkAssimp {
@ -149,7 +153,7 @@ static void func_ascii_begin_solid(
} }
static void binary_begin_solid( static void binary_begin_solid(
void* cookie, uint32_t tri_count, const gmio_stlb_header_t* /*header*/) void* cookie, uint32_t tri_count, const gmio_stlb_header* /*header*/)
{ {
aiSceneHelper* helper = (aiSceneHelper*)cookie; aiSceneHelper* helper = (aiSceneHelper*)cookie;
helper->hasToCountTriangle = 0; // false helper->hasToCountTriangle = 0; // false
@ -166,7 +170,7 @@ static void binary_begin_solid(
} }
static void add_triangle( static void add_triangle(
void* cookie, uint32_t tri_id, const gmio_stl_triangle_t* triangle) void* cookie, uint32_t tri_id, const gmio_stl_triangle* triangle)
{ {
aiSceneHelper* helper = (aiSceneHelper*)cookie; aiSceneHelper* helper = (aiSceneHelper*)cookie;
aiScene* pScene = helper->scene; aiScene* pScene = helper->scene;
@ -253,7 +257,7 @@ static void end_solid(void* cookie)
} }
static void get_triangle( static void get_triangle(
const void* cookie, uint32_t tri_id, gmio_stl_triangle_t* triangle) const void* cookie, uint32_t tri_id, gmio_stl_triangle* triangle)
{ {
const aiMesh* mesh = (const aiMesh*)cookie; const aiMesh* mesh = (const aiMesh*)cookie;
const aiFace& f = mesh->mFaces[tri_id]; const aiFace& f = mesh->mFaces[tri_id];
@ -280,14 +284,14 @@ static void get_triangle(
static void stl_read(const char* filepath) static void stl_read(const char* filepath)
{ {
gmio_stl_mesh_creator_t mesh_creator = { 0 }; gmio_stl_mesh_creator mesh_creator = {};
mesh_creator.cookie = &globalSceneHelper; mesh_creator.cookie = &globalSceneHelper;
mesh_creator.func_ascii_begin_solid = func_ascii_begin_solid; mesh_creator.func_ascii_begin_solid = func_ascii_begin_solid;
mesh_creator.func_binary_begin_solid = binary_begin_solid; mesh_creator.func_binary_begin_solid = binary_begin_solid;
mesh_creator.func_add_triangle = add_triangle; mesh_creator.func_add_triangle = add_triangle;
mesh_creator.func_end_solid = end_solid; mesh_creator.func_end_solid = end_solid;
const int error = gmio_stl_read_file(filepath, &mesh_creator, NULL); const int error = gmio_stl_read_file(filepath, NULL, &mesh_creator);
if (error != GMIO_ERROR_OK) if (error != GMIO_ERROR_OK)
printf("gmio error: 0x%X\n", error); printf("gmio error: 0x%X\n", error);
@ -296,19 +300,19 @@ static void stl_read(const char* filepath)
// << totalTriangleCount(scene) << std::endl; // << totalTriangleCount(scene) << std::endl;
} }
static void stl_write(const char* filepath, gmio_stl_format_t format) static void stl_write(const char* filepath, gmio_stl_format format)
{ {
const aiMesh* sceneMesh = globalSceneHelper.scene->mMeshes[0]; const aiMesh* sceneMesh = globalSceneHelper.scene->mMeshes[0];
gmio_stl_mesh_t mesh = { 0 }; gmio_stl_mesh mesh = {};
mesh.cookie = sceneMesh; mesh.cookie = sceneMesh;
mesh.triangle_count = sceneMesh->mNumFaces; mesh.triangle_count = sceneMesh->mNumFaces;
mesh.func_get_triangle = get_triangle; mesh.func_get_triangle = get_triangle;
gmio_stl_write_options_t opts = { 0 }; gmio_stl_write_options opts = {};
opts.stla_float32_format = GMIO_FLOAT_TEXT_FORMAT_SHORTEST_UPPERCASE; opts.stla_float32_format = GMIO_FLOAT_TEXT_FORMAT_SHORTEST_UPPERCASE;
opts.stla_float32_prec = 7; opts.stla_float32_prec = 7;
const int error = gmio_stl_write_file(format, filepath, &mesh, NULL, &opts); const int error = gmio_stl_write_file(filepath, NULL, &mesh, format, &opts);
if (error != GMIO_ERROR_OK) if (error != GMIO_ERROR_OK)
printf("gmio error: 0x%X\n", error); printf("gmio error: 0x%X\n", error);
} }
@ -352,7 +356,7 @@ int main(int argc, char** argv)
std::cout << std::endl << "Input file: " << filepath << std::endl; std::cout << std::endl << "Input file: " << filepath << std::endl;
/* Declare benchmarks */ /* Declare benchmarks */
const benchmark_cmp_arg_t cmp_args[] = { const benchmark_cmp_arg cmp_args[] = {
{ "read", { "read",
BmkGmio::stl_read, filepath, BmkGmio::stl_read, filepath,
BmkAssimp::import, filepath }, BmkAssimp::import, filepath },
@ -369,16 +373,16 @@ int main(int argc, char** argv)
}; };
/* Execute benchmarks */ /* Execute benchmarks */
std::vector<benchmark_cmp_result_t> cmp_res_vec; std::vector<benchmark_cmp_result> cmp_res_vec;
cmp_res_vec.resize(sizeof(cmp_args) / sizeof(benchmark_cmp_arg_t) - 1); cmp_res_vec.resize(sizeof(cmp_args) / sizeof(benchmark_cmp_arg) - 1);
benchmark_cmp_batch( benchmark_cmp_batch(
5, &cmp_args[0], &cmp_res_vec[0], &bmk_init, &bmk_cleanup); 5, &cmp_args[0], &cmp_res_vec[0], &bmk_init, &bmk_cleanup);
/* Print results */ /* Print results */
const benchmark_cmp_result_array_t res_array = { const benchmark_cmp_result_array res_array = {
&cmp_res_vec.at(0), cmp_res_vec.size() }; &cmp_res_vec.at(0), cmp_res_vec.size() };
const std::string assimp_ver = BmkAssimp::assimp_version_str(); const std::string assimp_ver = BmkAssimp::assimp_version_str();
const benchmark_cmp_result_header_t header = { "gmio", assimp_ver.c_str() }; const benchmark_cmp_result_header header = { "gmio", assimp_ver.c_str() };
benchmark_print_results( benchmark_print_results(
BENCHMARK_PRINT_FORMAT_MARKDOWN, header, res_array); BENCHMARK_PRINT_FORMAT_MARKDOWN, header, res_array);
} }

3
benchmarks/benchmark_gmio/main.c
View File

@ -120,7 +120,8 @@ static void readwrite_binary_begin_solid(
static void readwrite_get_triangle( static void readwrite_get_triangle(
const void* cookie, uint32_t tri_id, struct gmio_stl_triangle* triangle) const void* cookie, uint32_t tri_id, struct gmio_stl_triangle* triangle)
{ {
const struct gmio_stl_triangle* tri_array = (const struct gmio_stl_triangle*)cookie; const struct gmio_stl_triangle* tri_array =
(const struct gmio_stl_triangle*)cookie;
*triangle = tri_array[tri_id]; *triangle = tri_array[tri_id];
} }

25
benchmarks/benchmark_opencascade/main.cpp
View File

@ -20,6 +20,7 @@
#include <gmio_core/error.h> #include <gmio_core/error.h>
#include <gmio_stl/stl_io.h> #include <gmio_stl/stl_io.h>
#include <gmio_stl/stl_io_options.h>
#include <gmio_support/stl_occ.h> #include <gmio_support/stl_occ.h>
#include "../commons/benchmark_tools.h" #include "../commons/benchmark_tools.h"
@ -58,21 +59,21 @@ Handle_StlMesh_Mesh stlMesh;
static void stl_read(const char* filepath) static void stl_read(const char* filepath)
{ {
stlMesh = new StlMesh_Mesh; stlMesh = new StlMesh_Mesh;
gmio_stl_mesh_creator_t mesh_creator = gmio_stl_hnd_occmesh_creator(stlMesh); gmio_stl_mesh_creator mesh_creator = gmio_stl_hnd_occmesh_creator(stlMesh);
int error = gmio_stl_read_file(filepath, &mesh_creator, NULL); int error = gmio_stl_read_file(filepath, NULL, &mesh_creator);
if (error != GMIO_ERROR_OK) if (error != GMIO_ERROR_OK)
printf("gmio error: 0x%X\n", error); printf("gmio error: 0x%X\n", error);
} }
static void stl_write(const char* filepath, gmio_stl_format_t format) static void stl_write(const char* filepath, gmio_stl_format format)
{ {
const gmio_occ_stl_mesh_domain_t occ_mesh_domain(stlMesh); const gmio_occ_stl_mesh_domain occ_mesh_domain(stlMesh);
const gmio_stl_mesh_t mesh = gmio_stl_occmesh(&occ_mesh_domain); const gmio_stl_mesh mesh = gmio_stl_occmesh(&occ_mesh_domain);
gmio_stl_write_options_t opts = { 0 }; gmio_stl_write_options opts = {};
opts.stla_float32_format = GMIO_FLOAT_TEXT_FORMAT_SHORTEST_UPPERCASE; opts.stla_float32_format = GMIO_FLOAT_TEXT_FORMAT_SHORTEST_UPPERCASE;
opts.stla_float32_prec = 7; opts.stla_float32_prec = 7;
const int error = gmio_stl_write_file(format, filepath, &mesh, NULL, &opts); const int error = gmio_stl_write_file(filepath, NULL, &mesh, format, &opts);
if (error != GMIO_ERROR_OK) if (error != GMIO_ERROR_OK)
printf("gmio error: 0x%X\n", error); printf("gmio error: 0x%X\n", error);
} }
@ -101,7 +102,7 @@ int main(int argc, char** argv)
std::cout << std::endl << "Input file: " << filepath << std::endl; std::cout << std::endl << "Input file: " << filepath << std::endl;
/* Declare benchmarks */ /* Declare benchmarks */
const benchmark_cmp_arg_t cmp_args[] = { const benchmark_cmp_arg cmp_args[] = {
{ "read", { "read",
BmkGmio::stl_read, filepath, BmkGmio::stl_read, filepath,
BmkOcc::RWStl_ReadFile, filepath }, BmkOcc::RWStl_ReadFile, filepath },
@ -118,14 +119,14 @@ int main(int argc, char** argv)
}; };
/* Execute benchmarks */ /* Execute benchmarks */
std::vector<benchmark_cmp_result_t> cmp_res_vec; std::vector<benchmark_cmp_result> cmp_res_vec;
cmp_res_vec.resize(sizeof(cmp_args) / sizeof(benchmark_cmp_arg_t) - 1); cmp_res_vec.resize(sizeof(cmp_args) / sizeof(benchmark_cmp_arg) - 1);
benchmark_cmp_batch(5, &cmp_args[0], &cmp_res_vec[0], NULL, NULL); benchmark_cmp_batch(5, &cmp_args[0], &cmp_res_vec[0], NULL, NULL);
/* Print results */ /* Print results */
const benchmark_cmp_result_array_t res_array = { const benchmark_cmp_result_array res_array = {
&cmp_res_vec.at(0), cmp_res_vec.size() }; &cmp_res_vec.at(0), cmp_res_vec.size() };
const benchmark_cmp_result_header_t header = { const benchmark_cmp_result_header header = {
"gmio", "OpenCascade v"OCC_VERSION_COMPLETE }; "gmio", "OpenCascade v"OCC_VERSION_COMPLETE };
benchmark_print_results( benchmark_print_results(
BENCHMARK_PRINT_FORMAT_MARKDOWN, header, res_array); BENCHMARK_PRINT_FORMAT_MARKDOWN, header, res_array);