Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2019-04-17 07:17:24 +0300
committerCampbell Barton <ideasman42@gmail.com>2019-04-17 07:21:24 +0300
commite12c08e8d170b7ca40f204a5b0423c23a9fbc2c1 (patch)
tree8cf3453d12edb177a218ef8009357518ec6cab6a /source/blender/collada/Materials.h
parentb3dabc200a4b0399ec6b81f2ff2730d07b44fcaa (diff)
ClangFormat: apply to source, most of intern
Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
Diffstat (limited to 'source/blender/collada/Materials.h')
-rw-r--r--source/blender/collada/Materials.h61
1 files changed, 30 insertions, 31 deletions
diff --git a/source/blender/collada/Materials.h b/source/blender/collada/Materials.h
index 3e6dcf896a7..445b9fd0758 100644
--- a/source/blender/collada/Materials.h
+++ b/source/blender/collada/Materials.h
@@ -32,47 +32,46 @@ extern "C" {
#include "COLLADAFWEffectCommon.h"
typedef enum BC_pbr_inputs {
- BC_PBR_DIFFUSE = 0,
- BC_PBR_METALLIC = 4,
- BC_PBR_IOR = 14,
+ BC_PBR_DIFFUSE = 0,
+ BC_PBR_METALLIC = 4,
+ BC_PBR_IOR = 14,
} BC_pbr_inputs;
typedef std::map<std::string, bNode *> NodeMap;
class MaterialNode {
-private:
- bContext *mContext;
- Material *material;
- COLLADAFW::EffectCommon *effect;
- UidImageMap *uid_image_map = nullptr;
- KeyImageMap *key_image_map = nullptr;
+ private:
+ bContext *mContext;
+ Material *material;
+ COLLADAFW::EffectCommon *effect;
+ UidImageMap *uid_image_map = nullptr;
+ KeyImageMap *key_image_map = nullptr;
- NodeMap node_map;
- bNodeTree *ntree;
+ NodeMap node_map;
+ bNodeTree *ntree;
- bNode *shader_node;
- bNode *output_node;
+ bNode *shader_node;
+ bNode *output_node;
- bNodeTree *prepare_material_nodetree();
- bNode *add_node(int node_type, int locx, int locy, std::string label);
- void add_link(bNode *from_node, int from_index, bNode *to_node, int to_index);
- bNode *add_texture_node(COLLADAFW::ColorOrTexture &cot, int locx, int locy, std::string label);
- void setShaderType();
-
-public:
- MaterialNode(bContext *C, COLLADAFW::EffectCommon *ef, Material *ma, UidImageMap &uid_image_map);
- MaterialNode(bContext *C, Material *ma, KeyImageMap &key_image_map);
- void set_diffuse(COLLADAFW::ColorOrTexture &cot, std::string label);
- Image *get_diffuse_image();
- void set_specular(COLLADAFW::ColorOrTexture &cot, std::string label);
- void set_ambient(COLLADAFW::ColorOrTexture &cot, std::string label);
- void set_reflective(COLLADAFW::ColorOrTexture &cot, std::string label);
- void set_emission(COLLADAFW::ColorOrTexture &cot, std::string label);
- void set_opacity(COLLADAFW::ColorOrTexture &cot, std::string label);
- void set_reflectivity(float val);
- void set_ior(float val);
+ bNodeTree *prepare_material_nodetree();
+ bNode *add_node(int node_type, int locx, int locy, std::string label);
+ void add_link(bNode *from_node, int from_index, bNode *to_node, int to_index);
+ bNode *add_texture_node(COLLADAFW::ColorOrTexture &cot, int locx, int locy, std::string label);
+ void setShaderType();
+ public:
+ MaterialNode(bContext *C, COLLADAFW::EffectCommon *ef, Material *ma, UidImageMap &uid_image_map);
+ MaterialNode(bContext *C, Material *ma, KeyImageMap &key_image_map);
+ void set_diffuse(COLLADAFW::ColorOrTexture &cot, std::string label);
+ Image *get_diffuse_image();
+ void set_specular(COLLADAFW::ColorOrTexture &cot, std::string label);
+ void set_ambient(COLLADAFW::ColorOrTexture &cot, std::string label);
+ void set_reflective(COLLADAFW::ColorOrTexture &cot, std::string label);
+ void set_emission(COLLADAFW::ColorOrTexture &cot, std::string label);
+ void set_opacity(COLLADAFW::ColorOrTexture &cot, std::string label);
+ void set_reflectivity(float val);
+ void set_ior(float val);
};
#endif