spacecruft
/
celestia
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Corrected the mapping of 3DS shininess to OpenGL specular exponent

ver1_5_1
Chris Laurel 2002-02-11 20:40:29 +00:00
parent 594bb40965
commit d4719651fd
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -419,3 +419,7 @@ Code:
* Optimized rendering of planet meshes
* Switched to high levels of details when camera is near surface of a planet
* Improved the appearance of the corona around stars
* Fixed specular lighting for 3DS meshes, but correcting the mapping of 3DS
shininess to OpenGL specular exponents.

10
src/celengine/3dsmesh.cpp
View File

@ -291,10 +291,14 @@ static VertexList* convertToVertexList(M3DTriangleMesh& mesh,
vl->setDiffuseColor(Color(diffuse.red, diffuse.green, diffuse.blue));
M3DColor specular = material->getSpecularColor();
vl->setSpecularColor(Color(specular.red, specular.green, specular.blue));
// 3DS files record shininess as a percentage; assume
// that OpenGL uses a range of 0-127 for shininess
float shininess = material->getShininess();
vl->setShininess(shininess * 1.27f);
// Map the shininess from the 3DS file into the 0-128
// range that OpenGL uses for the specular exponent.
shininess = (float) pow(2, 10.0 * shininess);
if (shininess > 128.0f)
shininess = 128.0f;
vl->setShininess(128.0f);
if (material->getTextureMap() != "")
{