X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FObjects%2Fmaterial.hxx;h=24b0d6c9af41b89724aa29c3ad015a29c9cfb40d;hb=98af0b89240e0f3dc226498abdf55f0136763d70;hp=fff6695e1f72fccc8ffd45ac0fb7044a7324d316;hpb=858f17b323a3c553dfa70195449fae594bff3e53;p=flightgear.git

diff --git a/src/Objects/material.hxx b/src/Objects/material.hxx
index fff6695e1..24b0d6c9a 100644
--- a/src/Objects/material.hxx
+++ b/src/Objects/material.hxx
@@ -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,12 +88,13 @@ 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; }
 };