diff options
author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-05-02 17:05:02 +0300 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-05-02 17:05:04 +0300 |
commit | 7daeb1f9aee284d958abe87622b43c70c21af967 (patch) | |
tree | 16f8a16137ee4c602e2a8dcc98dbbdb081920e78 /source/blender/collada/EffectExporter.h | |
parent | 807c8c6e17b9e553a440edc246e19b665d507012 (diff) | |
parent | 3076d95ba441cd32706a27d18922a30f8fd28b8a (diff) |
Merge 'master' into 'collada'
Diffstat (limited to 'source/blender/collada/EffectExporter.h')
-rw-r--r-- | source/blender/collada/EffectExporter.h | 64 |
1 files changed, 34 insertions, 30 deletions
diff --git a/source/blender/collada/EffectExporter.h b/source/blender/collada/EffectExporter.h index cd267a586f2..75511800081 100644 --- a/source/blender/collada/EffectExporter.h +++ b/source/blender/collada/EffectExporter.h @@ -37,42 +37,46 @@ #include "ExportSettings.h" #include "collada_utils.h" -class EffectsExporter: COLLADASW::LibraryEffects -{ -public: - EffectsExporter(COLLADASW::StreamWriter *sw, BCExportSettings &export_settings, KeyImageMap &key_image_map); - void exportEffects(bContext *C, Scene *sce); +class EffectsExporter : COLLADASW::LibraryEffects { + public: + EffectsExporter(COLLADASW::StreamWriter *sw, + BCExportSettings &export_settings, + KeyImageMap &key_image_map); + void exportEffects(bContext *C, Scene *sce); - void operator()(Material *ma, Object *ob); + void operator()(Material *ma, Object *ob); - COLLADASW::ColorOrTexture createTexture(Image *ima, - std::string& uv_layer_name, - COLLADASW::Sampler *sampler - /*COLLADASW::Surface *surface*/); + COLLADASW::ColorOrTexture createTexture(Image *ima, + std::string &uv_layer_name, + COLLADASW::Sampler *sampler + /*COLLADASW::Surface *surface*/); - COLLADASW::ColorOrTexture getcol(float r, float g, float b, float a); -private: - void set_shader_type(COLLADASW::EffectProfile &ep, Material *ma); - void set_transparency(COLLADASW::EffectProfile &ep, Material *ma); - void set_diffuse_color(COLLADASW::EffectProfile &ep, Material *ma); - void set_reflectivity(COLLADASW::EffectProfile &ep, Material *ma); - void set_emission(COLLADASW::EffectProfile &ep, Material *ma); - void get_images(Material *ma, KeyImageMap &uid_image_map); - void create_image_samplers(COLLADASW::EffectProfile &ep, KeyImageMap &uid_image_map, std::string &active_uv); + COLLADASW::ColorOrTexture getcol(float r, float g, float b, float a); - void writeTextures( - COLLADASW::EffectProfile &ep, - std::string &key, - COLLADASW::Sampler *sampler, - MTex *t, Image *ima, - std::string &uvname ); + private: + void set_shader_type(COLLADASW::EffectProfile &ep, Material *ma); + void set_transparency(COLLADASW::EffectProfile &ep, Material *ma); + void set_diffuse_color(COLLADASW::EffectProfile &ep, Material *ma); + void set_reflectivity(COLLADASW::EffectProfile &ep, Material *ma); + void set_emission(COLLADASW::EffectProfile &ep, Material *ma); + void get_images(Material *ma, KeyImageMap &uid_image_map); + void create_image_samplers(COLLADASW::EffectProfile &ep, + KeyImageMap &uid_image_map, + std::string &active_uv); - bool hasEffects(Scene *sce); + void writeTextures(COLLADASW::EffectProfile &ep, + std::string &key, + COLLADASW::Sampler *sampler, + MTex *t, + Image *ima, + std::string &uvname); - BCExportSettings &export_settings; - KeyImageMap &key_image_map; - Scene *scene; - bContext *mContext; + bool hasEffects(Scene *sce); + + BCExportSettings &export_settings; + KeyImageMap &key_image_map; + Scene *scene; + bContext *mContext; }; #endif |