fix outfit glitches, init combobox, move shaders, remove unused particles files, create timer utility

This commit is contained in:
Eduardo Bart
2011-12-28 17:38:29 -02:00
parent 11bb365dce
commit 400afa9981
32 changed files with 273 additions and 269 deletions

View File

@@ -25,6 +25,7 @@
#include "shaderprogram.h"
#include "coordsbuffer.h"
#include <framework/core/timer.h>
class PainterShaderProgram : public ShaderProgram
{
@@ -36,7 +37,7 @@ class PainterShaderProgram : public ShaderProgram
COLOR_UNIFORM = 2,
OPACITY_UNIFORM = 3,
TEXTURE_UNIFORM = 4,
TICKS_UNIFORM = 5
TIME_UNIFORM = 5
};
public:
enum DrawMode {
@@ -55,6 +56,7 @@ public:
private:
DrawMode m_drawMode;
Timer m_startTimer;
};
#endif