|
@@ -254,16 +254,28 @@ void D3MFExporter::writeBaseMaterials() {
|
|
if ( mat->Get( AI_MATKEY_COLOR_DIFFUSE, color ) == aiReturn_SUCCESS ) {
|
|
if ( mat->Get( AI_MATKEY_COLOR_DIFFUSE, color ) == aiReturn_SUCCESS ) {
|
|
hexDiffuseColor.clear();
|
|
hexDiffuseColor.clear();
|
|
tmp.clear();
|
|
tmp.clear();
|
|
- hexDiffuseColor = "#";
|
|
|
|
-
|
|
|
|
- tmp = DecimalToHexa( (ai_real) color.r );
|
|
|
|
- hexDiffuseColor += tmp;
|
|
|
|
- tmp = DecimalToHexa((ai_real)color.g);
|
|
|
|
- hexDiffuseColor += tmp;
|
|
|
|
- tmp = DecimalToHexa((ai_real)color.b);
|
|
|
|
- hexDiffuseColor += tmp;
|
|
|
|
- tmp = DecimalToHexa((ai_real)color.a);
|
|
|
|
- hexDiffuseColor += tmp;
|
|
|
|
|
|
+ // rgbs %
|
|
|
|
+ if(color.r <= 1 && color.g <= 1 && color.b <= 1 && color.a <= 1){
|
|
|
|
+
|
|
|
|
+ hexDiffuseColor = Rgba2Hex(
|
|
|
|
+ ((ai_real)color.r)*255,
|
|
|
|
+ ((ai_real)color.g)*255,
|
|
|
|
+ ((ai_real)color.b)*255,
|
|
|
|
+ ((ai_real)color.a)*255,
|
|
|
|
+ true
|
|
|
|
+ );
|
|
|
|
+
|
|
|
|
+ }else{
|
|
|
|
+ hexDiffuseColor = "#";
|
|
|
|
+ tmp = DecimalToHexa( (ai_real) color.r );
|
|
|
|
+ hexDiffuseColor += tmp;
|
|
|
|
+ tmp = DecimalToHexa((ai_real)color.g);
|
|
|
|
+ hexDiffuseColor += tmp;
|
|
|
|
+ tmp = DecimalToHexa((ai_real)color.b);
|
|
|
|
+ hexDiffuseColor += tmp;
|
|
|
|
+ tmp = DecimalToHexa((ai_real)color.a);
|
|
|
|
+ hexDiffuseColor += tmp;
|
|
|
|
+ }
|
|
} else {
|
|
} else {
|
|
hexDiffuseColor = "#FFFFFFFF";
|
|
hexDiffuseColor = "#FFFFFFFF";
|
|
}
|
|
}
|