Page MenuHome
Differential D1094 Diff 3453 source/blender/collada/DocumentImporter.cpp

Changeset View

Standalone View

View Options

source/blender/collada/DocumentImporter.cpp

Context not available.
else if (shader == COLLADAFW::EffectCommon::SHADER_LAMBERT) { else if (shader == COLLADAFW::EffectCommon::SHADER_LAMBERT) {
gaiaclaryAuthorUnsubmitted
Not Done
Inline Actions

reduce redundancy:

else if (shader == COLLADAFW::EffectCommon::SHADER_CONSTANT) {
   ma->mode = MA_SHLESS;
 }
 else {
   // default - lambert
   ma->diff_shader = MA_DIFF_LAMBERT;
 }
gaiaclary: reduce redundancy: else if (shader == COLLADAFW::EffectCommon::SHADER_CONSTANT) { ma…
ma->diff_shader = MA_DIFF_LAMBERT; ma->diff_shader = MA_DIFF_LAMBERT;
} }
else if (shader == COLLADAFW::EffectCommon::SHADER_CONSTANT) {
ma->mode = MA_SHLESS;
}
// default - lambert // default - lambert
else { else {
ma->diff_shader = MA_DIFF_LAMBERT; ma->diff_shader = MA_DIFF_LAMBERT;
Context not available.
COLLADAFW::Texture ctex = ef->getEmission().getTexture(); COLLADAFW::Texture ctex = ef->getEmission().getTexture();
mtex = create_texture(ef, ctex, ma, i, texindex_texarray_map); mtex = create_texture(ef, ctex, ma, i, texindex_texarray_map);
if (mtex != NULL) { if (mtex != NULL) {
mtex->mapto = MAP_EMIT; if(shader == COLLADAFW::EffectCommon::SHADER_CONSTANT)
mtex->mapto = MAP_COL;
else
mtex->mapto = MAP_EMIT;
i++; i++;
} }
} }
Context not available.
} }
} }
#endif #endif
if (shader == COLLADAFW::EffectCommon::SHADER_CONSTANT) {
float a,b,c,d,e,f;
sergeyUnsubmitted
Not Done
Inline Actions

Would think variable names can be improved here, also perhaps using array instead of decoupled variables. Like:

int emission[3];
sergey: Would think variable names can be improved here, also perhaps using array instead of decoupled…
gaiaclaryAuthorUnsubmitted
Not Done
Inline Actions

float emission[3];
float ambience[3];
Then you maybe can make use of the Blender's vector functions for adding the colors...

gaiaclary: float emission[3]; float ambience[3]; Then you maybe can make use of the Blender's vector…
a=0,b=0,c=0,d=0,e=0,f=0;
COLLADAFW::Color col_emmission,col_ambient;
if(ef->getEmission().isValid()) {
sergeyUnsubmitted
Not Done
Inline Actions

Space between "if" and "(".

sergey: Space between "if" and "(".
col_emmission = ef->getEmission().getColor();
sergeyUnsubmitted
Not Done
Inline Actions

Indentation seems to be broken.

sergey: Indentation seems to be broken.
a = col_emmission.getRed();
b = col_emmission.getGreen();
c = col_emmission.getBlue();
}
if( ef->getAmbient().isValid()) {
col_ambient = ef->getAmbient().getColor();
sergeyUnsubmitted
Not Done
Inline Actions

Same.

sergey: Same.
d = col_ambient.getRed();
e = col_ambient.getGreen();
f = col_ambient.getBlue();
}
if(ef->getEmission().isValid()) {
ma->r = a+d;
ma->g = b+e;
ma->b = c+f;
}
gaiaclaryAuthorUnsubmitted
Not Done
Inline Actions

What happens when ambient and emission are defined? then the sum could become > 1. What will blender do in that case? is this possible after all? (maybe the collada specifications tell how to merge ambient and emission... Could you add some minimal comment here please?)

gaiaclary: What happens when ambient and emission are defined? then the sum could become > 1. What will…
}
material_texture_mapping_map[ma] = texindex_texarray_map; material_texture_mapping_map[ma] = texindex_texarray_map;
} }
Context not available.