forked from bartvdbraak/blender
Collada: renamed size_mat to scale_mat for clarity. removed obsolete variable definition
This commit is contained in:
parent
8140f56575
commit
90eec89125
@ -40,7 +40,7 @@ UnitConverter::UnitConverter() : unit(), up_axis(COLLADAFW::FileInfo::Z_UP)
|
||||
rotate_m4(y_up_mat4, 'X', 0.5 * M_PI);
|
||||
|
||||
unit_m4(z_up_mat4);
|
||||
unit_m4(size_mat4);
|
||||
unit_m4(scale_mat4);
|
||||
}
|
||||
|
||||
void UnitConverter::read_asset(const COLLADAFW::FileInfo *asset)
|
||||
@ -127,7 +127,7 @@ float(&UnitConverter::get_rotation())[4][4]
|
||||
|
||||
float(&UnitConverter::get_scale())[4][4]
|
||||
{
|
||||
return size_mat4;
|
||||
return scale_mat4;
|
||||
}
|
||||
|
||||
void UnitConverter::calculate_scale(Scene &sce)
|
||||
@ -160,13 +160,10 @@ void UnitConverter::calculate_scale(Scene &sce)
|
||||
break;
|
||||
}
|
||||
|
||||
float axis_mat4[4][4];
|
||||
unit_m4(axis_mat4);
|
||||
|
||||
float rescale[3];
|
||||
rescale[0] = rescale[1] = rescale[2] = getLinearMeter() / bl_scale;
|
||||
|
||||
size_to_mat4(size_mat4, rescale);
|
||||
size_to_mat4(scale_mat4, rescale);
|
||||
}
|
||||
|
||||
void TransformBase::decompose(float mat[4][4], float *loc, float eul[3], float quat[4], float *size)
|
||||
|
@ -50,7 +50,7 @@ private:
|
||||
float x_up_mat4[4][4];
|
||||
float y_up_mat4[4][4];
|
||||
float z_up_mat4[4][4];
|
||||
float size_mat4[4][4];
|
||||
float scale_mat4[4][4];
|
||||
|
||||
public:
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user