X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=simgear%2Fscene%2Fmaterial%2Fmat.hxx;h=a32bde3220cd450a9b1bbe22b9d2d31fcad3d1d3;hb=7fc8c026884b2d0a1b683765c089a9bef5ac47c8;hp=084f736ff54cb5db2dc29868a5580ac87ddcdc7f;hpb=5f21c75e02057d33dd960961d626465c0eaebd0c;p=simgear.git diff --git a/simgear/scene/material/mat.hxx b/simgear/scene/material/mat.hxx index 084f736f..a32bde32 100644 --- a/simgear/scene/material/mat.hxx +++ b/simgear/scene/material/mat.hxx @@ -4,7 +4,7 @@ // Written by Curtis Olson, started May 1998. // Overhauled by David Megginson, December 2001 // -// Copyright (C) 1998 - 2000 Curtis L. Olson - curt@flightgear.org +// Copyright (C) 1998 - 2000 Curtis L. Olson - http://www.flightgear.org/~curt // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License as @@ -39,7 +39,6 @@ #include #include -#include #include "matmodel.hxx" @@ -199,11 +198,13 @@ protected: protected: - typedef struct { + struct _internal_state { + _internal_state( ssgSimpleState *s, const string &t, bool l ) + : state(s), texture_path(t), texture_loaded(l) {} ssgSimpleState *state; string texture_path; bool texture_loaded; - } _internal_state; + }; private: @@ -215,6 +216,9 @@ private: // texture status vector<_internal_state> _status; + // Round-robin counter + unsigned int _current_ptr; + // texture size double xsize, ysize;