Skip to content

D
deprecated-irrlicht-mac
Commit af0ccd9d authored by cutealien's avatar cutealien
Browse files
Options

Clean up some confusing variable naming in ColladaMeshWriter and build some... 

Clean up some confusing variable naming in ColladaMeshWriter and build some id-string together a little earlier to not create it that often unnecessarily.

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@4271 dfc29bdd-3216-0410-991c-e03cc46cb475
parent 78e936aa
Hide whitespace changes
Inline Side-by-side
Showing with 35 additions and 34 deletions
source/Irrlicht/CColladaMeshWriter.cpp
View file @ af0ccd9d
...@@ -490,15 +490,16 @@ void CColladaMeshWriter::writeNodeEffects(irr::scene::ISceneNode * node) ...@@ -490,15 +490,16 @@ void CColladaMeshWriter::writeNodeEffects(irr::scene::ISceneNode * node)
} }
else else
{ {
irr::core::stringw nodename(nameForNode(node)); irr::core::stringw uvname(nameForMesh(mesh));
irr::core::stringw meshname(nameForMesh(mesh)); // still need meshname for textures uvname += L"-TexCoord0"; // TODO: need to handle second UV-set
// write node materials // write node materials
for (u32 i=0; i<node->getMaterialCount(); ++i) for (u32 i=0; i<node->getMaterialCount(); ++i)
{ {
video::SMaterial & material = node->getMaterial(i); video::SMaterial & material = node->getMaterial(i);
irr::core::stringw materialname(nameForMaterial(material, i, mesh, node)); irr::core::stringw materialfxname(nameForMaterial(material, i, mesh, node));
materialname += L"-fx"; materialfxname += L"-fx";
writeMaterialEffect(meshname, materialname, material); writeMaterialEffect(uvname, materialfxname, material);
} }
} }
} }
...@@ -1104,15 +1105,15 @@ void CColladaMeshWriter::writeMeshMaterials(scene::IMesh* mesh) ...@@ -1104,15 +1105,15 @@ void CColladaMeshWriter::writeMeshMaterials(scene::IMesh* mesh)
} }
} }
void CColladaMeshWriter::writeMaterialEffect(const irr::core::stringw& meshname, const irr::core::stringw& materialname, const video::SMaterial & material) void CColladaMeshWriter::writeMaterialEffect(const irr::core::stringw& uvname, const irr::core::stringw& materialfxname, const video::SMaterial & material)
{ {
if ( EffectsWritten.find(materialname) ) if ( EffectsWritten.find(materialfxname) )
return; return;
EffectsWritten.insert(materialname, true); EffectsWritten.insert(materialfxname, true);
Writer->writeElement(L"effect", false, Writer->writeElement(L"effect", false,
L"id", materialname.c_str(), L"id", materialfxname.c_str(),
L"name", materialname.c_str()); L"name", materialfxname.c_str());
Writer->writeLineBreak(); Writer->writeLineBreak();
Writer->writeElement(L"profile_COMMON", false); Writer->writeElement(L"profile_COMMON", false);
Writer->writeLineBreak(); Writer->writeLineBreak();
...@@ -1228,7 +1229,7 @@ void CColladaMeshWriter::writeMaterialEffect(const irr::core::stringw& meshname, ...@@ -1228,7 +1229,7 @@ void CColladaMeshWriter::writeMaterialEffect(const irr::core::stringw& meshname,
Writer->writeLineBreak(); Writer->writeLineBreak();
E_COLLADA_TECHNIQUE_FX techFx = getProperties() ? getProperties()->getTechniqueFx(material) : ECTF_BLINN; E_COLLADA_TECHNIQUE_FX techFx = getProperties() ? getProperties()->getTechniqueFx(material) : ECTF_BLINN;
writeFxElement(meshname, material, techFx); writeFxElement(uvname, material, techFx);
Writer->writeClosingTag(L"technique"); Writer->writeClosingTag(L"technique");
Writer->writeLineBreak(); Writer->writeLineBreak();
...@@ -1240,13 +1241,15 @@ void CColladaMeshWriter::writeMaterialEffect(const irr::core::stringw& meshname, ...@@ -1240,13 +1241,15 @@ void CColladaMeshWriter::writeMaterialEffect(const irr::core::stringw& meshname,
void CColladaMeshWriter::writeMeshEffects(scene::IMesh* mesh) void CColladaMeshWriter::writeMeshEffects(scene::IMesh* mesh)
{ {
const irr::core::stringw meshname(nameForMesh(mesh)); irr::core::stringw uvname(nameForMesh(mesh));
uvname += L"-TexCoord0"; // TODO: need to handle second UV-set
for (u32 i=0; i<mesh->getMeshBufferCount(); ++i) for (u32 i=0; i<mesh->getMeshBufferCount(); ++i)
{ {
video::SMaterial & material = mesh->getMeshBuffer(i)->getMaterial(); video::SMaterial & material = mesh->getMeshBuffer(i)->getMaterial();
irr::core::stringw materialname(nameForMaterial(material, i, mesh, NULL)); irr::core::stringw materialfxname(nameForMaterial(material, i, mesh, NULL));
materialname += L"-fx"; materialfxname += L"-fx";
writeMaterialEffect(meshname, materialname, material); writeMaterialEffect(uvname, materialfxname, material);
} }
} }
...@@ -1374,7 +1377,7 @@ void CColladaMeshWriter::writeMeshGeometry(const irr::core::stringw& meshname, s ...@@ -1374,7 +1377,7 @@ void CColladaMeshWriter::writeMeshGeometry(const irr::core::stringw& meshname, s
// write texture coordinates // write texture coordinates
core::stringw meshTexCoord0Id(meshId); core::stringw meshTexCoord0Id(meshId);
meshTexCoord0Id += L"-TexCoord0"; meshTexCoord0Id += L"-TexCoord0";
Writer->writeElement(L"source", false, L"id", meshTexCoord0Id.c_str()); Writer->writeElement(L"source", false, L"id", meshTexCoord0Id.c_str());
Writer->writeLineBreak(); Writer->writeLineBreak();
...@@ -1843,20 +1846,18 @@ video::SColor CColladaMeshWriter::getColorMapping(const video::SMaterial & mater ...@@ -1843,20 +1846,18 @@ video::SColor CColladaMeshWriter::getColorMapping(const video::SMaterial & mater
return video::SColor(255, 0, 0, 0); return video::SColor(255, 0, 0, 0);
} }
void CColladaMeshWriter::writeTextureSampler(const irr::core::stringw& meshname, s32 textureIdx) void CColladaMeshWriter::writeTextureSampler(const irr::core::stringw& uvname, s32 textureIdx)
{ {
irr::core::stringw sampler(L"tex"); irr::core::stringw sampler(L"tex");
sampler += irr::core::stringw(textureIdx); sampler += irr::core::stringw(textureIdx);
sampler += L"-sampler"; sampler += L"-sampler";
// <texture texture="sampler" texcoord="texCoord"/> // <texture texture="sampler" texcoord="texCoordUv"/>
core::stringw meshTexCoordId(meshname); Writer->writeElement(L"texture", true, L"texture", sampler.c_str(), L"texcoord", uvname.c_str() );
meshTexCoordId += L"-TexCoord0"; // TODO: need to handle second UV-set
Writer->writeElement(L"texture", true, L"texture", sampler.c_str(), L"texcoord", meshTexCoordId.c_str() );
Writer->writeLineBreak(); Writer->writeLineBreak();
} }
void CColladaMeshWriter::writeFxElement(const irr::core::stringw& meshname, const video::SMaterial & material, E_COLLADA_TECHNIQUE_FX techFx) void CColladaMeshWriter::writeFxElement(const irr::core::stringw& uvname, const video::SMaterial & material, E_COLLADA_TECHNIQUE_FX techFx)
{ {
core::stringw fxLabel; core::stringw fxLabel;
bool writeEmission = true; bool writeEmission = true;
...@@ -1900,22 +1901,22 @@ void CColladaMeshWriter::writeFxElement(const irr::core::stringw& meshname, cons ...@@ -1900,22 +1901,22 @@ void CColladaMeshWriter::writeFxElement(const irr::core::stringw& meshname, cons
{ {
if ( writeEmission ) if ( writeEmission )
{ {
writeColorFx(meshname, material, L"emission", ECCS_EMISSIVE); writeColorFx(uvname, material, L"emission", ECCS_EMISSIVE);
} }
if ( writeAmbient ) if ( writeAmbient )
{ {
writeColorFx(meshname, material, L"ambient", ECCS_AMBIENT); writeColorFx(uvname, material, L"ambient", ECCS_AMBIENT);
} }
if ( writeDiffuse ) if ( writeDiffuse )
{ {
writeColorFx(meshname, material, L"diffuse", ECCS_DIFFUSE); writeColorFx(uvname, material, L"diffuse", ECCS_DIFFUSE);
} }
if ( writeSpecular ) if ( writeSpecular )
{ {
writeColorFx(meshname, material, L"specular", ECCS_SPECULAR); writeColorFx(uvname, material, L"specular", ECCS_SPECULAR);
} }
if ( writeShininess ) if ( writeShininess )
...@@ -1929,7 +1930,7 @@ void CColladaMeshWriter::writeFxElement(const irr::core::stringw& meshname, cons ...@@ -1929,7 +1930,7 @@ void CColladaMeshWriter::writeFxElement(const irr::core::stringw& meshname, cons
if ( writeReflective ) if ( writeReflective )
{ {
writeColorFx(meshname, material, L"reflective", ECCS_REFLECTIVE); writeColorFx(uvname, material, L"reflective", ECCS_REFLECTIVE);
} }
if ( writeReflectivity ) if ( writeReflectivity )
...@@ -1949,7 +1950,7 @@ void CColladaMeshWriter::writeFxElement(const irr::core::stringw& meshname, cons ...@@ -1949,7 +1950,7 @@ void CColladaMeshWriter::writeFxElement(const irr::core::stringw& meshname, cons
if ( writeTransparent ) if ( writeTransparent )
{ {
E_COLLADA_TRANSPARENT_FX transparentFx = getProperties()->getTransparentFx(material); E_COLLADA_TRANSPARENT_FX transparentFx = getProperties()->getTransparentFx(material);
writeColorFx(meshname, material, L"transparent", ECCS_TRANSPARENT, L"opaque", toString(transparentFx).c_str()); writeColorFx(uvname, material, L"transparent", ECCS_TRANSPARENT, L"opaque", toString(transparentFx).c_str());
} }
if ( writeTransparency ) if ( writeTransparency )
...@@ -1985,7 +1986,7 @@ void CColladaMeshWriter::writeFxElement(const irr::core::stringw& meshname, cons ...@@ -1985,7 +1986,7 @@ void CColladaMeshWriter::writeFxElement(const irr::core::stringw& meshname, cons
Writer->writeLineBreak(); Writer->writeLineBreak();
} }
void CColladaMeshWriter::writeColorFx(const irr::core::stringw& meshname, const video::SMaterial & material, const wchar_t * colorname, E_COLLADA_COLOR_SAMPLER cs, const wchar_t* attr1Name, const wchar_t* attr1Value) void CColladaMeshWriter::writeColorFx(const irr::core::stringw& uvname, const video::SMaterial & material, const wchar_t * colorname, E_COLLADA_COLOR_SAMPLER cs, const wchar_t* attr1Name, const wchar_t* attr1Value)
{ {
irr::s32 idx = getCheckedTextureIdx(material, cs); irr::s32 idx = getCheckedTextureIdx(material, cs);
E_COLLADA_IRR_COLOR colType = idx < 0 ? getProperties()->getColorMapping(material, cs) : ECIC_NONE; E_COLLADA_IRR_COLOR colType = idx < 0 ? getProperties()->getColorMapping(material, cs) : ECIC_NONE;
...@@ -1994,7 +1995,7 @@ void CColladaMeshWriter::writeColorFx(const irr::core::stringw& meshname, const ...@@ -1994,7 +1995,7 @@ void CColladaMeshWriter::writeColorFx(const irr::core::stringw& meshname, const
Writer->writeElement(colorname, false, attr1Name, attr1Value); Writer->writeElement(colorname, false, attr1Name, attr1Value);
Writer->writeLineBreak(); Writer->writeLineBreak();
if ( idx >= 0 ) if ( idx >= 0 )
writeTextureSampler( meshname, idx); writeTextureSampler( uvname, idx);
else else
writeColorElement(getColorMapping(material, cs, colType)); writeColorElement(getColorMapping(material, cs, colType));
Writer->writeClosingTag(colorname); Writer->writeClosingTag(colorname);
......
source/Irrlicht/CColladaMeshWriter.h
View file @ af0ccd9d
...@@ -125,18 +125,18 @@ protected: ...@@ -125,18 +125,18 @@ protected:
void writeSceneNode(irr::scene::ISceneNode * node); void writeSceneNode(irr::scene::ISceneNode * node);
void writeMeshMaterials(scene::IMesh* mesh); void writeMeshMaterials(scene::IMesh* mesh);
void writeMeshEffects(scene::IMesh* mesh); void writeMeshEffects(scene::IMesh* mesh);
void writeMaterialEffect(const irr::core::stringw& meshname, const irr::core::stringw& materialname, const video::SMaterial & material); void writeMaterialEffect(const irr::core::stringw& uvname, const irr::core::stringw& materialname, const video::SMaterial & material);
void writeMeshGeometry(const irr::core::stringw& meshname, scene::IMesh* mesh); void writeMeshGeometry(const irr::core::stringw& meshname, scene::IMesh* mesh);
void writeMeshInstanceGeometry(const irr::core::stringw& meshname, scene::IMesh* mesh, scene::ISceneNode* node=0); void writeMeshInstanceGeometry(const irr::core::stringw& meshname, scene::IMesh* mesh, scene::ISceneNode* node=0);
void writeMaterial(const irr::core::stringw& materialname); void writeMaterial(const irr::core::stringw& materialname);
void writeLightInstance(const irr::core::stringw& lightName); void writeLightInstance(const irr::core::stringw& lightName);
void writeLibraryImages(); void writeLibraryImages();
void writeColorFx(const irr::core::stringw& meshname, const video::SMaterial & material, const wchar_t * colorname, E_COLLADA_COLOR_SAMPLER cs, const wchar_t* attr1Name=0, const wchar_t* attr1Value=0); void writeColorFx(const irr::core::stringw& uvname, const video::SMaterial & material, const wchar_t * colorname, E_COLLADA_COLOR_SAMPLER cs, const wchar_t* attr1Name=0, const wchar_t* attr1Value=0);
void writeAmbientLightElement(const video::SColorf & col); void writeAmbientLightElement(const video::SColorf & col);
void writeColorElement(const video::SColor & col, bool writeAlpha=true); void writeColorElement(const video::SColor & col, bool writeAlpha=true);
void writeColorElement(const video::SColorf & col, bool writeAlpha=true); void writeColorElement(const video::SColorf & col, bool writeAlpha=true);
void writeTextureSampler(const irr::core::stringw& meshname, s32 textureIdx); void writeTextureSampler(const irr::core::stringw& uvname, s32 textureIdx);
void writeFxElement(const irr::core::stringw& meshname, const video::SMaterial & material, E_COLLADA_TECHNIQUE_FX techFx); void writeFxElement(const irr::core::stringw& uvname, const video::SMaterial & material, E_COLLADA_TECHNIQUE_FX techFx);
void writeFloatElement(irr::f32 value); void writeFloatElement(irr::f32 value);
void writeRotateElement(const irr::core::vector3df& axis, irr::f32 angle); void writeRotateElement(const irr::core::vector3df& axis, irr::f32 angle);
void writeScaleElement(const irr::core::vector3df& scale); void writeScaleElement(const irr::core::vector3df& scale);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment