Skip to content

Commit

Permalink
Updated snapshot to 1.2.5
Browse files Browse the repository at this point in the history
* On average 10% faster decoding
* Improved Javascript metadata API
* Bug fixes
  • Loading branch information
ondys committed Jan 12, 2018
1 parent 3ea3cd8 commit 3faff31
Show file tree
Hide file tree
Showing 66 changed files with 1,129 additions and 609 deletions.
75 changes: 43 additions & 32 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -529,6 +529,7 @@ set(draco_metadata_dec_sources
"${draco_src_root}/metadata/metadata_decoder.cc"
"${draco_src_root}/metadata/metadata_decoder.h")


set(draco_js_dec_sources
"${draco_src_root}/javascript/emscripten/decoder_webidl_wrapper.cc"
"${draco_src_root}/javascript/emscripten/draco_decoder_glue_wrapper.cc")
Expand All @@ -537,6 +538,7 @@ set(draco_js_enc_sources
"${draco_src_root}/javascript/emscripten/draco_encoder_glue_wrapper.cc"
"${draco_src_root}/javascript/emscripten/encoder_webidl_wrapper.cc")


set(draco_test_sources
"${draco_src_root}/attributes/point_attribute_test.cc"
"${draco_src_root}/compression/attributes/prediction_schemes/prediction_scheme_normal_octahedron_canonicalized_transform_test.cc"
Expand Down Expand Up @@ -631,6 +633,7 @@ if (EMSCRIPTEN)
message(FATAL_ERROR "Glue generation failed.")
endif ()


# Add a custom rule depending on the IDL to regenerate
# ${draco_build_dir}/glue_decoder.cpp as needed.
add_custom_command(OUTPUT ${draco_build_dir}/glue_decoder.cpp
Expand All @@ -653,48 +656,55 @@ if (EMSCRIPTEN)
WORKING_DIRECTORY ${draco_build_dir}
VERBATIM)


# Add path to glue_decoder.cpp to draco include paths.
include_directories("${draco_build_dir}")

set(draco_decoder_src
${draco_attributes_sources}
${draco_compression_attributes_dec_sources}
${draco_compression_attributes_pred_schemes_dec_sources}
${draco_compression_decode_sources}
${draco_compression_mesh_dec_sources}
${draco_compression_point_cloud_dec_sources}
${draco_core_sources}
${draco_core_bit_coders_sources}
${draco_dec_config_sources}
${draco_io_sources}
${draco_mesh_sources}
${draco_metadata_dec_sources}
${draco_metadata_sources}
${draco_point_cloud_sources}
${draco_points_dec_sources}
${draco_version_sources})
set(draco_encoder_src
${draco_attributes_sources}
${draco_compression_attributes_enc_sources}
${draco_compression_attributes_pred_schemes_enc_sources}
${draco_compression_encode_sources}
${draco_compression_mesh_enc_sources}
${draco_compression_point_cloud_enc_sources}
${draco_core_sources}
${draco_core_bit_coders_sources}
${draco_enc_config_sources}
${draco_io_sources}
${draco_mesh_sources}
${draco_metadata_enc_sources}
${draco_metadata_sources}
${draco_point_cloud_sources}
${draco_points_enc_sources}
${draco_version_sources})


add_executable(draco_decoder
${draco_attributes_sources}
${draco_compression_attributes_dec_sources}
${draco_compression_attributes_pred_schemes_dec_sources}
${draco_compression_decode_sources}
${draco_compression_mesh_dec_sources}
${draco_compression_point_cloud_dec_sources}
${draco_core_sources}
${draco_core_bit_coders_sources}
${draco_dec_config_sources}
${draco_io_sources}
${draco_mesh_sources}
${draco_metadata_dec_sources}
${draco_metadata_sources}
${draco_point_cloud_sources}
${draco_points_dec_sources}
${draco_js_dec_sources}
${draco_version_sources})
${draco_decoder_src})
append_link_flag_to_target(draco_decoder
"-s EXPORT_NAME=\"'DracoDecoderModule'\"")

add_executable(draco_encoder
${draco_attributes_sources}
${draco_compression_attributes_enc_sources}
${draco_compression_attributes_pred_schemes_enc_sources}
${draco_compression_encode_sources}
${draco_compression_mesh_enc_sources}
${draco_compression_point_cloud_enc_sources}
${draco_core_sources}
${draco_core_bit_coders_sources}
${draco_enc_config_sources}
${draco_io_sources}
${draco_mesh_sources}
${draco_metadata_enc_sources}
${draco_metadata_sources}
${draco_point_cloud_sources}
${draco_points_enc_sources}
${draco_js_enc_sources}
${draco_version_sources})
${draco_encoder_src})
append_link_flag_to_target(draco_encoder
"-s EXPORT_NAME=\"'DracoEncoderModule'\"")

Expand Down Expand Up @@ -723,6 +733,7 @@ if (EMSCRIPTEN)
em_link_post_js(draco_encoder
"${draco_build_dir}/glue_encoder.js"
"${draco_src_root}/javascript/emscripten/finalize.js")

else ()
# Standard Draco libs, encoder and decoder.
# Object collections that mirror the Draco directory structure.
Expand Down
5 changes: 5 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,11 @@

News
=======
### Version 1.2.5 release
* On average 10% faster decoding
* Improved Javascript metadata API
* Bug fixes

### Version 1.2.4 release
* Up to 20% faster decoding
* Added support for integer attributes to our Javascript Encoder
Expand Down
13 changes: 7 additions & 6 deletions javascript/draco_decoder.js

Large diffs are not rendered by default.

Binary file modified javascript/draco_decoder.wasm
Binary file not shown.
11 changes: 6 additions & 5 deletions javascript/draco_decoder_gltf.js

Large diffs are not rendered by default.

Binary file modified javascript/draco_decoder_gltf.wasm
Binary file not shown.
12 changes: 6 additions & 6 deletions javascript/draco_encoder.js

Large diffs are not rendered by default.

Loading

0 comments on commit 3faff31

Please sign in to comment.