GitHub-Proxy/PrusaSlicer
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/prusa3d/PrusaSlicer.git synced 2025-08-16 20:35:56 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

format/AnycubicSLA: use float instead of float_t (#11036)

Browse Source
This commit is contained in:
Adrian Bunk 2023-09-19 11:12:11 +03:00 committed by GitHub
parent 49306cdfce
commit 1a4a31e929
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
src/libslic3r/Format/AnycubicSLA.cpp
View File

@ -110,21 +110,21 @@ typedef struct anycubicsla_format_header
{ {
char tag[12]; char tag[12];
std::uint32_t payload_size; std::uint32_t payload_size;
std::float_t pixel_size_um; float pixel_size_um;
std::float_t layer_height_mm; float layer_height_mm;
std::float_t exposure_time_s; float exposure_time_s;
std::float_t delay_before_exposure_s; float delay_before_exposure_s;
std::float_t bottom_exposure_time_s; float bottom_exposure_time_s;
std::float_t bottom_layer_count; float bottom_layer_count;
std::float_t lift_distance_mm; float lift_distance_mm;
std::float_t lift_speed_mms; float lift_speed_mms;
std::float_t retract_speed_mms; float retract_speed_mms;
std::float_t volume_ml; float volume_ml;
std::uint32_t antialiasing; std::uint32_t antialiasing;
std::uint32_t res_x; std::uint32_t res_x;
std::uint32_t res_y; std::uint32_t res_y;
std::float_t weight_g; float weight_g;
std::float_t price; float price;
std::uint32_t price_currency; std::uint32_t price_currency;
std::uint32_t per_layer_override; // ? unknown meaning ? std::uint32_t per_layer_override; // ? unknown meaning ?
std::uint32_t print_time_s; std::uint32_t print_time_s;
@ -155,19 +155,19 @@ typedef struct anycubicsla_format_layer
{ {
std::uint32_t image_offset; std::uint32_t image_offset;
std::uint32_t image_size; std::uint32_t image_size;
std::float_t lift_distance_mm; float lift_distance_mm;
std::float_t lift_speed_mms; float lift_speed_mms;
std::float_t exposure_time_s; float exposure_time_s;
std::float_t layer_height_mm; float layer_height_mm;
std::float_t layer44; // unkown - usually 0 float layer44; // unkown - usually 0
std::float_t layer48; // unkown - usually 0 float layer48; // unkown - usually 0
} anycubicsla_format_layer; } anycubicsla_format_layer;
typedef struct anycubicsla_format_misc typedef struct anycubicsla_format_misc
{ {
std::float_t bottom_layer_height_mm; float bottom_layer_height_mm;
std::float_t bottom_lift_distance_mm; float bottom_lift_distance_mm;
std::float_t bottom_lift_speed_mms; float bottom_lift_speed_mms;
} anycubicsla_format_misc; } anycubicsla_format_misc;
@ -198,9 +198,9 @@ private:
namespace { namespace {
std::float_t get_cfg_value_f(const DynamicConfig &cfg, float get_cfg_value_f(const DynamicConfig &cfg,
const std::string &key, const std::string &key,
const std::float_t &def = 0.f) const float &def = 0.f)
{ {
if (cfg.has(key)) { if (cfg.has(key)) {
if (auto opt = cfg.option(key)) if (auto opt = cfg.option(key))
@ -282,10 +282,10 @@ void fill_header(anycubicsla_format_header &h,
{ {
CNumericLocalesSetter locales_setter; CNumericLocalesSetter locales_setter;
std::float_t bottle_weight_g; float bottle_weight_g;
std::float_t bottle_volume_ml; float bottle_volume_ml;
std::float_t bottle_cost; float bottle_cost;
std::float_t material_density; float material_density;
auto &cfg = print.full_print_config(); auto &cfg = print.full_print_config();
auto mat_opt = cfg.option("material_notes"); auto mat_opt = cfg.option("material_notes");
std::string mnotes = mat_opt? cfg.option("material_notes")->serialize() : ""; std::string mnotes = mat_opt? cfg.option("material_notes")->serialize() : "";
@ -422,7 +422,7 @@ static void anycubicsla_write_int32(std::ofstream &out, std::uint32_t val)
out.write((const char *) &i3, 1); out.write((const char *) &i3, 1);
out.write((const char *) &i4, 1); out.write((const char *) &i4, 1);
} }
static void anycubicsla_write_float(std::ofstream &out, std::float_t val) static void anycubicsla_write_float(std::ofstream &out, float val)
{ {
std::uint32_t *f = (std::uint32_t *) &val; std::uint32_t *f = (std::uint32_t *) &val;
anycubicsla_write_int32(out, *f); anycubicsla_write_int32(out, *f);