v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

More whitespace consistency

pull/931/head
Fabian Herb 2016-07-01 17:02:54 +02:00
parent 616aa022a7
commit 3c7dd2b302
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
code/C4DImporter.cpp
View File

@ -292,7 +292,7 @@ void C4DImporter::ReadMaterials(melange::BaseMaterial* mat)
mat->GetParameter(MATERIAL_COLOR_COLOR, data); mat->GetParameter(MATERIAL_COLOR_COLOR, data);
Vector color = data.GetVector(); Vector color = data.GetVector();
mat->GetParameter(MATERIAL_COLOR_BRIGHTNESS, data); mat->GetParameter(MATERIAL_COLOR_BRIGHTNESS, data);
const Float brightness = data.GetFloat(); const Float brightness = data.GetFloat();
color *= brightness; color *= brightness;
@ -511,13 +511,13 @@ aiMesh* C4DImporter::ReadMesh(BaseObject* object)
// copy normals // copy normals
if (normals_src) { if (normals_src) {
if(i >= normals_src->GetDataCount()) { if(i >= normals_src->GetDataCount()) {
LogError("unexpected number of normals, ignoring"); LogError("unexpected number of normals, ignoring");
} }
else { else {
ConstNormalHandle normal_handle = normals_src->GetDataAddressR(); ConstNormalHandle normal_handle = normals_src->GetDataAddressR();
NormalStruct nor; NormalStruct nor;
NormalTag::Get(normal_handle, i, nor); NormalTag::Get(normal_handle, i, nor);
normals->x = nor.a.x; normals->x = nor.a.x;
normals->y = nor.a.y; normals->y = nor.a.y;
normals->z = nor.a.z; normals->z = nor.a.z;

12
code/C4DImporter.h
View File

@ -103,17 +103,17 @@ protected:
private: private:
void ReadMaterials(melange::BaseMaterial* mat); void ReadMaterials(melange::BaseMaterial* mat);
void RecurseHierarchy(melange::BaseObject* object, aiNode* parent); void RecurseHierarchy(melange::BaseObject* object, aiNode* parent);
aiMesh* ReadMesh(melange::BaseObject* object); aiMesh* ReadMesh(melange::BaseObject* object);
unsigned int ResolveMaterial(melange::PolygonObject* obj); unsigned int ResolveMaterial(melange::PolygonObject* obj);
bool ReadShader(aiMaterial* out, melange::BaseShader* shader); bool ReadShader(aiMaterial* out, melange::BaseShader* shader);
std::vector<aiMesh*> meshes; std::vector<aiMesh*> meshes;
std::vector<aiMaterial*> materials; std::vector<aiMaterial*> materials;
typedef std::map<melange::BaseMaterial*, unsigned int> MaterialMap; typedef std::map<melange::BaseMaterial*, unsigned int> MaterialMap;
MaterialMap material_mapping; MaterialMap material_mapping;
}; // !class C4DImporter }; // !class C4DImporter