bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

Collada: renamed size_mat to scale_mat for clarity. removed obsolete variable definition

Browse Source
This commit is contained in:
Gaia Clary 2013-07-30 07:32:37 +00:00
parent 8140f56575
commit 90eec89125
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
source/blender/collada/collada_internal.cpp
View File

@ -40,7 +40,7 @@ UnitConverter::UnitConverter() : unit(), up_axis(COLLADAFW::FileInfo::Z_UP)
rotate_m4(y_up_mat4, 'X', 0.5 * M_PI); rotate_m4(y_up_mat4, 'X', 0.5 * M_PI);
unit_m4(z_up_mat4); unit_m4(z_up_mat4);
unit_m4(size_mat4); unit_m4(scale_mat4);
} }
void UnitConverter::read_asset(const COLLADAFW::FileInfo *asset) void UnitConverter::read_asset(const COLLADAFW::FileInfo *asset)
@ -127,7 +127,7 @@ float(&UnitConverter::get_rotation())[4][4]
float(&UnitConverter::get_scale())[4][4] float(&UnitConverter::get_scale())[4][4]
{ {
return size_mat4; return scale_mat4;
} }
void UnitConverter::calculate_scale(Scene &sce) void UnitConverter::calculate_scale(Scene &sce)
@ -160,13 +160,10 @@ void UnitConverter::calculate_scale(Scene &sce)
break; break;
} }
float axis_mat4[4][4];
unit_m4(axis_mat4);
float rescale[3]; float rescale[3];
rescale[0] = rescale[1] = rescale[2] = getLinearMeter() / bl_scale; 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) void TransformBase::decompose(float mat[4][4], float *loc, float eul[3], float quat[4], float *size)

2
source/blender/collada/collada_internal.h
View File

@ -50,7 +50,7 @@ private:
float x_up_mat4[4][4]; float x_up_mat4[4][4];
float y_up_mat4[4][4]; float y_up_mat4[4][4];
float z_up_mat4[4][4]; float z_up_mat4[4][4];
float size_mat4[4][4]; float scale_mat4[4][4];
public: public: