X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FObjects%2Fmaterialmgr.cxx;h=315b756f64dae7dcf0873ab5ae73940e080a3fd4;hb=c3753bf6201d1482651f2cfb353476eb40ace4fe;hp=90b007636197b6561322a345827e52f06efedad1;hpb=afe8cc4d269445b7c9763f06b46a7493d222ef4a;p=flightgear.git

diff --git a/src/Objects/materialmgr.cxx b/src/Objects/materialmgr.cxx
index 90b007636..315b756f6 100644
--- a/src/Objects/materialmgr.cxx
+++ b/src/Objects/materialmgr.cxx
@@ -179,18 +179,27 @@ fgMATERIAL_MGR::load_lib ( void )
 
 	    ssgSimpleState *state = new ssgSimpleState;
 	    state->enable( GL_LIGHTING );
-	    state->setShadeModel( GL_SMOOTH );
+	    if ( current_options.get_shading() == 1 ) {
+		state->setShadeModel( GL_SMOOTH );
+	    } else {
+		state->setShadeModel( GL_FLAT );
+	    }
 	    state->enable ( GL_CULL_FACE      ) ;
 	    if ( current_options.get_textures() ) {
 		state->enable( GL_TEXTURE_2D );
-		state->setTexture( tex_file.c_str() );
+		state->setTexture( (char *)tex_file.c_str() );
 		state->setMaterial ( GL_AMBIENT_AND_DIFFUSE, 1, 1, 1, 1 ) ;
+		state->setMaterial ( GL_SPECULAR, 0, 0, 0, 0 ) ;
+		state->setMaterial ( GL_EMISSION, 0, 0, 0, 0 ) ;
 	    } else {
 		state->disable( GL_TEXTURE_2D );
 		state->disable( GL_COLOR_MATERIAL );
-		GLfloat *ambient, *diffuse;
+		GLfloat *ambient, *diffuse, *specular, *emission;
 		ambient = m.get_ambient();
 		diffuse = m.get_diffuse();
+		specular = m.get_specular();
+		emission = m.get_emission();
+
 		/* cout << "ambient = " << ambient[0] << "," << ambient[1] 
 		     << "," << ambient[2] << endl; */
 		state->setMaterial ( GL_AMBIENT, 
@@ -199,7 +208,13 @@ fgMATERIAL_MGR::load_lib ( void )
 		state->setMaterial ( GL_DIFFUSE, 
 				     diffuse[0], diffuse[1], 
 				     diffuse[2], diffuse[3] ) ;
-	    }
+		state->setMaterial ( GL_SPECULAR, 
+				     specular[0], specular[1], 
+				     specular[2], specular[3] ) ;
+		state->setMaterial ( GL_EMISSION, 
+				     emission[0], emission[1], 
+				     emission[2], emission[3] ) ;
+    }
 	    m_slot.set_state( state );
 
 	    material_mgr.material_map[material_name] = m_slot;