X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FObjects%2Fmaterial.hxx;h=464189e45373cd2c950753914cbda0cb2e803bd9;hb=9a3b25e4fa4b9acb7b444e6e33bcba1c8310b888;hp=d5399dbc8c35f1a95d36affc6caeb96b947c3930;hpb=c90db01dc8d5462a3da22771ffa7c96f5ea31217;p=flightgear.git diff --git a/src/Objects/material.hxx b/src/Objects/material.hxx index d5399dbc8..464189e45 100644 --- a/src/Objects/material.hxx +++ b/src/Objects/material.hxx @@ -37,10 +37,10 @@ # include #endif -#include "Include/compiler.h" +#include #include -#include +#include #include STL_STRING // Standard C++ string library @@ -48,8 +48,8 @@ FG_USING_STD(string); // MSVC++ 6.0 kuldge - Need forward declaration of friends. -class fgMATERIAL; -istream& operator >> ( istream& in, fgMATERIAL& m ); +class FGMaterial; +istream& operator >> ( istream& in, FGMaterial& m ); // Material property class class FGMaterial { @@ -71,7 +71,7 @@ private: double xsize, ysize; // material properties - GLfloat ambient[4], diffuse[4], specular[4], emissive[4]; + GLfloat ambient[4], diffuse[4], specular[4], emission[4]; GLint texture_ptr; public: @@ -88,13 +88,15 @@ public: inline bool is_loaded() const { return loaded; } inline GLuint get_texture_id() const { return texture_id; } + inline string get_texture_name() const { return texture_name; } inline double get_xsize() const { return xsize; } inline double get_ysize() const { return ysize; } inline GLfloat *get_ambient() { return ambient; } inline GLfloat *get_diffuse() { return diffuse; } inline GLfloat *get_specular() { return specular; } - inline GLfloat *get_emissive() { return emissive; } + inline GLfloat *get_emission() { return emission; } + void dump_info(); };