Commit ba3024f0 authored by hybrid's avatar hybrid

Merged revisions 2440:2473 from 1.5 branch. obj writer shininess fixed. Shadow...

Merged revisions 2440:2473 from 1.5 branch. obj writer shininess fixed. Shadow volume removal fixed.

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@2474 dfc29bdd-3216-0410-991c-e03cc46cb475
parent 0966a656
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
Welcome to the irrXML API documentation. Welcome to the irrXML API documentation.
Here you'll find any information you'll need to develop applications with Here you'll find any information you'll need to develop applications with
irrXML. If you look for a tutorial on how to start, take a look at the \ref irrxmlexample, irrXML. If you look for a tutorial on how to start, take a look at the \ref irrxmlexample,
at the homepage of irrXML at <A HREF="http://xml.irrlicht3d.org" >xml.irrlicht3d.org</A> at the homepage of irrXML at <A HREF="http://www.ambiera.com/irrxml/">www.ambiera.com/irrxml/</A>
or into the SDK in the directory \example. or into the SDK in the directory \example.
irrXML is intended to be a high speed and easy-to-use XML Parser for C++, and irrXML is intended to be a high speed and easy-to-use XML Parser for C++, and
......
...@@ -684,7 +684,6 @@ bool CAnimatedMeshSceneNode::removeChild(ISceneNode* child) ...@@ -684,7 +684,6 @@ bool CAnimatedMeshSceneNode::removeChild(ISceneNode* child)
{ {
Shadow->drop(); Shadow->drop();
Shadow = 0; Shadow = 0;
return true;
} }
if (ISceneNode::removeChild(child)) if (ISceneNode::removeChild(child))
......
...@@ -186,7 +186,9 @@ bool COBJMeshWriter::writeMesh(io::IWriteFile* file, scene::IMesh* mesh, s32 fla ...@@ -186,7 +186,9 @@ bool COBJMeshWriter::writeMesh(io::IWriteFile* file, scene::IMesh* mesh, s32 fla
getColorAsStringLine(mat[i]->EmissiveColor, "Ke", num); getColorAsStringLine(mat[i]->EmissiveColor, "Ke", num);
file->write(num.c_str(),num.size()); file->write(num.c_str(),num.size());
num = core::stringc(mat[i]->Shininess/0.128f); num = core::stringc(mat[i]->Shininess/0.128f);
file->write("Ns ", 3);
file->write(num.c_str(),num.size()); file->write(num.c_str(),num.size());
file->write("\n", 1);
if (mat[i]->getTexture(0)) if (mat[i]->getTexture(0))
{ {
file->write("map_Kd ", 7); file->write("map_Kd ", 7);
......
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